updating inflector rules #1939

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4371 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-02-01 01:01:36 +00:00
parent 6b8bd59b20
commit 7d1e5bb30c

View file

@ -87,7 +87,7 @@ class Inflector extends Object {
'/(m)an$/i' => '\1en', # man, woman, spokesman '/(m)an$/i' => '\1en', # man, woman, spokesman
'/(c)hild$/i' => '\1hildren', # child '/(c)hild$/i' => '\1hildren', # child
'/(buffal|tomat)o$/i' => '\1\2oes', # buffalo, tomato '/(buffal|tomat)o$/i' => '\1\2oes', # buffalo, tomato
'/(bu)s$/i' => '\1\2ses', # bus '/us$/' => 'uses', # us
'/(alias)/i' => '\1es', # alias '/(alias)/i' => '\1es', # alias
'/(octop|vir)us$/i' => '\1i', # octopus, virus - virus has no defined plural (according to Latin/dictionary.com), but viri is better than viruses/viruss '/(octop|vir)us$/i' => '\1i', # octopus, virus - virus has no defined plural (according to Latin/dictionary.com), but viri is better than viruses/viruss
'/(ax|cri|test)is$/i' => '\1es', # axis, crisis '/(ax|cri|test)is$/i' => '\1es', # axis, crisis
@ -210,7 +210,7 @@ class Inflector extends Object {
'/(cris|ax|test)es$/i' => '\1is', '/(cris|ax|test)es$/i' => '\1is',
'/(shoe)s$/i' => '\1', '/(shoe)s$/i' => '\1',
'/(o)es$/i' => '\1', '/(o)es$/i' => '\1',
'/(bus)es$/i' => '\1', '/uses$/' => 'us',
'/([m|l])ice$/i' => '\1ouse', '/([m|l])ice$/i' => '\1ouse',
'/(x|ch|ss|sh)es$/i' => '\1', '/(x|ch|ss|sh)es$/i' => '\1',
'/(m)ovies$/i' => '\1\2ovie', '/(m)ovies$/i' => '\1\2ovie',