Changeset 3148

Timestamp:

07/18/2008 07:31:43 AM (5 months ago)

Author:

Shadowhand

Message:

Follow up to r3147, with some other small cleanups

Files:

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

trunk/system/core/Kohana.php

@@ -27 +27 @@
         public static $user_agent = '';
 
+        // The current locale
+        public static $locale = '';
+
         // File path cache
         private static $paths;
@@ -57 +60 @@
 
                 // Define Kohana error constant
-                defined('E_KOHANA') or define('E_KOHANA', 42);
+                define('E_KOHANA', 42);
 
                 // Define 404 error constant
-                defined('E_PAGE_NOT_FOUND') or define('E_PAGE_NOT_FOUND', 43);
+                define('E_PAGE_NOT_FOUND', 43);
 
                 // Define database error constant
-                defined('E_DATABASE_ERROR') or define('E_DATABASE_ERROR', 44);
+                define('E_DATABASE_ERROR', 44);
 
                 // Disable error reporting
-                $ER = error_reporting(0);
+                $ER = error_reporting(~E_NOTICE);
 
                 // Set the user agent
@@ -108 +111 @@
                 header('Content-type: text/html; charset=UTF-8');
 
+                // Load locales
+                $locales = Config::item('locale.language');
+
+                // Make first locale UTF-8
+                $locales[0] .= '.UTF-8';
+
                 // Set locale information
-                $locales = Config::item('locale.language');
-                $locales[0] .= '.UTF-8';
-                setlocale(LC_ALL, $locales);
+                self::$locale = setlocale(LC_ALL, $locales);
 
                 if (Config::item('log.threshold') > 0)
@@ -948 +955 @@
 
                         // The name of the file to search for
-                        $locales = Config::item('locale.language');
-                        $filename = $locales[0].'/'.$group;
+                        $locale   = Config::item('locale.language.0');
+                        $filename = $locale.'/'.$group;
 
                         // Loop through the files and include each one, so SYSPATH files
@@ -979 +986 @@
                 $line = self::key_string($language, $key);
 
-                // Return the key string as fallback
                 if ($line === NULL)
                 {
-                        $locales = Config::item('locale.language');
-                        Log::add('error', 'Missing i18n entry '.$key.' for language '.$locales[0]);
+                        Log::add('error', 'Missing i18n entry '.$key.' for language '.$locale);
+
+                        // Return the key string as fallback
                         return $key;
                 }