X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=c791d06bf95f157bb988854860f9f14b3206ffa1;hb=1c16c1cd881c59882fd24a880d900439903df79b;hp=dd8b7cefe0612e348c4249b7cd8a3679fe5b62c6;hpb=f646816abcca8ffd49006198945b67e3e72aefd7;p=Pman.Core diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php index dd8b7cef..c791d06b 100644 --- a/DataObjects/I18n.php +++ b/DataObjects/I18n.php @@ -55,6 +55,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject 'add_l'=> array(), // key -> value additional languages... 'add_c'=> array(), // additional countries...(eg. '-R' => 'Regional' ) 'add_m'=> array(), // additional currencies... + 'add_t'=> array(), // additional currencies... ); @@ -138,9 +139,9 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject if (!empty($q['_filtered']) && !empty($this->ltype)) { $cfg = $this->cfg(); $filter = $cfg[$this->ltype]; - print_R($filter);exit; - $this->whereAddIn('lkey', $filter, 'string'); - + if(is_array($filter)){ + $this->whereAddIn('lkey', $filter, 'string'); + } } } @@ -249,6 +250,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; } @@ -273,13 +283,14 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject { $cfg = $this->cfg(); - //print_r($cfg); + print_r($cfg);exit; if ($ltype === false) { // trigger all builds. //DB_DataObject::debugLevel(1); $this->buildDB('c'); $this->buildDB('l'); $this->buildDB('m'); + $this->buildDB('t'); return; } @@ -362,10 +373,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']));
         }