X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=I18n.php;h=5f70c7a45e298b7cc84bdcb76c53c96e4d3331d9;hb=d3fc56bf4a2e451d3b4d847adc5fa0fa04e8f563;hp=4403e8ca4c9d8fc750cdbdd079016b35755cd3af;hpb=cf42de215757fee25ca115fc5675a3865a3a8ed3;p=Pman.Core diff --git a/I18n.php b/I18n.php index 4403e8ca..5f70c7a4 100644 --- a/I18n.php +++ b/I18n.php @@ -81,8 +81,10 @@ class Pman_Core_I18n extends Pman } - function guessUsersLanguage() { - + function guessUsersLanguage() + { + $this->sessionState(0); + $lang = !$this->authUser || empty($this->authUser->lang ) ? 'en' : $this->authUser->lang; /// verify the selected language.. @@ -105,20 +107,20 @@ class Pman_Core_I18n extends Pman return explode('_', $lang); } - function get($s ='') + function get($s ='', $opts=array()) { - + $this->sessionState(0); $lbits = $this->guessUsersLanguage(); - if ($this->authUser && !empty($_REQUEST['debug'])) { + if ($this->authUser && !empty($_REQUEST['_debug'])) { DB_DataObject::debugLevel(1); } $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 '
';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? @@ -256,62 +269,34 @@ class Pman_Core_I18n extends Pman return implode(', ', $ret); } /** - * convert rate: - * usage : $i = new Pman_Core_I18n(); - * $ret = $i->convertCurrency(100,"HKD","USD"); - * if ($ret == false) { - /// something went wrong. - } - * - * @param Pman_Core_DataObjects_Person $au Authenticated user - * @param String $type c/l/m - * @param String $k 'comma' seperated list of keys to translate + * DO NOT USE THIS -- see core_curr_rates dataobject. */ function convertCurrency($val, $from, $to) { - $r = $this->loadRates(); - if ($r === false) { - return false; - } - if (!isset($this->rates[$from]) || !isset($this->rates[$to]) ) { - return false; - } - //echo '';print_R($this->rates); - $base = (1.0 / $this->rates[$from]) * $val; - - return $this->rates[$to] * $base; + + return DB_DAtaObject::Factory('core_curr_rate')->convert($val,$from,$to); } - var $rates = array(); + /** + * DO NOT USE THIS -- see core_curr_rates dataobject. + * + */ + + + function loadRates() - { - if (!empty($this->rates)) { - return true; - } - $target = ini_get('session.save_path').'/eurofxref-daily.xml'; - if (!file_exists($target) || filemtime($target) < (time() - 60*60*24)) { - // this may fail... - $f = @file_get_contents('http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml'); - if (!strlen($f)) { - $target = dirname(__FILE__).'/eurofxref-daily.xml'; - - - } else { - file_put_contents($target,$f); - } - } - $dom = simplexml_load_file($target); - $this->rates['EUR'] = 1.0; - $this->rates['TWD'] = 46.7008412; - $this->rates['VND'] = 26405.3; - - foreach($dom->Cube->Cube->Cube as $c) { - //echo '';print_r($c ); - $this->rates[(string)$c['currency']] = (string)$c['rate']; + { + static $rates = array(); + + if (!empty($rates)) { + $this->rates = $rates; + return; } - $this->rates['RMB'] = $this->rates['CNY'] ; + + $this->rates = $rates = DB_DAtaObject::Factory('core_curr_rate')->currentRates(); + }