X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=I18n.php;h=5f70c7a45e298b7cc84bdcb76c53c96e4d3331d9;hb=69a171812170924b64cb06e99b41fe1a0fa01c17;hp=ffd6b4ce69a78438ffdbb28ddcc7b077644e6511;hpb=8da091a3af65af9953dff76e3dd04cf8632bb93e;p=Pman.Core

diff --git a/I18n.php b/I18n.php
index ffd6b4ce..5f70c7a4 100644
--- a/I18n.php
+++ b/I18n.php
@@ -81,7 +81,9 @@ class Pman_Core_I18n extends Pman
     }
      
     
-    function guessUsersLanguage() {
+    function guessUsersLanguage()
+    {
+        $this->sessionState(0);
         
         $lang = !$this->authUser || empty($this->authUser->lang ) ? 'en' : $this->authUser->lang;
         
@@ -105,7 +107,7 @@ class Pman_Core_I18n extends Pman
         return explode('_', $lang);
     }
      
-    function get($s ='')
+    function get($s ='', $opts=array())
     {
      
         $this->sessionState(0);
@@ -118,7 +120,7 @@ class Pman_Core_I18n extends Pman
         
         
         $i = DB_DataObject::Factory('I18n');
-        
+        $i->is_active = 1;
         switch($s) {
             case 'Lang':
                  
@@ -187,7 +189,8 @@ class Pman_Core_I18n extends Pman
         foreach($langs as $lang)
         {
             //$rlang = array_shift(explode('_', strtoupper($lang)));
-            $rlang = array_shift(explode('_', $lang));
+            $ll = explode('_', $lang);
+            $rlang = array_shift($ll);
             
             $ar[$lang] = array();
             $i = DB_DataObject::Factory('I18n');
@@ -197,8 +200,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;
         
@@ -227,7 +235,12 @@ class Pman_Core_I18n extends Pman
         if (empty($k)) {
             return '??';
         }
-        $lang = !$au || empty($au->lang ) ? 'en' : is_string($au) ? $au : $au->lang;
+        $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?
         
@@ -263,22 +276,26 @@ class Pman_Core_I18n extends Pman
     function convertCurrency($val, $from, $to)
     {
         
-        DB_DAtaObject::Factory('core_curr_rate')->convert($val,$from,$to);
+        return DB_DAtaObject::Factory('core_curr_rate')->convert($val,$from,$to);
     
     }
     /**
      * DO NOT USE THIS -- see core_curr_rates dataobject.
      *
      */
-    var $rates = array();
+    
+    
+    
     function loadRates()
-    {
-        if (!empty($this->rates)) {
-            return true;
-        }
+    {   
+        static $rates = array();
         
-        $this->rates = DB_DAtaObject::Factory('core_curr_rate')->currentRates();
+        if (!empty($rates)) {
+            $this->rates = $rates;
+            return;
+        }
         
+        $this->rates = $rates = DB_DAtaObject::Factory('core_curr_rate')->currentRates();
         
     }