summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2009-11-04 18:23:32 +0100
committerGreg Aker <greg.aker@ellislab.com>2009-11-04 18:23:32 +0100
commita3f47180e3885fca82599e90c95ce6e5c26072d6 (patch)
tree160bb9535e0dc0a18710dd2cdfe725b634c70492 /system
parent172e16191889558ca6f6710cf34755200d3e6334 (diff)
Modified inflector helper to properly pluralize words that end in 'ch' or 'sh'
http://codeigniter.com/bug_tracker/bug/9384/
Diffstat (limited to 'system')
-rw-r--r--system/helpers/inflector_helper.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index e65968a9d..8db4f3d75 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -91,6 +91,17 @@ if ( ! function_exists('plural'))
$vowels = array('a', 'e', 'i', 'o', 'u');
$str = in_array(substr($str, -2, 1), $vowels) ? $str.'s' : substr($str, 0, -1).'ies';
}
+ elseif ($end == 'h')
+ {
+ if (substr($str, -2) == 'ch' || substr($str, -2) == 'sh')
+ {
+ $str .= 'es';
+ }
+ else
+ {
+ $str .= 's';
+ }
+ }
elseif ($end == 's')
{
if ($force == TRUE)