Changeset 1569

Timestamp:

09/10/06 11:52:49 (2 years ago)

Author:

mbonetti

Message:

Locale selection in the admin, LC_ALL

Location:

trunk/gregarius

Files:

• admin/config.php (modified) (1 diff)
• admin/index.php (modified) (1 diff)
• cls/l10n.php (modified) (1 diff)
• init.php (modified) (3 diffs)

trunk/gregarius/admin/config.php

@@ -298 +298 @@
         case 'rss.output.lang':
             $langs = getLanguages();
+
             $codes = array_keys($langs);
             $out_val = implode(',',$codes);

trunk/gregarius/admin/index.php

@@ -258 +258 @@
     $ret = array();
     $activeIdx = "0";
+    $ret['en_US']='en_US';
     while (false !== ($entry = $d->read())) {
-        if (
-            $entry != "CVS" &&
-            substr($entry,0,1) != "."
-        ) {
-            $info = getLanguageInfo($entry);
-            if (count($info) && array_key_exists('language',$info)) {
-                $shortL=  preg_replace('|\.php.*$|','',$entry);
-                $ret[$shortL] = $info['language'];
-            }
-        }
+        if (preg_match('#^[a-z]{2}_[A-Z]{2}$#',$entry)) {
+            $ret[$entry]=$entry;
+        } 
     }
     $d->close();

trunk/gregarius/cls/l10n.php

@@ -35 +35 @@
     
     function RSSl10n($locale) {
+        $locale = preg_replace('#[^a-zA-Z_]#','',$locale);
+        if (function_exists('version_compare') && version_compare("4.2.0",PHP_VERSION, "<=") && preg_match('#([a-z]{2})_([A-Z]{2})#',$locale,$m)) {
+            $locales=array(
+                $m[0].'UTF-8',
+                $m[0].'utf-8',
+                $m[0],
+                $m[1].'_'.strtoupper($m[1]),
+                $m[1],
+                $m[2]
+            );
+            setlocale(LC_ALL, $locales);    
+        } else {
+            setlocale(LC_ALL, $locale);
+        }
+        
         $path = GREGARIUS_HOME .'/intl/' . $locale . '/LC_MESSAGES/messages.mo';
         $streamer = new FileReader($path);

trunk/gregarius/init.php

@@ -115 +115 @@
 // Localization
 //
-require_once('cls/l10n.php');
-$GLOBALS['rssl10n'] = new RSSl10n();
-
-
 $lang = getConfig('rss.output.lang');
 if (!preg_match('#^[a-zA-Z_]+$#', $lang)) {
     die('woopsie, bad lang: ' .$lang);
 }
+
+require_once('cls/l10n.php');
+$GLOBALS['rssl10n'] = new RSSl10n($lang);
+
+
 
 if ($lang && file_exists(dirname(__FILE__) . "/" . "intl/$lang.php")) {
@@ -146 +147 @@
 }
 
-
+/*
 // Load the right locale
 if (defined('OVERRIDE_LOCALE')) {
@@ -166 +167 @@
     }
 }
-
+*/