diff options
| author | Wes Morgan <cap10morgan@gmail.com> | 2012-02-25 14:14:38 -0700 |
|---|---|---|
| committer | Wes Morgan <cap10morgan@gmail.com> | 2012-02-25 14:22:15 -0700 |
| commit | 16e7f2f809c586d2d9a27c2b57395350b596e0b7 (patch) | |
| tree | b1680f026a387271d0fd0d0f0910c20d4b0d5e74 /activesupport/lib/active_support/inflections.rb | |
| parent | cbe74cf024f550d08c8b7f8ec0e5e5f90a1772f6 (diff) | |
| download | rails-16e7f2f809c586d2d9a27c2b57395350b596e0b7.tar.gz rails-16e7f2f809c586d2d9a27c2b57395350b596e0b7.tar.bz2 rails-16e7f2f809c586d2d9a27c2b57395350b596e0b7.zip | |
fix inflector bug where -ice gets pluralized into -ouse
This should happen for mouse or louse, but not slice or pumice.
Diffstat (limited to 'activesupport/lib/active_support/inflections.rb')
| -rw-r--r-- | activesupport/lib/active_support/inflections.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/inflections.rb b/activesupport/lib/active_support/inflections.rb index b3eb1333ca..7eb61cd1a0 100644 --- a/activesupport/lib/active_support/inflections.rb +++ b/activesupport/lib/active_support/inflections.rb @@ -16,8 +16,8 @@ module ActiveSupport inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies') inflect.plural(/(x|ch|ss|sh)$/i, '\1es') inflect.plural(/(matr|vert|ind)(?:ix|ex)$/i, '\1ices') - inflect.plural(/(m|l)ouse$/i, '\1ice') - inflect.plural(/(m|l)ice$/i, '\1ice') + inflect.plural(/^(m|l)ouse$/i, '\1ice') + inflect.plural(/^(m|l)ice$/i, '\1ice') inflect.plural(/^(ox)$/i, '\1en') inflect.plural(/^(oxen)$/i, '\1') inflect.plural(/(quiz)$/i, '\1zes') @@ -36,7 +36,7 @@ module ActiveSupport inflect.singular(/(s)eries$/i, '\1eries') inflect.singular(/(m)ovies$/i, '\1ovie') inflect.singular(/(x|ch|ss|sh)es$/i, '\1') - inflect.singular(/(m|l)ice$/i, '\1ouse') + inflect.singular(/^(m|l)ice$/i, '\1ouse') inflect.singular(/(bus)(es)?$/i, '\1') inflect.singular(/(o)es$/i, '\1') inflect.singular(/(shoe)s$/i, '\1') @@ -58,6 +58,6 @@ module ActiveSupport inflect.irregular('cow', 'kine') inflect.irregular('zombie', 'zombies') - inflect.uncountable(%w(equipment information rice money species series fish sheep jeans)) + inflect.uncountable(%w(equipment information rice money species series fish sheep jeans police)) end end |