Browse Source

Merge pull request #1203 from xsbeats/bugfix/pluralizer_uncountable

Added 'traffic' and 'chassis' as uncountable words to feed pluralizer
Dayle Rees 12 years ago
parent
commit
705cd6a907

+ 3 - 1
application/config/strings.php

@@ -96,6 +96,8 @@ return array(
 		'sheep',
 		'sheep',
 		'species',
 		'species',
 		'moose',
 		'moose',
+		'chassis',
+		'traffic',
 	),
 	),
 
 
 	/*
 	/*
@@ -185,4 +187,4 @@ return array(
 
 
 	),
 	),
 
 
-);
+);

+ 5 - 2
laravel/tests/application/config/strings.php

@@ -8,7 +8,7 @@ return array(
 	|--------------------------------------------------------------------------
 	|--------------------------------------------------------------------------
 	|
 	|
 	| This array contains the singular and plural forms of words. It's used by
 	| 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.
 	| word from singular to plural and vice versa.
 	|
 	|
 	| Note that the regular expressions are only for inflecting English words.
 	| Note that the regular expressions are only for inflecting English words.
@@ -95,6 +95,9 @@ return array(
 		'series',
 		'series',
 		'sheep',
 		'sheep',
 		'species',
 		'species',
+		'moose',
+		'chassis',
+		'traffic',
 	),
 	),
 
 
 	/*
 	/*
@@ -184,4 +187,4 @@ return array(
 
 
 	),
 	),
 
 
-);
+);

+ 3 - 1
laravel/tests/cases/str.test.php

@@ -96,6 +96,8 @@ class StrTest extends PHPUnit_Framework_TestCase {
 		$this->assertEquals('Users', Str::plural('User'));
 		$this->assertEquals('Users', Str::plural('User'));
 		$this->assertEquals('user', Str::plural('user', 1));
 		$this->assertEquals('user', Str::plural('user', 1));
 		$this->assertEquals('users', Str::plural('user', 2));
 		$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 @@ class StrTest extends PHPUnit_Framework_TestCase {
 		$this->assertEquals(40, strlen(Str::random(40)));
 		$this->assertEquals(40, strlen(Str::random(40)));
 	}
 	}
 
 
-}
+}