Permalink
Browse files

Fix singularization of databases.

Fixes #2822
  • Loading branch information...
1 parent 593e63b commit a0c9299d6d0b5c33d3da71e1b23e05efbaaf7fde @markstory markstory committed Apr 24, 2012
Showing with 3 additions and 1 deletion.
  1. +1 −1 cake/libs/inflector.php
  2. +2 −0 cake/tests/cases/libs/inflector.test.php
View
@@ -134,7 +134,7 @@ class Inflector {
'/(drive)s$/i' => '\1',
'/([^fo])ves$/i' => '\1fe',
'/(^analy)ses$/i' => '\1sis',
- '/(analy|ba|diagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+ '/(analy|diagno|^ba|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
'/([ti])a$/i' => '\1um',
'/(p)eople$/i' => '\1\2erson',
'/(m)en$/i' => '\1an',
@@ -120,6 +120,7 @@ function testInflectingSingulars() {
$this->assertEqual(Inflector::singularize('cafes'), 'cafe');
$this->assertEqual(Inflector::singularize('roofs'), 'roof');
$this->assertEqual(Inflector::singularize('foes'), 'foe');
+ $this->assertEqual(Inflector::singularize('databases'), 'database');
$this->assertEqual(Inflector::singularize(''), '');
}
@@ -172,6 +173,7 @@ function testInflectingPlurals() {
$this->assertEqual(Inflector::pluralize('cafe'), 'cafes');
$this->assertEqual(Inflector::pluralize('roof'), 'roofs');
$this->assertEqual(Inflector::pluralize('foe'), 'foes');
+ $this->assertEqual(Inflector::pluralize('database'), 'databases');
$this->assertEqual(Inflector::pluralize(''), '');
}

0 comments on commit a0c9299

Please sign in to comment.