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
618f53d
..
c791d06
100644
(file)
--- 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_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,8
+139,9
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
if (!empty($q['_filtered']) && !empty($this->ltype)) {
$cfg = $this->cfg();
$filter = $cfg[$this->ltype];
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
+201,7
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
{
$ret = array();
$cfg = $this->cfg();
{
$ret = array();
$cfg = $this->cfg();
- echo '<PRE>';print_r($cfg);
+
//
echo '<PRE>';print_r($cfg);
switch ($t) {
case 'c':
require_once 'I18Nv2/Country.php';
switch ($t) {
case 'c':
require_once 'I18Nv2/Country.php';
@@
-248,6
+250,15
@@
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;
}
}
@@
-272,13
+283,14
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
{
$cfg = $this->cfg();
{
$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');
if ($ltype === false) {
// trigger all builds.
//DB_DataObject::debugLevel(1);
$this->buildDB('c');
$this->buildDB('l');
$this->buildDB('m');
+ $this->buildDB('t');
return;
}
return;
}
@@
-361,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/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'),
$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 '<PRE>';print_r(array($lang, $cache[$lang]['c']));
}
);
//echo '<PRE>';print_r(array($lang, $cache[$lang]['c']));
}