DataObjects/Core_notify.php

[Pman.Core] / I18n.php

diff --git a/I18n.php b/I18n.php
index 5a49205..afd8950 100644 (file)
--- a/I18n.php
+++ b/I18n.php
@@ -53,13 +53,16 @@ class Pman_Core_i18N extends Pman
     
     // these are the default languages we support.
     // they will allways be overlaid with the current configuration (via getAuth)
+    // THESE WILL ALLWAYS BE UPPERCASE!!!
     var $cfg = array(
         // translated versions availalable
+        
         't' => array(
             'en', 'zh_CN',   'zh_HK', 
         ),
         // languages available
         'l' => array(
+            
             'en', 'zh_CN',   'zh_HK',  'zh_TW', 'th', 'ko', 'ja', 'ms', 
             'id', // indonesian
             'tl', // tagalog
@@ -90,11 +93,11 @@ class Pman_Core_i18N extends Pman
         //}
         $this->authUser = $au;
         
-        $opts = PEAR::getStaticProperty('Pman_Core_I18N', 'options');
-        if (empty($opts)) {
-            $opts = PEAR::getStaticProperty('Pman_I18N', 'options');
-        }
-        $opts = empty($opts)  ?  array() : $opts;
+        $ff= HTML_FlexyFramework::get();
+        
+        
+        $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;
+        
         
         // load the cofiguration
         foreach($opts as $k=>$v) {
@@ -135,6 +138,7 @@ class Pman_Core_i18N extends Pman
                 $ret[] = '**';
                 break;
         }
+        
         foreach ($ret as $k=>$v) {
             $ret[$k] = strtoupper($v);
         }
@@ -183,14 +187,15 @@ class Pman_Core_i18N extends Pman
         $ar = array();
         foreach($langs as $lang)
         {
-            $lang = array_shift(explode('_', strtoupper($lang)));
+            $rlang = array_shift(explode('_', strtoupper($lang)));
             
             $ar[$lang] = array(
-                'l' => $this->objToList('l', new I18Nv2_Language($lang, 'UTF-8')),
-                'c' => $this->objToList('c', new I18Nv2_Country($lang, 'UTF-8')),
-                'm' => $this->objToList('m', new I18Nv2_Currency($lang, 'UTF-8'))
+                'l' => $this->objToList('l', new I18Nv2_Language($rlang, 'UTF-8')),
+                'c' => $this->objToList('c', new I18Nv2_Country($rlang, 'UTF-8')),
+                'm' => $this->objToList('m', new I18Nv2_Currency($rlang, 'UTF-8'))
             );
         }
+        //echo '<PRE>';print_r($ar);
         header('Content-type: text/javascript');
         echo 'Pman.I18n.Data = ' .  json_encode($ar);
         exit;
@@ -200,10 +205,24 @@ class Pman_Core_i18N extends Pman
     }
     function objToList($type, $obj) {
         $ret = array();
-        foreach($obj->codes as $k=>$v) {
+         
+         
+        foreach($this->cfg[$type] as $k) {
+            $sub = false;
+            
+            if (strpos($k, '_') !== false) {
+                $bits = explode('_', $k);
+                $k = array_shift($bits);
+                $sub = array_shift($bits);
+            }
+            $v = $k == '**' ? 'Other' : $obj->getName($k);
+            
+            if ($sub) {
+                $v .= ' ('.$sub.')';
+            }
             
             $ret[] = array(
-                'code'=> $type == 'c' ? $k : strtolower($v) , 
+                'code'=>   ($type=='l' ? strtolower($k) : strtoupper($k)) . ($sub ? '_'.strtoupper($sub) : ''), 
                 'title' => $v
             );
         }