X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=7cf04c14bca0cbc6b1af02fd42648d9466582e74;hb=3c5bf94b5268992910347f541992ffae2925f38a;hp=77f81b8ee72762b364f7026d22f3df80ad34313b;hpb=576d8cf97a786080e56759154519f365b5d15e67;p=Pman.Core

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 77f81b8e..7cf04c14 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -68,33 +68,46 @@ 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;
+                //var_dump($pk);
+                $opts =  $ff->$pk;
                 break;
             }
         }
-        print_R($opts);
+        //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;
             }
+             
             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;
         
         
@@ -125,8 +138,9 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         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'); 
+            }
             
         }
     }
@@ -186,7 +200,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';
@@ -197,9 +211,11 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                     $ret = array_merge($ret, array_keys($cfg['add_c']));
                 }
                 
+                
                  
                 
                 $ret[] = '**';
+                //echo '<PRE>';print_R($cfg); print_r($ret); exit;
                 break;
             
             case 'l':
@@ -292,7 +308,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...