aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/inflections.rb
diff options
context:
space:
mode:
authorMark Rushakoff <mark.rushakoff@gmail.com>2011-12-07 23:14:02 -0800
committerMark Rushakoff <mark.rushakoff@gmail.com>2011-12-07 23:14:02 -0800
commit6f253fb440d4979632ab7763e8cf353f9519cc35 (patch)
tree79907e570243ca58cd281ecf11667bd50ee9edd9 /activesupport/lib/active_support/inflections.rb
parenta505b1377422a1821798d060301c50abea6afbd4 (diff)
downloadrails-6f253fb440d4979632ab7763e8cf353f9519cc35.tar.gz
rails-6f253fb440d4979632ab7763e8cf353f9519cc35.tar.bz2
rails-6f253fb440d4979632ab7763e8cf353f9519cc35.zip
Fix inflection regexes for mouse, mice
Diffstat (limited to 'activesupport/lib/active_support/inflections.rb')
-rw-r--r--activesupport/lib/active_support/inflections.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/inflections.rb b/activesupport/lib/active_support/inflections.rb
index daf2a1e1d9..527cce2594 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')
@@ -35,7 +35,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')