X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=77f81b8ee72762b364f7026d22f3df80ad34313b;hb=576d8cf97a786080e56759154519f365b5d15e67;hp=bcb61237958c6b5adfab852ea6d3abc9d2c9aaad;hpb=7ba17bcdaee1869adbfcb0a7d5f70183f20cebf0;p=Pman.Core

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index bcb61237..77f81b8e 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -46,9 +46,9 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
           //  'ta', // tamil
           //  '**', // other
         ),
-        'c' => array(
-             'AU', 'CN', 'HK', 'IN', 'ID', 'JP', 'MY', 'NZ', 'TW', 'SG', 'TH', 'KR', 'US', 'PH', 'VN','**'
-        ),
+        'c' => '*', // array(
+             //'AU', 'CN', 'HK', 'IN', 'ID', 'JP', 'MY', 'NZ', 'TW', 'SG', 'TH', 'KR', 'US', 'PH', 'VN','**'
+        //),
         'm' => array(
             'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY'
         ),
@@ -70,16 +70,27 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         }
         $loaded =true;
         $ff= HTML_FlexyFramework::get();
+        
+        // BC compatible.. if any of these are set, then we use them as the settings..
+        $opts = array();
+        foreach(array('Pman_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) {
+            if (isset($ff->$pk)) {
+                var_dump($pk);
+                $opts=  $ff->$pk;
+                break;
+            }
+        }
+        print_R($opts);
+        
          
-        // since our opts array changed alot..
-        $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;
+       //  var_dump($opts);exit;
         
         $i = DB_DataObject::Factory('I18n');
         // load the cofiguration
         foreach($opts as $k=>$v) {
             
             if ($v == '*') { // everything..
-                self::$cfg[$k] = $i->availableCodes($k);
+                self::$cfg[$k] = $i->availableCodes($k, false);
                 continue;
             }
             self::$cfg[$k] = is_array($v) ? $v  : explode(',', $v);
@@ -107,8 +118,16 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         }
         if (!empty($q['query']['name'])) {
             //DB_DAtaObject::debugLevel(1);
+            $v = strtoupper($this->escape($q['query']['name']));
+            $this->whereAdd("upper(lval) LIKE '%{$v}%'");
+        }
         
-            $this->whereAdd("lval LIKE '". $this->escape($q['query']['name']). "%'");
+        if (!empty($q['_filtered']) && !empty($this->ltype)) {
+            $cfg = $this->cfg();
+            $filter = $cfg[$this->ltype];
+            $this->whereAddIn('lkey', $filter, 'string'); 
+            
+            
         }
     }
     
@@ -163,7 +182,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     
     
     // returns a list of all countries/languages etc.. (with '*')
-    function availableCodes($t)
+    function availableCodes($t, $filtered = true)
     {
         $ret = array();
         $cfg = $this->cfg();
@@ -177,6 +196,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;
             
@@ -213,9 +235,19 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 break;
         }
         
-        foreach ($ret as $k=>$v) {
-            $ret[$k] = ($t=='l') ? $ret[$k] : strtoupper($v);
+        
+        
+        if ($filtered  && !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;
     }
@@ -224,6 +256,8 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     function buildDB($ltype= false, $inlang= false )
     {
         $cfg = $this->cfg();
+        
+        //print_r($cfg);
         if ($ltype === false) {
             // trigger all builds.
             //DB_DataObject::debugLevel(1);
@@ -258,7 +292,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         $complete = $x->fetchAll('lkey');
         
         $list =  $this->availableCodes($ltype);
-        //echo '<PRE>'; print_r($list); 
+       echo '<PRE>'; print_r($list); 
         
         foreach($list as $lkey) {
             // skip ones we know we have done...
@@ -336,7 +370,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);