I18n.php

[Pman.Core] / I18n.php

diff --git a/I18n.php b/I18n.php
index b2d47d4..df91d31 100644 (file)
--- a/I18n.php
+++ b/I18n.php
@@ -51,34 +51,7 @@ class Pman_Core_I18N extends Pman
 {
  
     
-    // these are the default languages we support.
-    // they will allways be overlaid with the current configuration (via getAuth)
-    // THESE WILL ALLWAYS BE UPPERCASE!!!
-    var $cfg = array(
-        // translated versions availalable
-        
-        't' => array(
-            'en', 'zh_CN',   'zh_HK', 
-        ),
-        // languages available
-        'l' => array(
-            
-            'en', 'zh_CN',   'zh_HK',  'zh_TW', 'th', 'ko', 'ja', 'ms', 
-            'id', // indonesian
-            'tl', // tagalog
-            'vi', //vietnamise
-            'hi', // hindi
-            'ta', // tamil
-            '**', // other
-        ),
-        'c' => array(
-             'AU', 'CN', 'HK', 'IN', 'ID', 'JP', 'MY', 'NZ', 'TW', 'SG', 'TH', 'KR', 'US', 'PH', 'VN','**'
-        ),
-        'm' => array(
-            'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY'
-        )
-    );
-    
+     
     
      
     
@@ -96,19 +69,11 @@ class Pman_Core_I18N extends Pman
         $ff= HTML_FlexyFramework::get();
          
         
-        $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;
-        
-         $i = DB_DataObject::Factory('I18n');
-        // load the cofiguration
-        foreach($opts as $k=>$v) {
-            
-            if ($v == '*') { // everything..
-                $this->cfg[$k] = $i->availableCodes($k);
-                continue;
-            }
-            $this->cfg[$k] = is_array($v) ? $v  : explode(',', $v);
-        }
+        $opts = empty($ff->Pman_Core_I18N) ?
+                (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)
+                : $ff->Pman_Core_I18N;
         
+         
         
         
         
@@ -116,25 +81,62 @@ class Pman_Core_I18N extends Pman
     }
      
     
-     
-    function get($s ='')
-    {
+    function guessUsersLanguage() {
+         
+        $lang = !$this->authUser || empty($this->authUser->lang ) ? 'en' : $this->authUser->lang;
         
+        /// verify the selected language..
         $i = DB_DataObject::Factory('I18n');
-        $i->buildDb();
-        $this->outputJavascript();
-    
+        $i->ltype = 'l';                           // string(1)  not_null multiple_key
+        $i->lkey = $lang;                            // string(8)  not_null
+        if (!$i->count()) {
+            $this->jerr('invalid lang configured: ' . $lang);
+        }
         
-        exit;
         
+        return explode('_', $lang);
     }
-    
-    function outputJavascript()
+     
+    function get($s ='')
     {
+     
+     
+        $lbits = $this->guessUsersLanguage();
+         
         
         $i = DB_DataObject::Factory('I18n');
         
-        $langs = $this->cfg['t'];
+        switch($s) {
+            case 'Lang':
+                $i->ltype = 'l';
+                $i->applyFilters($_REQUEST, $this->authUser, $this);
+                $this->jdata($i->toTransList('l',  $lbits[0]));
+                break;
+
+            case 'Country':
+                $i->ltype = 'c';
+                $i->applyFilters($_REQUEST, $this->authUser, $this);
+                $this->jdata($i->toTransList('l',  $lbits[0]));
+                
+                $ret = $this->getList('c', $lbits[0],empty($_REQUEST['filter']) ? false : $_REQUEST['filter']);
+                break;
+                
+             case 'Currency':
+                $i->ltype = 'm';
+                $i->applyFilters($_REQUEST, $this->authUser, $this);
+                $this->jdata($i->toTransList('l',  $lbits[0]));
+                break;
+             
+                
+        }
+        
+        $i = DB_DataObject::Factory('I18n');
+        $i->buildDb();
+      
+       
+        $i = DB_DataObject::Factory('I18n');
+        $cfg = $i->cfg();
+        $langs = $cfg['t'];
        // var_dump($langs);exit;
         $ar = array();
         foreach($langs as $lang)
@@ -179,45 +181,13 @@ class Pman_Core_I18N extends Pman
         }
         $lang = !$au || empty($au->lang ) ? 'en' : is_string($au) ? $au : $au->lang;
         
+        // does it need caching?
         
+        $i = DB_DataObject::Factory('I18n');
+        return $i->translate($lang,$type,$k);
         
         
-        
-        
-        $lbits = explode('_', strtoupper($lang));
-        $lang = $lbits[0];
-        
-        
-        
-        
-        if (!isset($cache[$lang])) {
-            require_once 'I18Nv2/Country.php';
-            require_once 'I18Nv2/Language.php';
-            require_once 'I18Nv2/Currency.php';
-            $cache[$lang] = array(
-                'l' =>  new I18Nv2_Language($lang, 'UTF-8'),
-                'c' => new I18Nv2_Country($lang, 'UTF-8'),
-                'm' => new I18Nv2_Currency($lang, 'UTF-8')
-            );
-            //echo '<PRE>';print_r(array($lang, $cache[$lang]['c']));
-        }
-        if ($k == '**') {
-            return 'Other / Unknown';
-        }
-    
-        
-        if ($type == 'l') {
-            $tolang = explode('_', $k);
          
-            $ret = $cache[$lang][$type]->getName($tolang[0]);
-            if (count($tolang) > 1) {
-                $ret.= '('.$tolang[1].')'; 
-            }
-            return $ret;
-        }
-        $ret = $cache[$lang][$type]->getName($k);
-        //print_r(array($k, $ret));
-        return $ret;
         
         
     }