Adding cafe to the list of irregular plurals. Seems that its

french origins befuddle normal english pluralization rules. Fixes #1930
cakephp · Aug 29, 2011 · 5b43d6b · 5b43d6b
1 parent 27ab909
commit 5b43d6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
@@ -70,6 +70,7 @@ class Inflector {
 			'atlas' => 'atlases',
 			'beef' => 'beefs',
 			'brother' => 'brothers',
+			'cafe' => 'cafes',
 			'child' => 'children',
 			'corpus' => 'corpuses',
 			'cow' => 'cows',

diff --git a/cake/tests/cases/libs/inflector.test.php b/cake/tests/cases/libs/inflector.test.php
@@ -116,6 +116,8 @@ function testInflectingSingulars() {
 		$this->assertEqual(Inflector::singularize('bases'), 'basis');
 		$this->assertEqual(Inflector::singularize('analyses'), 'analysis');
 		$this->assertEqual(Inflector::singularize('curves'), 'curve');
+		$this->assertEqual(Inflector::singularize('cafes'), 'cafe');
+		$this->assertEqual(Inflector::singularize('roofs'), 'roof');
 
 		$this->assertEqual(Inflector::singularize(''), '');
 	}
@@ -164,6 +166,8 @@ function testInflectingPlurals() {
 		$this->assertEqual(Inflector::pluralize('tax'), 'taxes');
 		$this->assertEqual(Inflector::pluralize('wave'), 'waves');
 		$this->assertEqual(Inflector::pluralize('bureau'), 'bureaus');
+		$this->assertEqual(Inflector::pluralize('cafe'), 'cafes');
+		$this->assertEqual(Inflector::pluralize('roof'), 'roofs');
 		$this->assertEqual(Inflector::pluralize(''), '');
 	}