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

Timestamp:

07/18/2008 03:00:29 AM (5 months ago)

Author:

PugFish

Message:

Added support for multiple locales in locale.language config setting.
See #695

Files:

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

trunk/system/core/Kohana.php

@@ -109 +109 @@
 
                 // Set locale information
-                setlocale(LC_ALL, Config::item('locale.language').'.UTF-8');
+                $locales = Config::item('locale.language');
+                $locales[0] .= '.UTF-8';
+                setlocale(LC_ALL, $locales);
 
                 if (Config::item('log.threshold') > 0)
@@ -946 +948 @@
 
                         // The name of the file to search for
-                        $filename = Config::item('locale.language').'/'.$group;
+                        $locales = Config::item('locale.language');
+                        $filename = $locales[0].'/'.$group;
 
                         // Loop through the files and include each one, so SYSPATH files
@@ -979 +982 @@
                 if ($line === NULL)
                 {
-                        Log::add('error', 'Missing i18n entry '.$key.' for language '.Config::item('locale.language'));
+                        $locales = Config::item('locale.language');
+                        Log::add('error', 'Missing i18n entry '.$key.' for language '.$locales[0]);
                         return $key;
                 }