Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #147 from sparksp/develop/fix_inflector 

Inflector updates
This commit is contained in:
Taylor Otwell 2011-11-10 05:21:33 -08:00
parent 968e80bcff 5da8c1e1d9
commit 8a94c9787a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
laravel/inflector.php
View File

@ -102,13 +102,15 @@ class Inflector {
* @var array * @var array
*/ */
private static $uncountable = array( private static $uncountable = array(
'audio',
'equipment', 'equipment',
'data',
'deer', 'deer',
'fish', 'fish',
'gold',
'information', 'information',
'money', 'money',
'rice', 'rice',
'police',
'series', 'series',
'sheep', 'sheep',
'species', 'species',
@ -138,7 +140,7 @@ class Inflector {
*/ */
public static function plural($value, $count = null) public static function plural($value, $count = null)
{ {
if ( ! is_null($count) and $count <= 1) return $value; if ( ! is_null($count) and $count == 1) return $value;
$irregular = array_flip(static::$irregular); $irregular = array_flip(static::$irregular);
@ -200,4 +202,4 @@ private static function inflect($value, $cache, $irregular, $source)
return $value; return $value;
} }
} }