Changeset 3147

Timestamp:

07/18/08 03:00:29 (6 weeks ago)

Author:

PugFish

Message:

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

Location:

trunk/system

Files:

• config/locale.php (modified) (1 diff)
• core/Kohana.php (modified) (3 diffs)

trunk/system/config/locale.php

@@ -3 +3 @@
  * @package  Core
  *
- * Default language locale name.
- * @see http://php.net/locales
+ * Default language locale name(s).
+ * First item must be a valid i18n directory name, subsequent items are alternative locales
+ * for OS's that don't support the first (e.g. Windows). The first valid locale in the array will be used.
+ * @see http://php.net/setlocale
  */
-$config['language'] = 'en_US';
+$config['language'] = array('en_US', 'English_United States');
 
 /**

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;
         }