DataObjects/core.sql

[Pman.Core] / DataObjects / I18n.php

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 75c624b..41bff06 100644 (file)
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -105,6 +105,11 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 
             ");
         }
+        if (!empty($q['query']['name'])) {
+            //DB_DAtaObject::debugLevel(1);
+        
+            $this->whereAdd("lval LIKE '". $this->escape($q['query']['name']). "%'");
+        }
     }
     
     
@@ -126,17 +131,19 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     function toTransList($ltype, $inlang)
     {
         
-        $x = DB_DataObject::factory('i18n');
-        $x->ltype = $ltype;
-        $x->inlang= $inlang;
-        $x->selectAdd();
-        $x->selectAdd('lkey as code, lval as title');
-        $x->find();
+        
+        $this->ltype = $ltype;
+        $this->inlang= $inlang;
+        $this->selectAdd();
+        $this->selectAdd('lkey as code, lval as title');
+        
+        $this->find();
         $ret = array();
-        while ($x->fetch()) {
+        while ($this->fetch()) {
             $ret[] = array(
-                'code' => $x->code,
-                'title' =>$x->title);
+                'code'  => $this->code,
+                'title' => $this->title
+            );
         }
         return $ret;
     }
@@ -198,7 +205,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     
     function buildDB($ltype= false, $inlang= false )
     {
-        $this->cfg();
+        $cfg = $this->cfg();
         if ($ltype === false) {
             // trigger all builds.
             //DB_DataObject::debugLevel(1);
@@ -217,7 +224,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             // We only build translatiosn for our configured ones..
             //foreach( $this->availableCodes('l') as $l) {
                 
-            foreach( self::$cfg['t'] as $l) {
+            foreach( $cfg['t'] as $l) {
                 $this->buildDB($ltype, $l);
             }
             return;
@@ -233,7 +240,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         
         $list =  $this->availableCodes($ltype);
         
-        
+        //print_r($list); 
         foreach($list as $lkey) {
             // skip ones we know we have done...
             if (in_array($lkey, $complete)) {
@@ -267,7 +274,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     {
       
         static $cache;
-        
+        $cfg = $this->cfg();
         if (empty($k)) {
             return '??';
         }
@@ -290,7 +297,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         if ($k == '**') {
             return 'Other / Unknown';
         }
-    
+        $ret = $cache[$lang][$type]->getName($k);
         
         if ($type == 'l') {
             $tolang = explode('_', $k);
@@ -299,9 +306,14 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             if (count($tolang) > 1) {
                 $ret.= '('.$tolang[1].')'; 
             }
-            return $ret;
+             
         }
-        $ret = $cache[$lang][$type]->getName($k);
+        // our wierd countries/langs etc..
+        if (isset($cfg['add_' . $type][$k])) {
+            return $cfg['add_' . $type][$k];
+            
+        }
+        
         //print_r(array($k, $ret));
         return $ret;