Changeset 1584 for trunk/gregarius/cls

Timestamp:

09/16/06 10:57:41 (2 years ago)

Author:

mbonetti

Message:

fix for #442

Location:

trunk/gregarius/cls

Files:

• l10n.php (modified) (3 diffs)
• wrappers/header.php (modified) (1 diff)

trunk/gregarius/cls/l10n.php

@@ -34 +34 @@
     var $cache;
     var $locale;
+    var $isolang;
     
     function RSSl10n() {
         $this -> locale = preg_replace('#[^a-zA-Z_]#','',$this -> __detectUserLang());
+        
+        $ll=explode('_',$this -> locale);
+        $this->isloang=$ll[0].'-'.strtoupper($ll[1]);
+        
         if (function_exists('version_compare') && version_compare("4.3.0",PHP_VERSION, "<=") && preg_match('#([a-z]{2})_([A-Z]{2})#',$this -> locale,$m)) {
             $locales=array(
@@ -68 +73 @@
     function getLocale() {
         return $this -> locale;
+    }
+    function getISOLang() {
+        return $this ->isloang;
     }
     /**
@@ -102 +110 @@
                         // xx  -> xx_XX
                         $ret= $pm[1] ."_".strtoupper($pm[1]);
+                    } elseif($pm[1] == 'en') {
+                        // ugly: a better way would be to look up all the available locales
+                        // and match against that list
+                        $ret='en_US';
                     }
                     if ($ret) {

trunk/gregarius/cls/wrappers/header.php

@@ -157 +157 @@
 }
 
+function rss_header_doclang() {
+    return isset($GLOBALS['rssl10n']) && $GLOBALS['rssl10n']->getISOLang() ? $GLOBALS['rssl10n']->getISOLang():'en';
+}
 ?>