X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=9711cb6ce1b592f5a1c9a352628184d3f8cfabe3;hb=39538dd1c71297fb385a26c1aead204229558d44;hp=3d18208c4b5104ddcc00f86df1910de544f7c8a4;hpb=e41b459f8f0b91c17185173bb84f19f776421459;p=Pman.Core

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 3d18208c..9711cb6c 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 
 {
@@ -131,6 +131,10 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 
             ");
         }
+         
+        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']));
@@ -145,8 +149,61 @@ 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 +344,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;
         }