X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=I18n.php;h=8367964c9ef63a8bb91a933936131919a577046c;hp=2236d6f521b50dedbd7072bc9f7f794845322e39;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=5b4e00e510cd4dc4aa159ea3de36323f14436ca9

diff --git a/I18n.php b/I18n.php
index 2236d6f5..8367964c 100644
--- a/I18n.php
+++ b/I18n.php
@@ -81,8 +81,10 @@ class Pman_Core_I18n extends Pman
     }
      
     
-    function guessUsersLanguage() {
-         
+    function guessUsersLanguage()
+    {
+        $this->sessionState(0);
+        
         $lang = !$this->authUser || empty($this->authUser->lang ) ? 'en' : $this->authUser->lang;
         
         /// verify the selected language..
@@ -105,33 +107,40 @@ 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':
+                 
+                
                 $i->ltype = 'l';
                 $i->applyFilters($_REQUEST, $this->authUser, $this);
-                $this->jdata($i->toTransList('l',  $lbits[0]));
+                $this->jdata($i->toTransList('l',  implode('_',$lbits)));
                 break;
 
             case 'Country':
                 $i->ltype = 'c';
                 $i->applyFilters($_REQUEST, $this->authUser, $this);
-                $this->jdata($i->toTransList('c',  $lbits[0]));
+                $this->jdata($i->toTransList('c',  implode('_',$lbits)));
                
                 break;
                 
             case 'Currency':
                 $i->ltype = 'm';
                 $i->applyFilters($_REQUEST, $this->authUser, $this);
-                $this->jdata($i->toTransList('m',  $lbits[0]));
+                $this->jdata($i->toTransList('m',  implode('_',$lbits)));
                 break;
             
             case 'Timezone':
@@ -147,9 +156,10 @@ class Pman_Core_I18n extends Pman
                 $tza= array_unique($tza);
                 sort($tza);
                 foreach($tza as $tz) {
+                    //filtering..
                     if (empty($_REQUEST['q']) ||
                             0 === strcasecmp(
-                                    substring($tz,0, strlen($_REQUEST['q'])),
+                                    substr($tz,0, strlen($_REQUEST['q'])),
                                     $_REQUEST['q'])
                     ) {
                         $ret[] = array('tz' => $tz);
@@ -166,8 +176,9 @@ class Pman_Core_I18n extends Pman
         if (!empty($_REQUEST['debug'])) {
             DB_DataObject::debugLevel(1);
         }
+        
         $i = DB_DataObject::Factory('I18n');
-        $i->buildDb();
+        $i->buildDB();
       
        
         $i = DB_DataObject::Factory('I18n');
@@ -177,7 +188,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');
@@ -189,6 +202,7 @@ class Pman_Core_I18n extends Pman
         }
         //echo '<PRE>';print_r($ar);
         header('Content-type: text/javascript');
+        echo "Roo.namespace('Pman.I18n');";
         echo 'Pman.I18n.Data = ' .  json_encode($ar);
         exit;
         
@@ -201,7 +215,7 @@ class Pman_Core_I18n extends Pman
      /**
      * translate (used by database building);
      * usage :
-     * require_once 'Pman/Core/I18N.php';
+     * require_once 'Pman/Core/I18n.php';
      * $x = new Pman_Core_I18N();
      * $x->translate($this->authuser, 'c', 'US');
      * @param au - auth User
@@ -246,58 +260,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();
+        
     }