X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=bd733f94537234ebc2b9b3c6a6940af9b6f9d3c1;hb=506c590f859ebcd85e23feebb8f45eca00deba65;hp=cd270c8bbaa222694b645843f50747835b2c0514;hpb=9bbd019b2a775ad90ba4100963e99bc721209497;p=Pman.Core

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index cd270c8b..bd733f94 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 
 {
@@ -128,15 +128,22 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
             
             $this->selectAdd("
                 i18n_translate(ltype, lkey, 'en') as lval_en
-                
             ");
         }
+         
+        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];
@@ -145,8 +152,60 @@ 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 translate($inlang,$ltype,$kval)
     {
         
@@ -287,10 +346,10 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         if ($ltype === false) {
             // trigger all builds.
             //DB_DataObject::debugLevel(1);
-//            $this->buildDB('c');
-//            $this->buildDB('l');
-//            $this->buildDB('m');
-            $this->buildDB('p');
+            $this->buildDB('c');
+            $this->buildDB('l');
+            $this->buildDB('m');
+            $this->buildDB('p', 'en');
             return;
         }
         
@@ -319,7 +378,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         $complete = $x->fetchAll('lkey');
         
         $list =  $this->availableCodes($ltype);
-        print_R($inlang);exit;
+        
         foreach($list as $lkey) {
             // skip ones we know we have done...
             if (in_array($lkey, $complete)) {
@@ -377,7 +436,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']));
         }