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

// Fixed language code consistency

Browse Source
This commit is contained in:
Damien Metzger
2013-09-27 10:25:37 +02:00
parent 33c2669692
commit 84d8ccfa2b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Language.php
+5 -2
View File
@@ -691,6 +691,7 @@ class LanguageCore extends ObjectModel
// Initialize the language // Initialize the language
$lang = new Language(); $lang = new Language();
$lang->iso_code = $iso_code; $lang->iso_code = $iso_code;
$lang->language_code = $iso_code;
$lang->active = true; $lang->active = true;
// If the language pack has not been provided, retrieve it from prestashop.com // If the language pack has not been provided, retrieve it from prestashop.com
@@ -700,12 +701,14 @@ class LanguageCore extends ObjectModel
// If a language pack has been found or provided, prefill the language object with the value // If a language pack has been found or provided, prefill the language object with the value
if ($lang_pack) if ($lang_pack)
foreach (get_object_vars($lang_pack) as $key => $value) foreach (get_object_vars($lang_pack) as $key => $value)
$lang->$key = $value; if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
$lang->$key = $value;
// Use the values given in parameters to override the data retrieved automatically // Use the values given in parameters to override the data retrieved automatically
if ($params_lang !== null && is_array($params_lang)) if ($params_lang !== null && is_array($params_lang))
foreach ($params_lang as $key => $value) foreach ($params_lang as $key => $value)
$lang->$key = $value; if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
$lang->$key = $value;
if (!$lang->add(true, false, $only_add)) if (!$lang->add(true, false, $only_add))
return false; return false;