mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Adding patch from #1973
This fixes issues with singular words that end in us or ss git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4355 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
719cd36729
commit
39b580237b
1 changed files with 1 additions and 2 deletions
|
@ -202,7 +202,6 @@ class Inflector extends Object {
|
|||
|
||||
$_this =& Inflector::getInstance();
|
||||
$coreSingularRules = array('/(s)tatuses$/i' => '\1\2tatus',
|
||||
'/(s)tatus$/i' => '\1\2tatus',
|
||||
'/(matr)ices$/i' => '\1ix',
|
||||
'/(vert|ind)ices$/i' => '\1ex',
|
||||
'/^(ox)en/i' => '\1',
|
||||
|
@ -231,7 +230,7 @@ class Inflector extends Object {
|
|||
'/(n)ews$/i' => '\1\2ews',
|
||||
'/s$/i' => '');
|
||||
|
||||
$coreUninflectedSingular = array('.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*rice', '.*sheep', 'Amoyese',
|
||||
$coreUninflectedSingular = array('.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*rice', '.*sheep', '.*us', '.*ss', 'Amoyese',
|
||||
'bison', 'Borghese', 'bream', 'breeches', 'britches', 'buffalo', 'cantus', 'carp', 'chassis', 'clippers',
|
||||
'cod', 'coitus', 'Congoese', 'contretemps', 'corps', 'debris', 'diabetes', 'djinn', 'eland', 'elk',
|
||||
'equipment', 'Faroese', 'flounder', 'Foochowese', 'gallows', 'Genevese', 'Genoese', 'Gilbertese', 'graffiti',
|
||||
|
|
Loading…
Reference in a new issue