Changeset 1586

Timestamp:

09/17/06 12:12:16 (2 years ago)

Author:

mbonetti

Message:

 

Location:

trunk/gregarius

Files:

• admin/index.php (modified) (1 diff)
• cls/l10n.php (modified) (3 diffs)
• intl/pt_BR/LC_MESSAGES/messages.mo (added)
• schema.php (modified) (1 diff)

trunk/gregarius/admin/index.php

@@ -263 +263 @@
     );
     while (false !== ($entry = $d->read())) {
-        if (preg_match('#^[a-z]{2}_[A-Z]{2}$#',$entry)) {
+        if (preg_match('#^[a-z]{2}_?([A-Z]{2})?$#',$entry)) {
             $ret[$entry]=getLanguageInfo($entry);
         } 

trunk/gregarius/cls/l10n.php

@@ -38 +38 @@
     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)) {
+        $this -> isolang=str_replace('_','-',$this -> locale);
+        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(
-                $m[0].'UTF-8',
-                $m[0].'utf-8',
+                $m[0].'.UTF-8',
+                $m[0].'.utf-8',
                 $m[0],
-                $m[1].'_'.strtoupper($m[1]),
-                $m[1],
-                $m[2]
+                $m[1],              
+                $m[1].'_'.strtoupper($m[1])
+                //$m[2]
             );
             setlocale(LC_ALL, $locales);    
@@ -81 +78 @@
      */
     function __detectUserLang() {
-       if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_[A-Z]{2}$#',$_REQUEST['lang']) && file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang'])) {
+       if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_?([A-Z]{2})?$#',$_REQUEST['lang']) && file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang'])) {
             setcookie(RSS_LOCALE_COOKIE,$_REQUEST['lang'],time()+3600*6,getPath());
             return  $_REQUEST['lang'];
@@ -103 +100 @@
                             // xx-yy -> xx_YY
                             $ret= $pm[1] ."_".strtoupper($pm[2]);
-                        } elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[1]))) {
-                            // xx-yy -> xx_XX
-                            $ret= $pm[1] ."_".strtoupper($pm[1]);
                         }
-                    } elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[1]))) {
-                        // xx  -> xx_XX
-                        $ret= $pm[1] ."_".strtoupper($pm[1]);
+                    } elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] )) {
+                        // xx  -> xx
+                        $ret= $pm[1];
                     } elseif($pm[1] == 'en') {
                         // ugly: a better way would be to look up all the available locales

trunk/gregarius/schema.php

@@ -447 +447 @@
         "rss.output.usepermalinks"  =>      array("true","true","boolean","Display a permalink icon and allow linking a given item directly.",NULL),
         "rss.config.markreadonupdate"=> array("false","false","boolean","Mark all old unread feeds as read when updating if new unread feeds are found.",NULL),
-        "rss.output.lang"           =>      array("en_US,cn_ZH,de_DE,dk_DK,es_ES,fr_FR,he_IL,it_IT,ja_JP,pt_BR,pt_PT,ru_RU,sv_SV,0","en_US,cn_ZH,de_DE,dk_DK,es_ES,fr_FR,he_IL,it_IT,ja_JP,pt_BR,pt_PT,ru_RU,sv_SV,0","enum","Language pack to use.",NULL),
+        "rss.output.lang"           =>      array("en_US,zh_CN,de,da,es,fr,he,it,ja,pt_BR,pt,ru,sv,0","en_US,zh_CN,de,da,es,fr,he,it,ja,pt_BR,pt,ru,sv,0","enum","Language pack to use.",NULL),
         "rss.config.absoluteordering"=> array("true","true","boolean","Allow feeds and folders to be ordered by their order in the admin section. If this option is set to false, channels and folders will be organized alphabetically by their titles.",NULL),
         "rss.config.robotsmeta"     =>      array("noindex,follow","noindex,follow","string","How should spiders crawl us? (see http://www.robotstxt.org/wc/meta-user.html for more info).",NULL),