DataObjects/core.sql

[Pman.Core] / DataObjects / I18n.php

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index bf909f7..79d7d18 100644 (file)
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -52,7 +52,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         'm' => array(
             'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY'
         ),
-        'add_l'=> array(), // additional languages... 
+        'add_l'=> array(), // key -> value additional languages... 
         'add_c'=> array(), // additional countries...(eg. '-R' => 'Regional' )
         'add_m'=> array(), // additional currencies...
 
@@ -177,6 +177,9 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 if (!empty($cfg['add_c'])) {
                     $ret = array_merge($ret, array_keys($cfg['add_c']));
                 }
+                
+                 
+                
                 $ret[] = '**';
                 break;
             
@@ -191,8 +194,10 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                     $tolang = explode('_', $k);
                     $tolang[0] = strtolower($tolang[0]);
                     $tolang = implode('_', $tolang);
+                    
+                    unset($cfg['add_l'][$k]); // if they match..unset first.. then set
+                    
                     $cfg['add_l'][$tolang] = $v;
-                    unset($cfg['add_l'][$k]);
                 }
                 if (!empty($cfg['add_l'])) {
                     $ret = array_merge($ret, array_keys($cfg['add_l']));
@@ -210,10 +215,17 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 $ret[] = '**';
                 break;
         }
-        
-        foreach ($ret as $k=>$v) {
-            $ret[$k] = ($t=='l') ? $ret[$k] : strtoupper($v);
+        if (!empty($cfg[$t]) && is_array($cfg[$t])) {
+            // then there is a filter. - we should include all of them, even if they are not relivatn??
+            return $cfg[$t]; //array_intersect($cfg[$t], $ret);
+            
         }
+        
+        // why upper case everyting?!?!?
+        
+        //foreach ($ret as $k=>$v) {
+        //    $ret[$k] = ($t=='l') ? $ret[$k] : strtoupper($v);
+        //}
 
         return $ret;
     }
@@ -294,6 +306,8 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     {
       
         static $cache;
+        
+        
         $cfg = $this->cfg();
         if (empty($k)) {
             return '??';
@@ -319,21 +333,20 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         if ($k == '**') {
             return 'Other / Unknown';
         }
-        $ret = $cache[$lang][$type]->getName($k);
+        
         
         // for languages if we get zh_HK then we write out Chinese ( HK )
         
         
-        if ($type == 'l') {
+        if ($type == 'l' && strpos($k, '_') > -1) {
             $tolang = explode('_', $k);
+            $ret = $cache[$lang][$type]->getName(strtolower($tolang[0])) .  '('.$tolang[1].')'; 
             
-            $ret = $cache[$lang][$type]->getName($tolang[0]);
-            if (count($tolang) > 1) {
-                $ret.= '('.$tolang[1].')'; 
-            }
+        } else {
+            $ret = $cache[$lang][$type]->getName($k);
         }
         
-        if ($orig_lang == 'zh_HK') {
+        if ($orig_lang == 'zh_HK' || $orig_lang == 'zh_TW' ) {
             // then translation is by default in simplified.
             //print_r($ret);
             $ret = @iconv("UTF-8", "GB2312//IGNORE", $ret);