X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=I18n.php;h=8367964c9ef63a8bb91a933936131919a577046c;hp=d87210ffd930694f079e7320ec87f92554ae829c;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=f1ed42daa28cabb3ad1d6617fbca99be5e1f7df3 diff --git a/I18n.php b/I18n.php index d87210ff..8367964c 100644 --- a/I18n.php +++ b/I18n.php @@ -107,7 +107,7 @@ class Pman_Core_I18n extends Pman return explode('_', $lang); } - function get($s ='') + function get($s ='', $opts=array()) { $this->sessionState(0); @@ -120,7 +120,7 @@ class Pman_Core_I18n extends Pman $i = DB_DataObject::Factory('I18n'); - + $i->is_active = 1; switch($s) { case 'Lang': @@ -189,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');