mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix inflection regexes for mouse, mice
This commit is contained in:
parent
a505b13774
commit
6f253fb440
2 changed files with 8 additions and 4 deletions
|
@ -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')
|
||||
|
|
|
@ -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 = {
|
||||
|
|
Loading…
Reference in a new issue