X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FI18n.php;h=1edb61b2a1488d26876ba2dd62e4d106e6e0e777;hp=561f000471e2261f6ea3021e87d082e7008d1452;hb=77c77114f7a1bf347b5cf550209d27199ab0172e;hpb=d6f4312c4aad92962683ba5cc24af2ddd6d65356

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 561f0004..1edb61b2 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -68,35 +68,45 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         if ($loaded) {
             return self::$cfg;
         }
+         
         $loaded =true;
         $ff= HTML_FlexyFramework::get();
         
         // 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) {
+        foreach(array('Pman_Core_I18n', 'Pman_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) {
             if (isset($ff->$pk)) {
                 //var_dump($pk);
-                $opts=  $ff->$pk;
+                $opts =  $ff->$pk;
                 break;
             }
         }
-         echo '<PRE>';print_R($opts);//exit;
+        //echo '<PRE>';print_R($opts);//exit;
         
          
-       //  var_dump($opts);exit;
+        // var_dump($opts);exit;
         
         $i = DB_DataObject::Factory('I18n');
         // load the cofiguration
         foreach($opts as $k=>$v) {
             
             if ($v == '*') { // everything..
-                self::$cfg[$k] = $i->availableCodes($k, false);
+               // self::$cfg[$k] = $i->availableCodes($k, false);
                 continue;
             }
-            echo "$k / "; print_R($v);
+             
             self::$cfg[$k] = is_array($v) ? $v  : explode(',', $v);
         }
-        print_R(self::$cfg);exit;
+        // 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;
         
@@ -127,7 +137,9 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         
         if (!empty($q['_filtered']) && !empty($this->ltype)) {
             $cfg = $this->cfg();
+            print_r($cfg);exit;
             $filter = $cfg[$this->ltype];
+            
             $this->whereAddIn('lkey', $filter, 'string'); 
             
             
@@ -189,7 +201,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     {
         $ret = array();
         $cfg = $this->cfg();
-
+        //echo '<PRE>';print_r($cfg);
         switch ($t) {
             case 'c':
                 require_once 'I18Nv2/Country.php';
@@ -204,7 +216,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                  
                 
                 $ret[] = '**';
-                echo '<PRE>';print_R($cfg); print_r($ret); exit;
+                //echo '<PRE>';print_R($cfg); print_r($ret); exit;
                 break;
             
             case 'l':
@@ -297,7 +309,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         $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...