fix #8131 - chinese translations

[Pman.Core] / I18n.php

diff --git a/I18n.php b/I18n.php
index 2dec4d0..bab0b2d 100644 (file)
--- a/I18n.php
+++ b/I18n.php
@@ -62,7 +62,7 @@ class Pman_Core_I18n extends Pman
         //return true;
         $au = $this->getAuthUser();
         //if (!$au) {
-        //    $this->jerr("Not authenticated", array('authFailure' => true));
+        //    $this->jerror("LOGIN-NOAUTH", "Not authenticated", array('authFailure' => true));
         //}
         $this->authUser = $au;
         
@@ -81,11 +81,12 @@ class Pman_Core_I18n extends Pman
     }
      
     
-    function guessUsersLanguage() {
-         
-        $lang = !$this->authUser || empty($this->authUser->lang ) ? 'en' : $this->authUser->lang;
+    function guessUsersLanguage()
+    {
+        $this->sessionState(0);
         
-        /// verify the selected language..
+        $lang = !$this->authUser || empty($this->authUser->lang ) ? 'en' : $this->authUser->lang;
+         /// verify the selected language..
         $i = DB_DataObject::Factory('I18n');
         $i->ltype = 'l';                           // string(1)  not_null multiple_key
         $i->lkey = $lang;                            // string(8)  not_null
@@ -105,15 +106,20 @@ class Pman_Core_I18n extends Pman
         return explode('_', $lang);
     }
      
-    function get($s ='')
+    function get($s ='', $opts=array())
     {
      
-     
+        $this->sessionState(0);
         $lbits = $this->guessUsersLanguage();
          
+        if ($this->authUser && !empty($_REQUEST['_debug'])) {
+            DB_DataObject::debugLevel(1);
+        }
         
-        $i = DB_DataObject::Factory('I18n');
         
+        
+        $i = DB_DataObject::Factory('I18n');
+        $i->is_active = 1;
         switch($s) {
             case 'Lang':
                  
@@ -169,7 +175,7 @@ class Pman_Core_I18n extends Pman
         if (!empty($_REQUEST['debug'])) {
             DB_DataObject::debugLevel(1);
         }
-        print_r('ininin');
+        
         $i = DB_DataObject::Factory('I18n');
         $i->buildDB();
       
@@ -181,7 +187,9 @@ class Pman_Core_I18n extends Pman
         $ar = array();
         foreach($langs as $lang)
         {
-            $rlang = array_shift(explode('_', strtoupper($lang)));
+            //$rlang = array_shift(explode('_', strtoupper($lang)));
+            $ll = explode('_', $lang);
+            $rlang = array_shift($ll);
             
             $ar[$lang] = array();
             $i = DB_DataObject::Factory('I18n');
@@ -191,8 +199,13 @@ class Pman_Core_I18n extends Pman
             $i = DB_DataObject::Factory('I18n');
             $ar[$lang]['m'] = $i->toTransList('m', $rlang);
         }
+        require_once 'I18Nv2/CurrencyMap.php';
+        
+        $ar['currency_map'] = I18Nv2_CurrencyMap::$s_map;
+        
         //echo '<PRE>';print_r($ar);
         header('Content-type: text/javascript');
+        echo "Roo.namespace('Pman.I18n');";
         echo 'Pman.I18n.Data = ' .  json_encode($ar);
         exit;
         
@@ -221,7 +234,18 @@ class Pman_Core_I18n extends Pman
         if (empty($k)) {
             return '??';
         }
-        $lang = !$au || empty($au->lang ) ? 'en' : is_string($au) ? $au : $au->lang;
+
+        if(class_exists('HTML_FlexyFramework2', false)) {
+            $fo = HTML_FlexyFramework2::get()->HTML_Template_Flexy;
+        }
+        else {
+            $fo = &PEAR::getStaticProperty('HTML_Template_Flexy','options');
+        }
+        
+        $fallback_lang = empty($fo['locale']) ? 'en' : $fo['locale'];
+            
+        
+        $lang =  empty($au ) ? $fallback_lang : (is_string($au) ? $au : $au->lang);
         
         // does it need caching?
         
@@ -250,58 +274,34 @@ class Pman_Core_I18n extends Pman
         return implode(', ', $ret);
     }
     /**
-     * convert rate:
-     * usage  : $i = new Pman_Core_I18n();
-     * $ret = $i->convertCurrency(100,"HKD","USD");
-     * if ($ret == false) {
-            /// something went wrong.
-     }
-     * 
-     * @param Pman_Core_DataObjects_Person $au Authenticated user
-     * @param String                      $type  c/l/m
-     * @param String                      $k     'comma' seperated list of keys to translate
+     * DO NOT USE THIS -- see core_curr_rates dataobject.
      */
     
     
     function convertCurrency($val, $from, $to)
     {
-        $r = $this->loadRates();
-        if ($r === false) {
-            return false;
-        }
-        if (!isset($this->rates[$from]) || !isset($this->rates[$to]) ) {
-            return false;
-        }
-        //echo '<PRE>';print_R($this->rates);
-        $base = (1.0 / $this->rates[$from]) * $val;
-  
-        return $this->rates[$to] * $base;
+        
+        return DB_DAtaObject::Factory('core_curr_rate')->convert($val,$from,$to);
     
     }
-    var $rates = array();
+    /**
+     * DO NOT USE THIS -- see core_curr_rates dataobject.
+     *
+     */
+    
+    
+    
     function loadRates()
-    {
-        if (!empty($this->rates)) {
-            return true;
-        }
-        $target = ini_get('session.save_path').'/eurofxref-daily.xml';
-        if (!file_exists($target) || filemtime($target) < (time() - 60*60*24)) {
-            $f = file_get_contents('http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml');
-            if (!strlen($f)) {
-                return false;
-            }
-            file_put_contents($target,$f);
-        } 
-        $dom = simplexml_load_file($target);
-        $this->rates['EUR'] = 1.0;
-        $this->rates['TWD'] = 46.7008412;
-        $this->rates['VND'] = 26405.3;
-       
-        foreach($dom->Cube->Cube->Cube as $c) {
-           //echo '<PRE>';print_r($c );
-            $this->rates[(string)$c['currency']] = (string)$c['rate'];
+    {   
+        static $rates = array();
+        
+        if (!empty($rates)) {
+            $this->rates = $rates;
+            return;
         }
-         $this->rates['RMB'] = $this->rates['CNY'] ;
+        
+        $this->rates = $rates = DB_DAtaObject::Factory('core_curr_rate')->currentRates();
+        
     }