X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=7d04c9dce9a04b79650bdf1848b0d51079909a1b;hb=23c8b866767181f107e2e8bcd40c6725d96ed850;hp=23e847afff4f099414a62e133d980eafb6106348;hpb=619b54c7a7c9fc2132a93923ee4da1c645e1e13f;p=Pman.Core diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php index 23e847af..7d04c9dc 100644 --- a/DataObjects/I18n.php +++ b/DataObjects/I18n.php @@ -38,21 +38,21 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject // languages available 'l' => array( - 'en', 'zh_CN', 'zh_HK', 'zh_TW', 'th', 'ko', 'ja', 'ms', - 'id', // indonesian - 'tl', // tagalog - 'vi', //vietnamise - 'hi', // hindi - 'ta', // tamil - '**', // other - ), - 'c' => array( - 'AU', 'CN', 'HK', 'IN', 'ID', 'JP', 'MY', 'NZ', 'TW', 'SG', 'TH', 'KR', 'US', 'PH', 'VN','**' + 'en', 'zh_CN', 'zh_HK', 'zh_TW', //'th', 'ko', 'ja', 'ms', + //'id', // indonesian + // 'tl', // tagalog + // 'vi', //vietnamise + // 'hi', // hindi + // 'ta', // tamil + // '**', // other ), + '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' ), - 'add_l'=> array(), // additional languages... + 'add_l'=> array(), // key -> value additional languages... 'add_c'=> array(), // additional countries...(eg. '-R' => 'Regional' ) 'add_m'=> array(), // additional currencies... @@ -70,16 +70,27 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject } $loaded =true; $ff= HTML_FlexyFramework::get(); + + // 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); + - // since our opts array changed alot.. - $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N) : $ff->Pman_Core_I18N; + // 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); @@ -94,8 +105,8 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject function applyFilters($q, $au) { - - DB_DataObject::debugLevel(1); + $this->buildDB(); + //DB_DataObject::debugLevel(1); if (!empty($q['query']['_with_en'])) { $this->buildDB(); // ensure we have the full database... @@ -107,23 +118,37 @@ 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'); + + } } - function translate($inlang,$ltype,$kval) { $x = DB_DataObject::factory('i18n'); $x->ltype = $ltype; - $x->inlang= $inlang; $x->lkey = $kval; - $x->limit(1); - $x->find(true); - return $x->lval; + $x->inlang= $inlang; + $fallback = clone($x); + $x->limit(1); + if ($x->find(true) && !empty($x->lval)) { + return $x->lval; + } + $fallback->inlang = 'en'; + if ($fallback->find(true) && !empty($fallback->lval)) { + return $fallback->lval; + } + return $kval; } @@ -157,12 +182,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(); - print_r('
'); - print_r($t); + switch ($t) { case 'c': require_once 'I18Nv2/Country.php'; @@ -172,6 +196,9 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject if (!empty($cfg['add_c'])) { $ret = array_merge($ret, array_keys($cfg['add_c'])); } + + + $ret[] = '**'; break; @@ -180,16 +207,21 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject $c = new I18Nv2_Language('en'); $ret = array_keys($c->codes); // we need to make sure these are lowercase!!! -// foreach($ret as $k){ -// -// } -// $ret[$i] = strol - + + foreach ($cfg['add_l'] as $k=>$v){ + // make sure that add_l is formated correctly.. (lower_UPPER?) + $tolang = explode('_', $k); + $tolang[0] = strtolower($tolang[0]); + $tolang = implode('_', $tolang); + + unset($cfg['add_l'][$k]); // if they match..unset first.. then set + + $cfg['add_l'][$tolang] = $v; + } if (!empty($cfg['add_l'])) { $ret = array_merge($ret, array_keys($cfg['add_l'])); } - print_r(''); - print_r($ret); + $ret[] = '**'; break; case 'm': @@ -203,13 +235,20 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject break; } - foreach ($ret as $k=>$v) { - $ret[$k] = ($t=='l') ? $ret[$k] : strtoupper($v); + + + 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); + } - if($t=='l'){ - print_r(''); - print_r($ret); - } + + // why upper case everyting?!?!? + + //foreach ($ret as $k=>$v) { + // $ret[$k] = ($t=='l') ? $ret[$k] : strtoupper($v); + //} + return $ret; } @@ -217,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); @@ -251,13 +292,16 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject $complete = $x->fetchAll('lkey'); $list = $this->availableCodes($ltype); + echo ''; print_r($list); - //print_r($list); foreach($list as $lkey) { // skip ones we know we have done... -// if (in_array($lkey, $complete)) { -// continue; -// } + if (in_array($lkey, $complete)) { + continue; + } + if (empty($lkey)) { // not sure why we get empty values here. + continue; + } $x = DB_DataObject::factory('I18n'); $x->ltype = $ltype; $x->lkey = $lkey; @@ -286,15 +330,17 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject { static $cache; + + $cfg = $this->cfg(); if (empty($k)) { return '??'; } - print_r($k); - $lbits = explode('_', strtoupper($lang)); + //$lbits = explode('_', strtoupper($lang)); + $lbits = explode('_', $lang); + $orig_lang = $lang; $lang = $lbits[0]; - print_r($lbits); if (!isset($cache[$lang])) { require_once 'I18Nv2/Country.php'; @@ -311,23 +357,39 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject if ($k == '**') { return 'Other / Unknown'; } - $ret = $cache[$lang][$type]->getName($k); - if ($type == 'l') { + + // for languages if we get zh_HK then we write out Chinese ( HK ) + + + if ($type == 'l' && strpos($k, '_') > -1) { $tolang = explode('_', $k); - - $ret = $cache[$lang][$type]->getName($tolang[0]); - if (count($tolang) > 1) { - $ret.= '('.$tolang[1].')'; - } + $ret = $cache[$lang][$type]->getName(strtolower($tolang[0])) . '('.$tolang[1].')'; + + } else { + $ret = $cache[$lang][$type]->getName($k); } + + if ($orig_lang == 'zh_HK' || $orig_lang == 'zh_TW' ) { + // then translation is by default in simplified. + //print_r($ret); + $ret = @iconv("UTF-8", "GB2312//IGNORE", $ret); + //print_r($ret); + $ret = @iconv("GB2312", "BIG5//IGNORE", $ret); + //print_r($ret); + + $ret = @iconv("BIG5", "UTF-8//IGNORE", $ret); + //print_r($ret); + } + + + // our wierd countries/langs etc.. if (isset($cfg['add_' . $type][$k])) { return $cfg['add_' . $type][$k]; } - //print_r(array($k, $ret)); return $ret;