X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FI18n.php;h=dbd8cc0e5dd865fb15f1fe86bd281ffa09f54ab8;hp=82b5b3d5580328920da66a3fa18d0cd8520928eb;hb=9052dd7f5d765f24f4192f44cfbb186781211951;hpb=ea1ced9231b74ce9f4c73e82fd02d2dd94fc8ea1 diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php index 82b5b3d5..dbd8cc0e 100644 --- a/DataObjects/I18n.php +++ b/DataObjects/I18n.php @@ -52,9 +52,11 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject 'm' => array( 'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY' ), + 'p' => array('en'), 'add_l'=> array(), // key -> value additional languages... 'add_c'=> array(), // additional countries...(eg. '-R' => 'Regional' ) 'add_m'=> array(), // additional currencies... + 'add_p'=> array(), // additional currencies... ); @@ -84,7 +86,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject //echo '
';print_R($opts);//exit; - // var_dump($opts);exit; + // var_dump($opts);exit; $i = DB_DataObject::Factory('I18n'); // load the cofiguration @@ -101,7 +103,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 +140,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 +202,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 +251,16 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject } $ret[] = '**'; break; + case 'p': + require_once 'I18Nv2/PhonePrefix.php'; + $c = new I18Nv2_PhonePrefix('en'); + $ret = array_keys($c->codes); + print_R($ret);exit; + if (!empty($cfg['add_p'])) { + $ret = array_merge($ret, array_keys($cfg['add_p'])); + } + $ret[] = '**'; + break; } @@ -272,13 +285,13 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject { $cfg = $this->cfg(); - //print_r($cfg); if ($ltype === false) { // trigger all builds. //DB_DataObject::debugLevel(1); - $this->buildDB('c'); - $this->buildDB('l'); - $this->buildDB('m'); +// $this->buildDB('c'); +// $this->buildDB('l'); +// $this->buildDB('m'); + $this->buildDB('p'); return; } @@ -307,7 +320,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject $complete = $x->fetchAll('lkey'); $list = $this->availableCodes($ltype); - //echo ''; print_r($list); + echo ''; print_r($list); exit; foreach($list as $lkey) { // skip ones we know we have done... @@ -361,10 +374,12 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject require_once 'I18Nv2/Country.php'; require_once 'I18Nv2/Language.php'; require_once 'I18Nv2/Currency.php'; + require_once 'I18Nv2/PhonePrefix.php'; $cache[$lang] = array( 'l' => new I18Nv2_Language($lang, 'UTF-8'), 'c' => new I18Nv2_Country($lang, 'UTF-8'), - 'm' => new I18Nv2_Currency($lang, 'UTF-8') + 'm' => new I18Nv2_Currency($lang, 'UTF-8'), + 't' => new I18Nv2_PhonePrefix($lang, 'UTF-8') ); //echo '';print_r(array($lang, $cache[$lang]['c'])); }