dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : admin language is now based directly on the employee language instead of the cookie

Browse Source
This commit is contained in:
Damien Metzger
2013-03-07 12:18:49 +01:00
parent 70641cdc4e
commit 2ba4c2c1cc
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.inc.php
+9 -7
View File
@@ -141,13 +141,6 @@ else
$context->cookie = $cookie;
/* if the language stored in the cookie is not available language, use default language */
if (isset($cookie->id_lang) && $cookie->id_lang)
$language = new Language($cookie->id_lang);
if (!isset($language) || !Validate::isLoadedObject($language))
$language = new Language(Configuration::get('PS_LANG_DEFAULT'));
$context->language = $language;
/* Create employee if in BO, customer else */
if (defined('_PS_ADMIN_DIR_'))
{
@@ -158,10 +151,19 @@ if (defined('_PS_ADMIN_DIR_'))
if ($employee->id_profile != _PS_ADMIN_PROFILE_)
Shop::cacheShops(true);
$language = new Language($employee->id_lang);
$context->language = $language;
$cookie->id_lang = (int)$employee->id_lang;
}
else
{
/* if the language stored in the cookie is not available language, use default language */
if (isset($cookie->id_lang) && $cookie->id_lang)
$language = new Language($cookie->id_lang);
if (!isset($language) || !Validate::isLoadedObject($language))
$language = new Language(Configuration::get('PS_LANG_DEFAULT'));
$context->language = $language;
if (isset($cookie->id_customer) && (int)$cookie->id_customer)
{
$customer = new Customer($cookie->id_customer);