Changeset 2203 for trunk/system/core/Kohana.php

Timestamp:

02/29/2008 04:48:53 PM (10 months ago)

Author:

Shadowhand

Message:

Fixing a bug with r2200.

Files:

• trunk/system/core/Kohana.php (modified) (4 diffs)

trunk/system/core/Kohana.php

@@ -687 +687 @@
                         return $found[$hash];
 
-                if ($directory == 'config' OR $directory == 'i18n')
+                if ($directory == 'config' OR $directory == 'i18n' OR $directory === 'l10n')
                 {
                         $fnd = array();
@@ -843 +843 @@
                 static $locale = array();
 
-                // Extract the main group from the key
-                $group = explode('.', $key, 2);
-                $group = $group[0];
-
-                if (empty($language[$group]))
+                if (empty($locale))
                 {
                         // Messages from this file
@@ -857 +853 @@
                         // Loop through the files and include each one, so SYSPATH files
                         // can be overloaded by more localized files
-                        foreach(self::find_file('i10n', $filename) as $file)
+                        foreach(self::find_file('l10n', $filename) as $file)
                         {
                                 include $file;
@@ -866 +862 @@
                                         foreach($locale as $k => $v)
                                         {
-                                                $messages[$k] = $v;
+                                                $locale[$k] = $v;
                                         }
                                 }
                         }
-
-                        // Cache the type
-                        $language[$group] = $messages;
                 }
 
                 // Get the line from the language
-                $line = self::key_string($key, $language);
+                $line = self::key_string($key, $locale);
 
                 // Return the key string as fallback