Changeset 673 for trunk/system/helpers/inflector.php

Timestamp:

10/05/2007 03:12:01 PM (14 months ago)

Author:

Shadowhand

Message:

Small changes:

• Implemented a work around for Profiler being displayed in external resources (scripts can be output with views with Profiler globally enabled)
  
• Added inflector::uncountable($str)
  

Files:

• trunk/system/helpers/inflector.php (modified) (3 diffs)

trunk/system/helpers/inflector.php

@@ -3 +3 @@
 class inflector {
 
-        protected static $uncountables = array();
+        public static function uncountable($str)
+        {
+                static $uncountables = NULL;
+
+                if ($uncountables === NULL)
+                {
+                        // Makes a mirrored array, eg: foo => foo
+                        $uncountables = array_combine(Kohana::lang('inflector'), Kohana::lang('inflector'));
+                }
+
+                return isset($uncountables[$str]);
+        }
 
         public static function singular($str)
@@ -9 +20 @@
                 $str = trim($str);
 
-                if (empty(self::$uncountables))
-                {
-                        self::$uncountables = Kohana::lang('inflector');
-                }
-
                 // We can just return uncountable words
-                if (in_array(strtolower($str), self::$uncountables))
+                if (self::uncountable($str))
                         return $str;
 
@@ -43 +49 @@
                 $str = trim($str);
 
-                if (empty(self::$uncountables))
-                {
-                        self::$uncountables = Kohana::lang('inflector');
-                }
-
                 // We can just return uncountable words
-                if (in_array(strtolower($str), self::$uncountables))
+                if (self::uncountable($str))
                         return $str;