Skip to content

S
syncEnrollments
Commit 8a94c978 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge pull request #147 from sparksp/develop/fix_inflector 

Inflector updates
parents 968e80bc 5da8c1e1
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
laravel/inflector.php
View file @ 8a94c978
...@@ -102,13 +102,15 @@ class Inflector { ...@@ -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 { ...@@ -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 @@ class Inflector { ...@@ -200,4 +202,4 @@ class Inflector {
return $value; return $value;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment