diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2009-02-10 18:37:52 +0100 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2009-02-10 18:37:52 +0100 |
| commit | a6aabaff9a396436d36b57df84eec77ee72e70ed (patch) | |
| tree | 5911a1c0ffee28a0b3436fe891ef66f2830d78ff /system | |
| parent | 4787413c06ec11bff1ba4b1c7a4fe667038595d0 (diff) | |
Fixed a bug in plural() with words that end in y
http://codeigniter.com/bug_tracker/bug/6342/
Diffstat (limited to 'system')
| -rw-r--r-- | system/helpers/inflector_helper.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php index 9393f11e4..39db5d4af 100644 --- a/system/helpers/inflector_helper.php +++ b/system/helpers/inflector_helper.php @@ -87,7 +87,9 @@ if ( ! function_exists('plural')) if ($end == 'y') { - $str = substr($str, 0, strlen($str)-1).'ies'; + // Y preceded by vowel => regular 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 == 's') { |