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
86d521a
..
709f6ca
100644
(file)
--- a/
DataObjects/I18n.php
+++ b/
DataObjects/I18n.php
@@
-101,7
+101,7
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
foreach($opts as $k=>$v) {
if ($v == '*') { // everything..
foreach($opts as $k=>$v) {
if ($v == '*') { // everything..
-
self::$cfg[$k] =
$i->availableCodes($k, false);
+
self::$cfg[$k] = '*'; //
$i->availableCodes($k, false);
continue;
}
continue;
}
@@
-138,8
+138,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
+200,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
+249,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;
}
}
@@
-279,6
+289,7
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
$this->buildDB('c');
$this->buildDB('l');
$this->buildDB('m');
$this->buildDB('c');
$this->buildDB('l');
$this->buildDB('m');
+ $this->buildDB('t');
return;
}
return;
}