Merge pull request #1204 from DrRoach/dev

Fixed issue where tax would pluralize to taxis not taxes.
UnionOfRAD · Jul 9, 2015 · b49ad94 · b49ad94
2 parents 34b2248 + 140e995
commit b49ad94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tests/cases/util/InflectorTest.php b/tests/cases/util/InflectorTest.php
@@ -63,6 +63,7 @@ public function testSingularize() {
 		$this->assertEqual(Inflector::singularize('shelves'), 'shelf');
 		$this->assertEqual(Inflector::singularize('causes'), 'cause');
 		$this->assertEqual(Inflector::singularize(''), '');
+        $this->assertEqual(Inflector::singularize('taxes'), 'tax');
 	}
 
 	/**
@@ -105,6 +106,7 @@ public function testPluralize() {
 		$this->assertEqual(Inflector::pluralize('leaf'), 'leaves');
 		$this->assertEqual(Inflector::pluralize('ContactPeople'), 'ContactPeople');
 		$this->assertEqual(Inflector::pluralize(''), '');
+        $this->assertEqual(Inflector::pluralize('tax'), 'taxes');
 
 		$result = Inflector::pluralize('errata');
 		$this->assertNull(Inflector::rules('plural', array('/rata/' => '\1ratum')));
@@ -359,4 +361,4 @@ protected function _getProtectedValue($property) {
 	}
 }
 
-?>
+?>
diff --git a/util/Inflector.php b/util/Inflector.php
@@ -180,7 +180,7 @@ class Inflector {
 			'mythos' => 'mythoi', 'numen' => 'numina', 'occiput' => 'occiputs',
 			'octopus' => 'octopuses', 'opus' => 'opuses', 'ox' => 'oxen', 'penis' => 'penises',
 			'person' => 'people', 'sex' => 'sexes', 'soliloquy' => 'soliloquies',
-			'testis' => 'testes', 'trilby' => 'trilbys', 'turf' => 'turfs'
+			'tax' => 'taxes', 'testis' => 'testes', 'trilby' => 'trilbys', 'turf' => 'turfs'
 		),
 		'uninflected' => array(
 			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep'
@@ -478,4 +478,4 @@ protected static function _enclose($string) {
 	}
 }
 
-?>
+?>