X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=d8509bb4ab7bcc361a105aa80c38b87aaaa506ca;hb=a577c1416d0995e32256d7927b0d39d4e1e2079b;hp=57baa55eb33c9002dff2d09c4a369f63c7052487;hpb=05fece576fb1fab2cc8463ae23aa90bfe6ba122e;p=Pman.Core diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php index 57baa55e..d8509bb4 100644 --- a/DataObjects/I18n.php +++ b/DataObjects/I18n.php @@ -68,6 +68,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject if ($loaded) { return self::$cfg; } + $loaded =true; $ff= HTML_FlexyFramework::get(); @@ -75,12 +76,12 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject $opts = array(); foreach(array('Pman_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) { if (isset($ff->$pk)) { - var_dump($pk); + //var_dump($pk); $opts= $ff->$pk; break; } } - //print_R($opts); + //echo '
';print_R($opts);//exit; // var_dump($opts);exit; @@ -90,12 +91,22 @@ 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); } - //print_R(self::$cfg); + // 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; @@ -203,7 +214,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject $ret[] = '**'; - var_dump($ret); + //echo '';print_R($cfg); print_r($ret); exit; break; case 'l': @@ -296,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...