Merge pull request laravel#1203 from xsbeats/bugfix/pluralizer_uncountable

daylerees · daylerees · commit 705cd6a907ee · 2012-09-11T01:25:41.000-07:00
Added 'traffic' and 'chassis' as uncountable words to feed pluralizer
diff --git a/application/config/strings.php b/application/config/strings.php
@@ -96,6 +96,8 @@
 		'sheep',
 		'species',
 		'moose',
+		'chassis',
+		'traffic',
 	),
 
 	/*
@@ -185,4 +187,4 @@
 
 	),
 
-);
+);
diff --git a/laravel/tests/application/config/strings.php b/laravel/tests/application/config/strings.php
@@ -8,7 +8,7 @@
 	|--------------------------------------------------------------------------
 	|
 	| This array contains the singular and plural forms of words. It's used by
-	| the "singular" and "plural" methods on the Str class to convert a given
+	| the "singular" and "plural" methods in the Str class to convert a given
 	| word from singular to plural and vice versa.
 	|
 	| Note that the regular expressions are only for inflecting English words.
@@ -95,6 +95,9 @@
 		'series',
 		'sheep',
 		'species',
+		'moose',
+		'chassis',
+		'traffic',
 	),
 
 	/*
@@ -184,4 +187,4 @@
 
 	),
 
-);
+);
diff --git a/laravel/tests/cases/str.test.php b/laravel/tests/cases/str.test.php
@@ -96,6 +96,8 @@ public function testStringsCanBeSingularOrPlural()
 		$this->assertEquals('Users', Str::plural('User'));
 		$this->assertEquals('user', Str::plural('user', 1));
 		$this->assertEquals('users', Str::plural('user', 2));
+		$this->assertEquals('chassis', Str::plural('chassis', 2));
+		$this->assertEquals('traffic', Str::plural('traffic', 2));
 	}
 
 	/**
@@ -130,4 +132,4 @@ public function testRandomStringsCanBeGenerated()
 		$this->assertEquals(40, strlen(Str::random(40)));
 	}
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,8 @@ public function testStringsCanBeSingularOrPlural()`
`96`	`96`	`$this->assertEquals('Users', Str::plural('User'));`
`97`	`97`	`$this->assertEquals('user', Str::plural('user', 1));`
`98`	`98`	`$this->assertEquals('users', Str::plural('user', 2));`
	`99`	`+ $this->assertEquals('chassis', Str::plural('chassis', 2));`
	`100`	`+ $this->assertEquals('traffic', Str::plural('traffic', 2));`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`/**`
`@@ -130,4 +132,4 @@ public function testRandomStringsCanBeGenerated()`
`130`	`132`	`$this->assertEquals(40, strlen(Str::random(40)));`
`131`	`133`	`}`
`132`	`134`
`133`		`-}`
	`135`	`+}`