Ticket #8263: singularize_aves.diff
| File singularize_aves.diff, 1.5 kB (added by jcinnamond, 3 years ago) |
|---|
-
activesupport/test/inflector_test.rb
old new 31 31 "index" => "indices", 32 32 33 33 "wife" => "wives", 34 "safe" => "saves",35 34 "half" => "halves", 35 "wharf" => "wharves", 36 36 37 "shave" => "shaves", 38 "save" => "saves", 39 "safe" => "safes", # If you treat safe as a noun 40 37 41 "move" => "moves", 38 42 39 43 "salesperson" => "salespeople", -
activesupport/lib/active_support/inflections.rb
old new 8 8 inflect.plural(/(buffal|tomat)o$/i, '\1oes') 9 9 inflect.plural(/([ti])um$/i, '\1a') 10 10 inflect.plural(/sis$/i, 'ses') 11 inflect.plural(/(?:([^f ])fe|([lr])f)$/i, '\1\2ves')11 inflect.plural(/(?:([^fa])fe|([lr])f)$/i, '\1\2ves') 12 12 inflect.plural(/(hive)$/i, '\1s') 13 13 inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies') 14 14 inflect.plural(/(x|ch|ss|sh)$/i, '\1es') … … 41 41 inflect.singular(/(vert|ind)ices$/i, '\1ex') 42 42 inflect.singular(/(matr)ices$/i, '\1ix') 43 43 inflect.singular(/(quiz)zes$/i, '\1') 44 inflect.singular(/aves$/i, 'ave') 44 45 45 46 inflect.irregular('person', 'people') 46 47 inflect.irregular('man', 'men')
