I18n.php

[Pman.Core] / I18n.php

diff --git a/I18n.php b/I18n.php
index 846094d..2545c88 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'
-        )
-    );
-    
+     
     
      
     
@@ -98,12 +71,12 @@ class Pman_Core_I18N extends Pman
         
         $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;
         
-        $i = DB_DataObject::Factory('I18n');
+         $i = DB_DataObject::Factory('I18n');
         // load the cofiguration
         foreach($opts as $k=>$v) {
             
             if ($v == '*') { // everything..
-                $this->cfg[$k] = $i->available($k);
+                $this->cfg[$k] = $i->availableCodes($k);
                 continue;
             }
             $this->cfg[$k] = is_array($v) ? $v  : explode(',', $v);
@@ -114,62 +87,17 @@ class Pman_Core_I18N extends Pman
         
         return true;
     }
-    // returns a list of all countries..
-    function getDefaultCfg($t) {
-        $ret = array();
-        switch ($t) {
-            case 'c':
-                require_once 'I18Nv2/Country.php';
-                
-                $c = new I18Nv2_Country('en');
-                $ret =  array_keys($c->codes);
-                $ret[] = '**';
-                break;
-            case 'l':
-                require_once 'I18Nv2/Language.php';
-                $c = new I18Nv2_Language('en');
-                $ret =  array_keys($c->codes);
-                $ret[] = '**';
-                break;
-            case 'm':
-                require_once 'I18Nv2/Currency.php';
-                $c = new I18Nv2_Currency('en');
-                $ret =  array_keys($c->codes);
-                $ret[] = '**';
-                break;
-        }
-        
-        foreach ($ret as $k=>$v) {
-            $ret[$k] = strtoupper($v);
-        }
-        
-        
-        return $ret;
-    }
+     
     
      
     function get($s ='')
     {
         
+        $i = DB_DataObject::Factory('I18n');
+        $i->buildDb();
+        $this->outputJavascript();
+    
         
-        switch ($s)
-        {
-            
-            case 'BuildDB':
-            // by admin only?!?
-                //DB_DataObject::debugLevel(1);
-                $i = DB_DataObject::Factory('I18n');
-                $i->buildDb();
-                die("DONE!");
-                break;
-                  
-            default: 
-                $this->outputJavascript();
-                // output javascript..
-                $this->jerr("ERROR");
-        }
-         
-        $this->jdata($ret);
         exit;
         
     }
@@ -177,9 +105,7 @@ class Pman_Core_I18N extends Pman
     function outputJavascript()
     {
         
-        require_once 'I18Nv2/Country.php';
-        require_once 'I18Nv2/Language.php';
-        require_once 'I18Nv2/Currency.php';
+        $i = DB_DataObject::Factory('I18n');
         
         $langs = $this->cfg['t'];
        // var_dump($langs);exit;
@@ -189,9 +115,9 @@ class Pman_Core_I18N extends Pman
             $rlang = array_shift(explode('_', strtoupper($lang)));
             
             $ar[$lang] = array(
-                'l' => $this->objToList('l', new I18Nv2_Language($rlang, 'UTF-8')),
-                'c' => $this->objToList('c', new I18Nv2_Country($rlang, 'UTF-8')),
-                'm' => $this->objToList('m', new I18Nv2_Currency($rlang, 'UTF-8'))
+                'l' => $i->toTransList('l',  $rlang),
+                'c' => $i->toTransList('c', $rlang),
+                'm' => $i->toTransList('m', $rlang),
             );
         }
         //echo '<PRE>';print_r($ar);
@@ -201,33 +127,10 @@ class Pman_Core_I18N extends Pman
         
         
         
-    }
-    function objToList($type, $obj) {
-        $ret = array();
-         
-         
-        foreach($this->cfg[$type] as $k) {
-            $sub = false;
-            
-            if (strpos($k, '_') !== false) {
-                $bits = explode('_', $k);
-                $k = array_shift($bits);
-                $sub = array_shift($bits);
-            }
-            $v = $k == '**' ? 'Other' : $obj->getName($k);
-            
-            if ($sub) {
-                $v .= ' ('.$sub.')';
-            }
-            
-            $ret[] = array(
-                'code'=>   ($type=='l' ? strtolower($k) : strtoupper($k)) . ($sub ? '_'.strtoupper($sub) : ''), 
-                'title' => $v
-            );
-        }
-        return $ret;
     }
     
+ 
+    
      /**
      * translate (used by database building);
      * usage :
@@ -248,37 +151,14 @@ class Pman_Core_I18N extends Pman
             return '??';
         }
         $lang = !$au || empty($au->lang ) ? 'en' : is_string($au) ? $au : $au->lang;
-        $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';
-        }
-    
+        // does it need caching?
+        
+        $i = DB_DataObject::Factory('I18n');
+        return $i->translate($lang,$type,$k);
+        
         
-        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;
         
         
     }