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

// Improve performance and bug fixes

Browse Source
This commit is contained in:
rGaillard
2012-06-06 16:22:48 +00:00
parent e636665621
commit 99b22fbbb8
32 changed files with 97 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
controllers/admin/AdminLocalizationController.php
View File

@@ -144,29 +144,33 @@ class AdminLocalizationControllerCore extends AdminController
{
if (Tools::isSubmit('submitLocalizationPack'))
{
$version = str_replace('.', '', _PS_VERSION_);
$version = substr($version, 0, 2);
$version = str_replace('.', '', _PS_VERSION_);
$version = substr($version, 0, 2);
$pack = @Tools::file_get_contents('http://api.prestashop.com/localization/'.$version.'/'.Tools::getValue('iso_localization_pack').'.xml');
if (!$pack && !($pack = @Tools::file_get_contents(dirname(__FILE__).'/../../localization/'.Tools::getValue('iso_localization_pack').'.xml')))
$this->errors[] = Tools::displayError('Cannot load localization pack (from prestashop.com and from your local folder "localization")');
if (!$selection = Tools::getValue('selection'))
$this->errors[] = Tools::displayError('Please select at least one item to import.');
else
if (Validate::isFileName(Tools::getValue('iso_localization_pack')))
{
foreach ($selection as $selected)
if (!Validate::isLocalizationPackSelection($selected))
{
$this->errors[] = Tools::displayError('Invalid selection');
return;
}
$localization_pack = new LocalizationPack();
if (!$localization_pack->loadLocalisationPack($pack, $selection))
$this->errors = array_merge($this->errors, $localization_pack->getErrors());
$pack = @Tools::file_get_contents('http://api.prestashop.com/localization/'.$version.'/'.Tools::getValue('iso_localization_pack').'.xml');
if (!$pack && !($pack = @Tools::file_get_contents(dirname(__FILE__).'/../../localization/'.Tools::getValue('iso_localization_pack').'.xml')))
$this->errors[] = Tools::displayError('Cannot load localization pack (from prestashop.com and from your local folder "localization")');
if (!$selection = Tools::getValue('selection'))
$this->errors[] = Tools::displayError('Please select at least one item to import.');
else
Tools::redirectAdmin(self::$currentIndex.'&conf=23&token='.$this->token);
{
foreach ($selection as $selected)
if (!Validate::isLocalizationPackSelection($selected))
{
$this->errors[] = Tools::displayError('Invalid selection');
return;
}
$localization_pack = new LocalizationPack();
if (!$localization_pack->loadLocalisationPack($pack, $selection))
$this->errors = array_merge($this->errors, $localization_pack->getErrors());
else
Tools::redirectAdmin(self::$currentIndex.'&conf=23&token='.$this->token);
}
}
}