From: Alan Knowles Date: Thu, 15 Sep 2011 07:20:34 +0000 (+0800) Subject: I18n.php X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=296096c6f10f2a6136afa117c9082741f39eb005 I18n.php --- diff --git a/I18n.php b/I18n.php index a15575a6..2545c880 100644 --- a/I18n.php +++ b/I18n.php @@ -51,34 +51,7 @@ class Pman_Core_I18N extends Pman { - // these are the default languages we support. - // they will allways be overlaid with the current configuration (via getAuth) - // THESE WILL ALLWAYS BE UPPERCASE!!! - var $cfg = array( - // translated versions availalable - - 't' => array( - 'en', 'zh_CN', 'zh_HK', - ), - // languages available - 'l' => array( - - 'en', 'zh_CN', 'zh_HK', 'zh_TW', 'th', 'ko', 'ja', 'ms', - 'id', // indonesian - 'tl', // tagalog - 'vi', //vietnamise - 'hi', // hindi - 'ta', // tamil - '**', // other - ), - 'c' => array( - 'AU', 'CN', 'HK', 'IN', 'ID', 'JP', 'MY', 'NZ', 'TW', 'SG', 'TH', 'KR', 'US', 'PH', 'VN','**' - ), - 'm' => array( - 'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY' - ) - ); - + @@ -185,42 +158,7 @@ class Pman_Core_I18N extends Pman return $i->translate($lang,$type,$k); - - - $lbits = explode('_', strtoupper($lang)); - $lang = $lbits[0]; - - - - - if (!isset($cache[$lang])) { - require_once 'I18Nv2/Country.php'; - require_once 'I18Nv2/Language.php'; - require_once 'I18Nv2/Currency.php'; - $cache[$lang] = array( - 'l' => new I18Nv2_Language($lang, 'UTF-8'), - 'c' => new I18Nv2_Country($lang, 'UTF-8'), - 'm' => new I18Nv2_Currency($lang, 'UTF-8') - ); - //echo '
';print_r(array($lang, $cache[$lang]['c']));
-        }
-        if ($k == '**') {
-            return 'Other / Unknown';
-        }
-    
-        
-        if ($type == 'l') {
-            $tolang = explode('_', $k);
          
-            $ret = $cache[$lang][$type]->getName($tolang[0]);
-            if (count($tolang) > 1) {
-                $ret.= '('.$tolang[1].')'; 
-            }
-            return $ret;
-        }
-        $ret = $cache[$lang][$type]->getName($k);
-        //print_r(array($k, $ret));
-        return $ret;
         
         
     }