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
+8 -5
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,13 +701,15 @@ 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;
@@ -724,7 +727,7 @@ class LanguageCore extends ObjectModel
} }
else else
Language::_copyNoneFlag((int)$lang->id); Language::_copyNoneFlag((int)$lang->id);
$files_copy = array( $files_copy = array(
'/en.jpg', '/en.jpg',
'/en-default-'.ImageType::getFormatedName('thickbox').'.jpg', '/en-default-'.ImageType::getFormatedName('thickbox').'.jpg',
@@ -734,7 +737,7 @@ class LanguageCore extends ObjectModel
'/en-default-'.ImageType::getFormatedName('small').'.jpg', '/en-default-'.ImageType::getFormatedName('small').'.jpg',
'/en-default-'.ImageType::getFormatedName('scene').'.jpg' '/en-default-'.ImageType::getFormatedName('scene').'.jpg'
); );
foreach (array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_) as $to) foreach (array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_) as $to)
foreach ($files_copy as $file) foreach ($files_copy as $file)
@copy(dirname(__FILE__).'/../img/l'.$file, $to.str_replace('/en', '/'.$iso_code, $file)); @copy(dirname(__FILE__).'/../img/l'.$file, $to.str_replace('/en', '/'.$iso_code, $file));