Changeset 1591 for trunk/gregarius/cls/l10n.php

Timestamp:

09/25/06 14:33:50 (2 years ago)

Author:

mbonetti

Message:

fixed a stupid bug where some locales from $_SERVERHTTP_ACCEPT_LANGUAGE?
were not handled.

Files:

• trunk/gregarius/cls/l10n.php (modified) (4 diffs)

trunk/gregarius/cls/l10n.php

@@ -79 +79 @@
     function __detectUserLang() {
        if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_?([A-Z]{2})?$#',$_REQUEST['lang']) && ($_REQUEST['lang'] == 'en' || file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang']))) {
-            setcookie(RSS_LOCALE_COOKIE,$_REQUEST['lang'],time()+3600*6,getPath());
+            $this -> __setLocaleCookie($_REQUEST['lang']);
             return  $_REQUEST['lang'];
         } elseif (isset($_COOKIE[RSS_LOCALE_COOKIE])) {
@@ -96 +96 @@
                 if (preg_match('#^([a-z]{2})[\-_]?([a-z]{2})?$#i',$ll,$pm)) {
                     $ret =null;
-                    if (isset($pm[2])){
-                        if (file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[2]))) {
-                            // xx-yy -> xx_YY
-                            $ret= $pm[1] ."_".strtoupper($pm[2]);
-                        }
+                    if (isset($pm[2]) && file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[2]))) {
+                        // xx-yy -> xx_YY
+                        $ret= $pm[1] ."_".strtoupper($pm[2]);
                     } elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] )) {
                         // xx  -> xx
@@ -111 +109 @@
                     if ($ret) {
                         // remember the detected locale for a couple hours
-                        setcookie(RSS_LOCALE_COOKIE,$ret,time()+3600*6,getPath());
+                        $this -> __setLocaleCookie($ret);
                         return $ret;
                     }
@@ -121 +119 @@
         return getConfig('rss.output.lang');
     }
+
+    function __setLocaleCookie($value) {
+        setcookie(RSS_LOCALE_COOKIE,$value,time()+3600*6,getPath());
+    }
 }