PM-3532
This commit is contained in:
Paula V. Quispe
2015-11-29 11:49:16 -04:00
parent ea99bb3a32
commit a3edd77604

View File

@@ -251,6 +251,7 @@ try {
die; die;
} }
//Set default Languaje
if (isset($frm['USER_LANG'])) { if (isset($frm['USER_LANG'])) {
if ($frm['USER_LANG'] != '') { if ($frm['USER_LANG'] != '') {
$lang = $frm['USER_LANG']; $lang = $frm['USER_LANG'];
@@ -264,10 +265,17 @@ try {
if( isset($rowUser["USR_DEFAULT_LANG"]) && $rowUser["USR_DEFAULT_LANG"]!=''){ if( isset($rowUser["USR_DEFAULT_LANG"]) && $rowUser["USR_DEFAULT_LANG"]!=''){
$lang = $rowUser["USR_DEFAULT_LANG"]; $lang = $rowUser["USR_DEFAULT_LANG"];
} else { } else {
//Check the login_defaultLanguage
$oConf = new Configurations(); $oConf = new Configurations();
$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', ''); $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
if (isset($oConf->aConfig["login_defaultLanguage"]) && $oConf->aConfig["login_defaultLanguage"] != "") { if (isset($oConf->aConfig["login_defaultLanguage"]) && $oConf->aConfig["login_defaultLanguage"] != "") {
$lang = $oConf->aConfig["login_defaultLanguage"]; $lang = $oConf->aConfig["login_defaultLanguage"];
}else{
if(SYS_LANG != ''){
$lang = SYS_LANG;
}else{
$lang = 'en';
}
} }
} }
} else { } else {