X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=I18n.php;h=5f70c7a45e298b7cc84bdcb76c53c96e4d3331d9;hb=fc6daebc91e1f7742524e2ae7f9f48ea7c4b9975;hp=8367964c9ef63a8bb91a933936131919a577046c;hpb=c296361e147ac9c426d1cc83c44c90c042676fa7;p=Pman.Core diff --git a/I18n.php b/I18n.php index 8367964c..5f70c7a4 100644 --- a/I18n.php +++ b/I18n.php @@ -200,6 +200,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 '
';print_r($ar); header('Content-type: text/javascript'); echo "Roo.namespace('Pman.I18n');"; @@ -231,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?