lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Better init of default lang

Browse Source
This commit is contained in:
Laurent Destailleur 2013-02-25 10:17:38 +01:00
parent b61c576343
commit ae322ba17f
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/security2.lib.php
View File

@ -133,9 +133,6 @@ function dol_loginfunction($langs,$conf,$mysoc)
// Instantiate hooks of thirdparty module only if not already define // Instantiate hooks of thirdparty module only if not already define
$hookmanager->initHooks(array('mainloginpage')); $hookmanager->initHooks(array('mainloginpage'));
$langcode=(GETPOST('lang')?((is_object($langs)&&$langs->defaultlang)?$langs->defaultlang:'auto'):GETPOST('lang'));
$langs->setDefaultLang($langcode);
$langs->load("main"); $langs->load("main");
$langs->load("other"); $langs->load("other");
$langs->load("help"); $langs->load("help");

10
htdocs/main.inc.php
View File

@ -388,13 +388,13 @@ if (! defined('NOLOGIN'))
if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true; if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
if (GETPOST("username","alpha",2) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true; if (GETPOST("username","alpha",2) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
$langcode=(GETPOST('lang')?((is_object($langs)&&$langs->defaultlang)?$langs->defaultlang:'auto'):GETPOST('lang')); if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need lang for error messages.
{ {
include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
$langs=new Translate("",$conf); $langs=new Translate("",$conf);
$langcode=(GETPOST('lang')?GETPOST('lang','alpha',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
$langs->setDefaultLang($langcode);
} }
$langs->setDefaultLang($langcode);
if ($test && $goontestloop) if ($test && $goontestloop)
{ {
@ -677,10 +677,10 @@ if (! defined('NOREQUIRETRAN'))
} }
} }
} }
else // If language was forced on URL /* else // If language was forced on URL
{ {
$langs->setDefaultLang(GETPOST('lang','alpha',1)); $langs->setDefaultLang(GETPOST('lang','alpha',1));
} }*/
} }
// Case forcing style from url // Case forcing style from url

5
htdocs/master.inc.php
View File

@ -201,10 +201,11 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
} }
// Set default language (must be after the setValues of $conf) // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
if (! defined('NOREQUIRETRAN')) if (! defined('NOREQUIRETRAN'))
{ {
$langs->setDefaultLang((! empty($conf->global->MAIN_LANG_DEFAULT)?$conf->global->MAIN_LANG_DEFAULT:'')); $langcode=(GETPOST('lang')?GETPOST('lang','alpha',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
$langs->setDefaultLang($langcode);
} }