X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=I18n.php;h=5f70c7a45e298b7cc84bdcb76c53c96e4d3331d9;hb=refs%2Fheads%2Fwip_alan_T6889_allow_managing_groups_inside_of;hp=101cdda404c2ced67fd8f376d4ab771e6705ce06;hpb=0892bd2a238509a1a984007cf85c9197ec7e7cba;p=Pman.Core

diff --git a/I18n.php b/I18n.php
index 101cdda4..5f70c7a4 100644
--- a/I18n.php
+++ b/I18n.php
@@ -235,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?