diff options
| author | Mark Rushakoff <mark.rushakoff@gmail.com> | 2011-12-07 23:14:02 -0800 |
|---|---|---|
| committer | Mark Rushakoff <mark.rushakoff@gmail.com> | 2011-12-07 23:14:02 -0800 |
| commit | 6f253fb440d4979632ab7763e8cf353f9519cc35 (patch) | |
| tree | 79907e570243ca58cd281ecf11667bd50ee9edd9 /activesupport | |
| parent | a505b1377422a1821798d060301c50abea6afbd4 (diff) | |
| download | rails-6f253fb440d4979632ab7763e8cf353f9519cc35.tar.gz rails-6f253fb440d4979632ab7763e8cf353f9519cc35.tar.bz2 rails-6f253fb440d4979632ab7763e8cf353f9519cc35.zip | |
Fix inflection regexes for mouse, mice
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/inflections.rb | 6 | ||||
| -rw-r--r-- | activesupport/test/inflector_test_cases.rb | 6 |
2 files changed, 8 insertions, 4 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') diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb index e3a343af52..eb2915c286 100644 --- a/activesupport/test/inflector_test_cases.rb +++ b/activesupport/test/inflector_test_cases.rb @@ -104,7 +104,11 @@ module InflectorTestCases "edge" => "edges", "cow" => "kine", - "database" => "databases" + "database" => "databases", + + # regression tests against improper inflection regexes + "|ice" => "|ices", + "|ouse" => "|ouses" } CamelToUnderscore = { |