X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FI18n.php;h=4d9ab616b3abb6cb521a8b4fb86614cd5c94ba2d;hp=7d322270dd2f53584b811594e3df012cca70bf09;hb=HEAD;hpb=92e2f1640a051654cf0c1256d99470dfd45fb9df

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 7d322270..ba3386f7 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -7,7 +7,7 @@
  * It should eventually replace most of that..
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_I18n extends DB_DataObject 
 {
@@ -52,10 +52,11 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         'm' => array(
             'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY'
         ),
+        'p' => '*',
         'add_l'=> array(), // key -> value additional languages... 
         'add_c'=> array(), // additional countries...(eg. '-R' => 'Regional' )
         'add_m'=> array(), // additional currencies...
-        'add_t'=> array(), // additional currencies...
+        'add_p'=> array(), // additional currencies...
 
         
     );
@@ -126,16 +127,38 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             $this->buildDB(); // ensure we have the full database...
             
             $this->selectAdd("
+                id as id,
                 i18n_translate(ltype, lkey, 'en') as lval_en
-                
             ");
         }
+        
+        if (!empty($q['_as_code_and_title'])) {
+            $tn = $this->tableName();
+            
+            $this->selectAdd();
+            $this->selectAdd("
+                    {$tn}.lval as title,
+                    {$tn}.lkey as code
+            ");
+            $this->is_active = 1;
+            if (!empty($q['_title'])) {
+                $this->whereAdd("{$tn}.lval like '{$this->escape($_REQUEST['_title'])}%'");
+            }
+        }
+         
+        if (!empty($q['!code'])) {
+            $this->whereAddIn('!lkey', explode(',', $q['!code']), 'string'); 
+        }
         if (!empty($q['query']['name'])) {
             //DB_DAtaObject::debugLevel(1);
             $v = strtoupper($this->escape($q['query']['name']));
             $this->whereAdd("upper(lval) LIKE '%{$v}%'");
         }
         
+         if (!empty($q['query']['name_starts'])) {
+            $this->whereAdd("lval LIKE '". $this->escape($q['query']['name_starts']). "%'");
+        }
+        
         if (!empty($q['_filtered']) && !empty($this->ltype)) {
             $cfg = $this->cfg();
             $filter = $cfg[$this->ltype];
@@ -144,11 +167,104 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             }
             
         }
+        
+        if(!empty($q['_with_geoip_count'])) {
+            
+            $this->selectAdd("
+                (
+                    SELECT
+                            COUNT(geoip_division.id)
+                    FROM
+                            geoip_division
+                    WHERE
+                            geoip_division.country = i18n.lkey
+                ) AS no_of_division,
+                (
+                    SELECT
+                            COUNT(geoip_city.id)
+                    FROM
+                            geoip_city
+                    WHERE
+                            geoip_city.country = i18n.lkey
+                ) AS no_of_city
+            ");
+        }
+        
+        if(!empty($q['_hide_unused'])) {
+            $this->whereAdd("
+                (
+                    SELECT
+                            COUNT(geoip_division.id)
+                    FROM
+                            geoip_division
+                    WHERE
+                            geoip_division.country = i18n.lkey
+                ) > 0
+            ");
+        }
     }
     
+    function lookupCode($inlang,$ltype,$name)
+    {
+        $x = DB_DataObject::factory('i18n');
+        $x->ltype = $ltype;
+        $x->lval = $name;
+        $x->inlang= $inlang;
+        
+        $x->limit(1);
+        if ($x->find(true) && !empty($x->lkey)) {
+            return $x->lkey;
+        }
+        return '';
+        
+        
+    }
+    
+    function codeExists($ltype, $key)
+    {
+        $x = DB_DataObject::factory('i18n');
+        $x->ltype = $ltype;
+        $x->lkey = $key;
+        return $x->count() ? true : false;
+    }
+    
+    // load all all to reduce future queries..
+    function translateCache($inlang, $ltype, $build)
+    {
+        static $cache;
+        $key = "{$inlang} {$ltype}";
+        if (isset($cache[$key])) {
+            return $cache[$key];
+        }
+        if (!$build) {
+            return false;
+        }
+        
+        $x = DB_DataObject::factory('i18n');
+        $x->ltype = $ltype;
+        
+        $x->inlang= $inlang;
+        $cache[$key] = $x->fetchAll('lkey', 'lval');
+        
+        return $cache[$key] ;
+
+    }
+    
+    
     function translate($inlang,$ltype,$kval)
     {
         
+        $tc = $this->translateCache($inlang, $ltype, false);
+        if ($tc !== false && isset($tc[$kval])) {
+            return $tc[$kval];
+        }
+        
+        static $cache = array();
+        $cache_key = implode(' ', array($inlang,$ltype,$kval));
+        if (isset($cache[$cache_key ])) {
+            return $cache[$cache_key];
+        }
+        
         $x = DB_DataObject::factory('i18n');
         $x->ltype = $ltype;
         $x->lkey = $kval;
@@ -157,12 +273,15 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         
         $x->limit(1);
         if ($x->find(true) && !empty($x->lval)) {
+            $cache[$cache_key] = $x->lval;
             return $x->lval;
         }
         $fallback->inlang = 'en';
         if ($fallback->find(true) && !empty($fallback->lval)) {
-           return $fallback->lval;
+            $cache[$cache_key] = $fallback->lval;
+            return $fallback->lval;
         }
+         $cache[$cache_key] = $kval;
         return $kval;
     }
     
@@ -171,7 +290,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     function toTransList($ltype, $inlang)
     {
         
-        
+        $this->is_active = 1;
         $this->ltype = $ltype;
         $this->inlang= $inlang;
         $this->selectAdd();
@@ -250,12 +369,12 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 }
                 $ret[] = '**';
                 break;
-            case 't':
+            case 'p':
                 require_once 'I18Nv2/PhonePrefix.php';
                 $c = new I18Nv2_PhonePrefix('en');
                 $ret =  array_keys($c->codes);
-                if (!empty($cfg['add_t'])) {
-                    $ret = array_merge($ret, array_keys($cfg['add_m']));
+                if (!empty($cfg['add_p'])) {
+                    $ret = array_merge($ret, array_keys($cfg['add_p']));
                 }
                 $ret[] = '**';
                 break;
@@ -289,7 +408,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             $this->buildDB('c');
             $this->buildDB('l');
             $this->buildDB('m');
-            $this->buildDB('t');
+            $this->buildDB('p', 'en');
             return;
         }
         
@@ -318,7 +437,6 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         $complete = $x->fetchAll('lkey');
         
         $list =  $this->availableCodes($ltype);
-        //echo '<PRE>'; print_r($list); 
         
         foreach($list as $lkey) {
             // skip ones we know we have done...
@@ -377,7 +495,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 'l' =>  new I18Nv2_Language($lang, 'UTF-8'),
                 'c' => new I18Nv2_Country($lang, 'UTF-8'),
                 'm' => new I18Nv2_Currency($lang, 'UTF-8'),
-                't' => new I18Nv2_PhonePrefix($lang, 'UTF-8')
+                'p' => new I18Nv2_PhonePrefix($lang, 'UTF-8')
             );
             //echo '<PRE>';print_r(array($lang, $cache[$lang]['c']));
         }