sync

[Pman.Core] / I18n.php

diff --git a/I18n.php b/I18n.php
index 12ed22d..6536b2f 100644 (file)
--- a/I18n.php
+++ b/I18n.php
@@ -86,8 +86,7 @@ class Pman_Core_I18n extends Pman
         $this->sessionState(0);
         
         $lang = !$this->authUser || empty($this->authUser->lang ) ? 'en' : $this->authUser->lang;
-        
-        /// verify the selected language..
+         /// 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
@@ -200,6 +199,10 @@ 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');";
@@ -231,7 +234,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?