X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=I18n.php;h=101cdda404c2ced67fd8f376d4ab771e6705ce06;hp=d34c104f197173b9595095352905007e45ed59f2;hb=586e4eb470252d837ba18b67e4c3c1702131fd1d;hpb=6dbc67ab71a7644586873a6f61628e10fd8e1db9 diff --git a/I18n.php b/I18n.php index d34c104f..101cdda4 100644 --- a/I18n.php +++ b/I18n.php @@ -81,7 +81,9 @@ class Pman_Core_I18n extends Pman } - function guessUsersLanguage() { + function guessUsersLanguage() + { + $this->sessionState(0); $lang = !$this->authUser || empty($this->authUser->lang ) ? 'en' : $this->authUser->lang; @@ -105,7 +107,7 @@ class Pman_Core_I18n extends Pman return explode('_', $lang); } - function get($s ='') + function get($s ='', $opts=array()) { $this->sessionState(0); @@ -118,7 +120,7 @@ class Pman_Core_I18n extends Pman $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,7 @@ class Pman_Core_I18n extends Pman if (empty($k)) { return '??'; } - $lang = !$au || empty($au->lang ) ? 'en' : is_string($au) ? $au : $au->lang; + $lang = !$au || empty($au->lang ) ? 'en' : (is_string($au) ? $au : $au->lang); // does it need caching? @@ -256,47 +264,33 @@ 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); } /** * DO NOT USE THIS -- see core_curr_rates dataobject. * */ - var $rates = array(); + + + function loadRates() - { - if (!empty($this->rates)) { - return true; - } + { + static $rates = array(); - $this->rates = DB_DAtaObject::Factory('core_curr_rates')->currentRates(); + if (!empty($rates)) { + $this->rates = $rates; + return; + } + $this->rates = $rates = DB_DAtaObject::Factory('core_curr_rate')->currentRates(); }