projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/I18n.php
[Pman.Core]
/
DataObjects
/
I18n.php
diff --git
a/DataObjects/I18n.php
b/DataObjects/I18n.php
index
0b6a732
..
709f6ca
100644
(file)
--- a/
DataObjects/I18n.php
+++ b/
DataObjects/I18n.php
@@
-46,9
+46,9
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
// 'ta', // tamil
// '**', // other
),
// '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'
),
'm' => array(
'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY'
),
@@
-68,22
+68,46
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
if ($loaded) {
return self::$cfg;
}
if ($loaded) {
return self::$cfg;
}
+
$loaded =true;
$ff= HTML_FlexyFramework::get();
$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_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) {
+ if (isset($ff->$pk)) {
+ //var_dump($pk);
+ $opts = $ff->$pk;
+ break;
+ }
+ }
+ //echo '<PRE>';print_R($opts);//exit;
+
- // 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..
$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;
}
continue;
}
+
self::$cfg[$k] = is_array($v) ? $v : explode(',', $v);
}
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;
return self::$cfg;
@@
-107,8
+131,17
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
}
if (!empty($q['query']['name'])) {
//DB_DAtaObject::debugLevel(1);
}
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');
+ }
+
}
}
}
}
@@
-163,11
+196,11
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
// returns a list of all countries/languages etc.. (with '*')
// returns a list of all countries/languages etc.. (with '*')
- function availableCodes($t)
+ function availableCodes($t
, $filtered = true
)
{
$ret = array();
$cfg = $this->cfg();
{
$ret = array();
$cfg = $this->cfg();
-
+ //echo '<PRE>';print_r($cfg);
switch ($t) {
case 'c':
require_once 'I18Nv2/Country.php';
switch ($t) {
case 'c':
require_once 'I18Nv2/Country.php';
@@
-178,9
+211,11
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
$ret = array_merge($ret, array_keys($cfg['add_c']));
}
$ret = array_merge($ret, array_keys($cfg['add_c']));
}
+
$ret[] = '**';
$ret[] = '**';
+ //echo '<PRE>';print_R($cfg); print_r($ret); exit;
break;
case 'l':
break;
case 'l':
@@
-214,8
+249,20
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
}
$ret[] = '**';
break;
}
$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;
}
}
- 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);
// 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);
@@
-234,12
+281,15
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
function buildDB($ltype= false, $inlang= false )
{
$cfg = $this->cfg();
function buildDB($ltype= false, $inlang= false )
{
$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');
if ($ltype === false) {
// trigger all builds.
//DB_DataObject::debugLevel(1);
$this->buildDB('c');
$this->buildDB('l');
$this->buildDB('m');
+ $this->buildDB('t');
return;
}
return;
}
@@
-346,7
+396,7
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
$ret = $cache[$lang][$type]->getName($k);
}
$ret = $cache[$lang][$type]->getName($k);
}
- if ($orig_lang == 'zh_HK') {
+ 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);
// then translation is by default in simplified.
//print_r($ret);
$ret = @iconv("UTF-8", "GB2312//IGNORE", $ret);