X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=d8509bb4ab7bcc361a105aa80c38b87aaaa506ca;hb=a577c1416d0995e32256d7927b0d39d4e1e2079b;hp=1cd61f2b29f3b85bd43c1f47df58c00d212ac3e9;hpb=6a21fea7fc56c2cf73cdd6490f7dbe4653e2f682;p=Pman.Core diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php index 1cd61f2b..d8509bb4 100644 --- a/DataObjects/I18n.php +++ b/DataObjects/I18n.php @@ -68,11 +68,20 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject if ($loaded) { return self::$cfg; } + $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 '
';print_R($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.. - self::$cfg[$k] = $i->availableCodes($k, false); + // self::$cfg[$k] = $i->availableCodes($k, false); continue; } + 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; @@ -189,9 +210,11 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject $ret = array_merge($ret, array_keys($cfg['add_c'])); } + $ret[] = '**'; + //echo '';print_R($cfg); print_r($ret); exit; break; case 'l': @@ -284,7 +307,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject $complete = $x->fetchAll('lkey'); $list = $this->availableCodes($ltype); - echo ''; print_r($list); + //echo ''; print_r($list); foreach($list as $lkey) { // skip ones we know we have done...