Changeset 1413020

Timestamp:

05/09/2016 01:59:23 PM (10 years ago)

Author:

ishaijaffe

Message:

don't override website original locale

Location:

bablic

Files:

• tags/2.0/Bablic.php (modified) (1 diff)
• trunk/Bablic.php (modified) (1 diff)

bablic/tags/2.0/Bablic.php

@@ -109 +109 @@
         return $options['orig'];
     }
-    function get_locale(){
+    function get_locale($lang){
+        $options = $this->optionsGetOptions();
+        if(!$lang)
+            $lang = $options['orig'];
+        if(is_admin())
+            return $lang;
         $header = (isset($_SERVER['HTTP_BABLIC_LOCALE']) ? $_SERVER['HTTP_BABLIC_LOCALE'] : null);
+        $bablic_locale = '';
         if($header){
-            return $header;
+            $bablic_locale = $header;
         }
         $url = $_SERVER['REQUEST_URI'];
-        return $this->get_locale_from_url($url);
+        $bablic_locale = $this->get_locale_from_url($url);
+        if(!$bablic_locale || $bablic_locale == $options['orig'])
+            return $lang;
+        return $bablic_locale;
     }
     

bablic/trunk/Bablic.php

@@ -109 +109 @@
         return $options['orig'];
     }
-    function get_locale(){
+    function get_locale($lang){
+        $options = $this->optionsGetOptions();
+        if(!$lang)
+            $lang = $options['orig'];
+        if(is_admin())
+            return $lang;
         $header = (isset($_SERVER['HTTP_BABLIC_LOCALE']) ? $_SERVER['HTTP_BABLIC_LOCALE'] : null);
+        $bablic_locale = '';
         if($header){
-            return $header;
+            $bablic_locale = $header;
         }
         $url = $_SERVER['REQUEST_URI'];
-        return $this->get_locale_from_url($url);
+        $bablic_locale = $this->get_locale_from_url($url);
+        if(!$bablic_locale || $bablic_locale == $options['orig'])
+            return $lang;
+        return $bablic_locale;
     }