projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_project.php
[Pman.Core]
/
DataObjects
/
I18n.php
diff --git
a/DataObjects/I18n.php
b/DataObjects/I18n.php
index
86d521a
..
c7ea606
100644
(file)
--- a/
DataObjects/I18n.php
+++ b/
DataObjects/I18n.php
@@
-7,7
+7,7
@@
* It should eventually replace most of that..
*
*/
* It should eventually replace most of that..
*
*/
-require_once 'DB/DataObject.php';
+
class_exists('DB_DataObject') ? '' :
require_once 'DB/DataObject.php';
class Pman_Core_DataObjects_I18n extends DB_DataObject
{
class Pman_Core_DataObjects_I18n extends DB_DataObject
{
@@
-52,9
+52,11
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
'm' => array(
'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY'
),
'm' => array(
'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY'
),
+ 'p' => '*',
'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_p'=> array(), // additional currencies...
);
);
@@
-101,7
+103,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;
}
@@
-129,6
+131,10
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
");
}
");
}
+
+ if (!empty($q['!code'])) {
+ $this->whereAddIn('!lkey', explode(',', $q['!code']), 'string');
+ }
if (!empty($q['query']['name'])) {
//DB_DAtaObject::debugLevel(1);
$v = strtoupper($this->escape($q['query']['name']));
if (!empty($q['query']['name'])) {
//DB_DAtaObject::debugLevel(1);
$v = strtoupper($this->escape($q['query']['name']));
@@
-138,12
+144,30
@@
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');
+ }
}
}
}
}
+ function lookupCode($inlang,$ltype,$name)
+ {
+ $x = DB_DataObject::factory('i18n');
+ $x->ltype = $ltype;
+ $x->lval = $name;
+ $x->inlang= $inlang;
+
+ $x->limit(1);
+ if ($x->find(true) && !empty($x->lkey)) {
+ return $x->lkey;
+ }
+ return '';
+
+
+ }
+
+
function translate($inlang,$ltype,$kval)
{
function translate($inlang,$ltype,$kval)
{
@@
-199,7
+223,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
+272,15
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
}
$ret[] = '**';
break;
}
$ret[] = '**';
break;
+ case 'p':
+ require_once 'I18Nv2/PhonePrefix.php';
+ $c = new I18Nv2_PhonePrefix('en');
+ $ret = array_keys($c->codes);
+ if (!empty($cfg['add_p'])) {
+ $ret = array_merge($ret, array_keys($cfg['add_p']));
+ }
+ $ret[] = '**';
+ break;
}
}
@@
-272,13
+305,13
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
{
$cfg = $this->cfg();
{
$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('p', 'en');
return;
}
return;
}
@@
-307,7
+340,6
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
$complete = $x->fetchAll('lkey');
$list = $this->availableCodes($ltype);
$complete = $x->fetchAll('lkey');
$list = $this->availableCodes($ltype);
- //echo '<PRE>'; print_r($list);
foreach($list as $lkey) {
// skip ones we know we have done...
foreach($list as $lkey) {
// skip ones we know we have done...
@@
-361,10
+393,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'),
+ 'p' => new I18Nv2_PhonePrefix($lang, 'UTF-8')
);
//echo '<PRE>';print_r(array($lang, $cache[$lang]['c']));
}
);
//echo '<PRE>';print_r(array($lang, $cache[$lang]['c']));
}