X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=dbd8cc0e5dd865fb15f1fe86bd281ffa09f54ab8;hb=9052dd7f5d765f24f4192f44cfbb186781211951;hp=6353e9f7a06d554e20f6ef2a38be2df49664c6be;hpb=cbf95a725ebc6a221f46e14c6b50f6c517589f7c;p=Pman.Core diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php index 6353e9f7..dbd8cc0e 100644 --- a/DataObjects/I18n.php +++ b/DataObjects/I18n.php @@ -46,15 +46,17 @@ 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' ), + '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... ); @@ -68,24 +70,46 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject if ($loaded) { return self::$cfg; } + $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_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) { + if (isset($ff->$pk)) { + //var_dump($pk); + $opts = $ff->$pk; + break; + } + } + //echo '
';print_R($opts);//exit; + + + // 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); } + // available codes recursively calls this... -- so the above has to be set first.. + foreach($opts as $k=>$v) { + + if ($v == '*') { // everything.. + self::$cfg[$k] = '*'; //$i->availableCodes($k, false); + continue; + } + + } + + return self::$cfg; @@ -109,8 +133,17 @@ 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]; + if(is_array($filter)){ + $this->whereAddIn('lkey', $filter, 'string'); + } + } } @@ -165,11 +198,11 @@ 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(); - + //echo '';print_r($cfg); switch ($t) { case 'c': require_once 'I18Nv2/Country.php'; @@ -180,9 +213,11 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject $ret = array_merge($ret, array_keys($cfg['add_c'])); } + $ret[] = '**'; + //echo '';print_R($cfg); print_r($ret); exit; break; case 'l': @@ -216,8 +251,21 @@ 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; } - 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,12 +284,14 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject function buildDB($ltype= false, $inlang= false ) { $cfg = $this->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; } @@ -270,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... @@ -324,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'])); }