From 5b43d6b9a7534f7bc3280fdb3ee9b1c6f826ea2a Mon Sep 17 00:00:00 2001
From: mark_story <mark@freshbooks.com>
Date: Sun, 28 Aug 2011 21:45:16 -0400
Subject: [PATCH] Adding cafe to the list of irregular plurals.  Seems that its
 french origins befuddle normal english pluralization rules. Fixes #1930

---
 cake/libs/inflector.php                  | 1 +
 cake/tests/cases/libs/inflector.test.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/cake/libs/inflector.php b/cake/libs/inflector.php
index 37d4ab3307c..7f3e02f38db 100644
--- 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
index 39e61cf997d..6f0562b3cd5 100644
--- 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(''), '');
 	}