DataObjects/Core_notify.php

[Pman.Core] / DataObjects / I18n.php

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index bcb6123..79d7d18 100644 (file)
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -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;
             
@@ -212,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;
     }
@@ -336,7 +346,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             $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);