Update DataMapper even if it's not needed

application/config/datamapper.php

@@ -14,20 +14,9 @@ $config['created_field'] = 'created';
 $config['updated_field'] = 'updated';
 $config['local_time'] = FALSE;
 $config['unix_timestamp'] = FALSE;
-$config['timestamp_format'] = '';
-$config['lang_file_format'] = 'model_${model}';
-$config['field_label_lang_format'] = '${model}_${field}';
 $config['auto_transaction'] = FALSE;
 $config['auto_populate_has_many'] = FALSE;
 $config['auto_populate_has_one'] = FALSE;
-$config['all_array_uses_ids'] = FALSE;
-// set to FALSE to use the same DB instance across the board (breaks subqueries)
-// Set to any acceptable parameters to $CI->database() to override the default.
-$config['db_params'] = '';
-// Uncomment to enable the production cache
-// $config['production_cache'] = 'datamapper/cache';
-$config['extensions_path'] = 'datamapper';
-$config['extensions'] = array();
 
 /* End of file datamapper.php */
 /* Location: ./application/config/datamapper.php */

application/helpers/inflector_helper.php

@@ -11,7 +11,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team, stensi
- * @link		http://codeigniter.com/user_guide/helpers/inflector_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/directory_helper.html
  */
 
 // --------------------------------------------------------------------
@@ -74,7 +74,7 @@ if ( ! function_exists('singular'))
 		}
 		else
 		{
-			if ($end1 == 's' && $end2 != 'us' && $end2 != 'ss')
+			if ($end1 == 's')
 			{
 				$str = substr($str, 0, -1);
 			}
@@ -102,7 +102,6 @@ if ( ! function_exists('plural'))
 	{
 		$str = strtolower(trim($str));
 		$end3 = substr($str, -3);
-		$end2 = substr($str, -2);
 		$end1 = substr($str, -1);
 
 		if ($end3 == 'eau')
@@ -131,29 +130,9 @@ if ( ! function_exists('plural'))
 		}
 		elseif ($end1 == 'y')
 		{
-			if(preg_match('#[aeiou]y#i', $end2))
+			$str = substr($str, 0, -1).'ies';
-			{
-				// ays, oys, etc.
-				$str = $str . 's';
-			}
-			else
-			{
-				$str = substr($str, 0, -1).'ies';
-			}
 		}
-		elseif ($end1 == 'o')
+		elseif (in_array($end1, array('h', 'o', 'x')))
-		{
-			if(preg_match('#[aeiou]o#i', $end2))
-			{
-				// oos, etc.
-				$str = $str . 's';
-			}
-			else
-			{
-				$str .= 'es';
-			}
-		}
-		elseif ($end1 == 'x' || in_array($end2, array('ss', 'ch', 'sh')) )
 		{
 			$str .= 'es';
 		}

application/language/english/datamapper_lang.php

@@ -2,14 +2,14 @@
 
 $lang['alpha_dash_dot']		= 'The %s field may only contain alpha-numeric characters, underscores, dashes, and full stops.';
 $lang['alpha_slash_dot']	= 'The %s field may only contain alpha-numeric characters, underscores, dashes, slashes, and full stops.';
-$lang['min_date']			= 'The %s field must be at least %s.';
+$lang['min_date']		= 'The %s field must be at least %s.';
-$lang['max_date']			= 'The %s field can not exceed %s.';
+$lang['max_date']		= 'The %s field can not exceed %s.';
-$lang['min_size']			= 'The %s field must be at least %s.';
+$lang['min_size']		= 'The %s field must be at least %s.';
-$lang['max_size']			= 'The %s field can not exceed %s.';
+$lang['max_size']		= 'The %s field can not exceed %s.';
 $lang['transaction']		= 'The %s failed to %s.';
-$lang['unique'] 			= 'The %s you supplied is already taken.';
+$lang['unique'] 		= 'The %s you supplied is already taken.';
 $lang['unique_pair'] 		= 'The combination of %s and %s you supplied is already taken.';
-$lang['valid_date']			= 'The %s field must contain a valid date.';
+$lang['valid_date']		= 'The %s field must contain a valid date.';
 $lang['valid_date_group']	= 'The %2$s fields must contain a valid date.';
 $lang['valid_match']		= 'The %s field may only be %s.';
 
@@ -17,9 +17,5 @@ $lang['related_required']	= 'The %s relationship is required.';
 $lang['related_min_size']	= 'The %s relationship must be at least %s.';
 $lang['related_max_size']	= 'The %s relationship can not exceed %s.';
 
-$lang['dm_save_rel_failed']	= 'The %s relationship is not properly defined.';
-$lang['dm_save_rel_nothis']	= 'Unable to save the %s relationship: This object is not saved.';
-$lang['dm_save_rel_noobj']	= 'Unable to save the %s relationship: The related object was not saved.';
-
 /* End of file datamapper_lang.php */
 /* Location: ./application/language/english/datamapper_lang.php */