X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=7d04c9dce9a04b79650bdf1848b0d51079909a1b;hb=23c8b866767181f107e2e8bcd40c6725d96ed850;hp=6353e9f7a06d554e20f6ef2a38be2df49664c6be;hpb=cbf95a725ebc6a221f46e14c6b50f6c517589f7c;p=Pman.Core

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 6353e9f7..7d04c9dc 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,18 +70,27 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         }
         $loaded =true;
         $ff= HTML_FlexyFramework::get();
-         
-        // since our opts array changed alot..
-        $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;
         
-         ;
+        // 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);
+        
+         
+       //  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);
@@ -109,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'); 
+            
+            
         }
     }
     
@@ -165,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();
@@ -217,7 +234,10 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 $ret[] = '**';
                 break;
         }
-        if (!empty($cfg[$t]) && is_array($cfg[$t])) {
+        
+        
+        
+        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);
             
@@ -236,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);
@@ -270,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...