X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=709f6cad2e6d342e8186a3d6ed7e570d245e2ca0;hb=696acb656788cd22a74e06a7c6690070e52e2fab;hp=86d521a87a0d2225c77366270f37e738b03007bb;hpb=5fc1b7a49d609a0ab5144f752f8f80667cd02cd5;p=Pman.Core diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php index 86d521a8..709f6cad 100644 --- a/DataObjects/I18n.php +++ b/DataObjects/I18n.php @@ -101,7 +101,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject foreach($opts as $k=>$v) { if ($v == '*') { // everything.. - self::$cfg[$k] = $i->availableCodes($k, false); + self::$cfg[$k] = '*'; //$i->availableCodes($k, false); continue; } @@ -138,8 +138,9 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject if (!empty($q['_filtered']) && !empty($this->ltype)) { $cfg = $this->cfg(); $filter = $cfg[$this->ltype]; - $this->whereAddIn('lkey', $filter, 'string'); - + if(is_array($filter)){ + $this->whereAddIn('lkey', $filter, 'string'); + } } } @@ -199,7 +200,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject { $ret = array(); $cfg = $this->cfg(); - echo '
';print_r($cfg);
+        //echo '
';print_r($cfg);
         switch ($t) {
             case 'c':
                 require_once 'I18Nv2/Country.php';
@@ -248,6 +249,15 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 }
                 $ret[] = '**';
                 break;
+            case 't':
+                require_once 'I18Nv2/PhonePrefix.php';
+                $c = new I18Nv2_PhonePrefix('en');
+                $ret =  array_keys($c->codes);
+                if (!empty($cfg['add_t'])) {
+                    $ret = array_merge($ret, array_keys($cfg['add_m']));
+                }
+                $ret[] = '**';
+                break;
         }
         
         
@@ -279,6 +289,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             $this->buildDB('c');
             $this->buildDB('l');
             $this->buildDB('m');
+            $this->buildDB('t');
             return;
         }