Merge pull request #30 from jnuserful/master

feulf · feulf · commit 9903751ae764 · 2013-08-09T03:02:34.000-07:00
fixed error in Louder::init_language() when the language files don't exist
diff --git a/system/language/es/generic.php b/system/language/es/generic.php
@@ -3,12 +3,11 @@
 	// locale
 	define( "LOCALE", "es_MX.utf-8,es_MX,esp,Espa&ntilde;ol" );		//define locale language
 
-  $days = array("Lunes","Martes","Mi&eacute;rcoles","Jueves","Viernes","S&aacute;bado","Domingo");//needed to use %l option for date()
-  $abbrDays = array("Lun","Mar","Mi&eacute;","Jue","Vie","S&aacute;b","Dom");//needed to use %D option for date()
-  
+  $days = array("Domingo","Lunes","Martes","Mi&eacute;rcoles","Jueves","Viernes","S&aacute;bado");//needed to use %l option for date()
+  $abbrDays = array("Dom","Lun","Mar","Mi&eacute;","Jue","Vie","S&aacute;b");//needed to use %D option for date()
 	//Time
 	define( "DATE_FORMAT"		, "%d %b %Y" );
-	define( "DATE_TIME_FORMAT"	, $abbrDays[ date("%w") ] . " - %I:%M %p" );//array notation to simulate %D
+	define( "DATE_TIME_FORMAT"	, $abbrDays[ date("w") ] . " - %I:%M %p" );//array notation to simulate %D
 	define( "TIME_FORMAT"		, "%I:%M %p" );
 	define( "MONTH_FORMAT"		, "%d %b" );
 	
diff --git a/system/library/Loader.php b/system/library/Loader.php
@@ -283,27 +283,40 @@ function init_language() {
 
             $installed_language = get_installed_language();
             $installed_language = array_flip( $installed_language );
+
+            $priority_lang = array();
             
-            // get the language
-            if (get('set_lang_id'))
-                $lang_id = get('set_lang_id');
-            elseif (isset($_SESSION['lang_id']))
-                $lang_id = $_SESSION['lang_id'];
-            else
-                $lang_id = get_setting('lang_id');
+            // get the languages
+            $requested_lang = get('set_lang_id');
+            if ($requested_lang)// the first in the priority list is the GET query like ?set_lang_id=en
+                $priority_lang[] = $requested_lang;
+            
+            if (isset($_SESSION['lang_id']))// the second on the priority list is the previously established
+                $priority_lang[] = $_SESSION['lang_id'];
 
-            // language not found, load the default language
-            if (!isset($installed_language[$lang_id])) {
-                $default_language = array_pop($installed_language);
-                $lang_id = $default_language['lang_id'];
+            if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { // the third is the sent by the browser
+            
+                foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $part) {
+	            $priority_lang[] = strtolower(substr($part, 0, 2));
+	        }
             }
 
-            // set the language in session
-            $_SESSION['lang_id'] = $lang_id;
+            $priority_lang[] = get_setting('lang_id');// the fourth is the system
 
-            // define the constant
-            define("LANG_ID", $lang_id);
+            $priority_lang = array_unique( $priority_lang );
 
+            // through the list of langs ​​to see which is the best to use
+            while ((list(,$lang) = each($priority_lang)) && !defined("LANG_ID")) {
+                if(isset($installed_language[ $lang ]))
+                    define("LANG_ID", $lang);
+            }
+
+            if(!defined("LANG_ID"))// whether the languages listed is not available
+                throw new Exception("Can not find the language file");
+
+            // set the language in session
+            $_SESSION['lang_id'] = LANG_ID;
+       
             // load the dictionaries
             load_lang('generic');
             
@@ -546,4 +559,4 @@ protected function _get_load_area( ){
         protected function  __construct() {}
 
 
-}
+}
