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
cbe8a79
..
b5cde57
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,11
+68,20
@@
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();
-
- // since our opts array changed alot..
- $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N) : $ff->Pman_Core_I18N;
+
+ // 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;
+ }
+ }
+ //echo '<PRE>';print_R($opts);//exit;
// var_dump($opts);exit;
// var_dump($opts);exit;
@@
-82,11
+91,23
@@
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;
}
+
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;
@@
-110,8
+131,8
@@
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);
-
- $this->whereAdd("
lval LIKE '". $this->escape($q['query']['name']). "
%'");
+ $v = strtoupper($this->escape($q['query']['name']));
+ $this->whereAdd("
upper(lval) LIKE '%{$v}
%'");
}
if (!empty($q['_filtered']) && !empty($this->ltype)) {
}
if (!empty($q['_filtered']) && !empty($this->ltype)) {
@@
-178,8
+199,7
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
{
$ret = array();
$cfg = $this->cfg();
{
$ret = array();
$cfg = $this->cfg();
- echo '<PRE>';
- print_r($cfg);exit;
+
switch ($t) {
case 'c':
require_once 'I18Nv2/Country.php';
switch ($t) {
case 'c':
require_once 'I18Nv2/Country.php';
@@
-190,9
+210,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':
@@
-285,7
+307,7
@@
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);
+ 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...