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

[-] BO : fix #PSCFV-4862

Browse Source
This commit is contained in:
lLefevre committed 2012-10-10 08:17:12 +00:00
1 parent be4a768f3f
commit 4421a3da4e
2 files changed
+19 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/admin/AdminTranslationsController.php
+18 -12
View File
@@ -579,22 +579,28 @@ class AdminTranslationsControllerCore extends AdminController
else else
{ {
$gz = new Archive_Tar($_FILES['file']['tmp_name'], true); $gz = new Archive_Tar($_FILES['file']['tmp_name'], true);
$iso_code = str_replace(array('.tar.gz', '.gzip'), '', $_FILES['file']['name']); $filename = $_FILES['file']['name'];
$themes_selected = Tools::getValue('theme', array(self::DEFAULT_THEME_NAME)); $iso_code = str_replace(array('.tar.gz', '.gzip'), '', $filename);
$files_list = $gz->listContent(); if (Validate::isLangIsoCode($iso_code))
if ($gz->extract(_PS_TRANSLATIONS_DIR_.'../', false))
{ {
AdminTranslationsController::checkAndAddMailsFiles($iso_code, $files_list); $themes_selected = Tools::getValue('theme', array(self::DEFAULT_THEME_NAME));
$this->checkAndAddThemesFiles($files_list, $themes_selected); $files_list = $gz->listContent();
AdminTranslationsController::addNewTabs($iso_code, $files_list); if ($gz->extract(_PS_TRANSLATIONS_DIR_.'../', false))
if (Validate::isLanguageFileName($_FILES['file']['name']))
{ {
if (!Language::checkAndAddLanguage($iso_code)) AdminTranslationsController::checkAndAddMailsFiles($iso_code, $files_list);
$conf = 20; $this->checkAndAddThemesFiles($files_list, $themes_selected);
AdminTranslationsController::addNewTabs($iso_code, $files_list);
if (Validate::isLanguageFileName($filename))
{
if (!Language::checkAndAddLanguage($iso_code))
$conf = 20;
}
$this->redirect(false, (isset($conf) ? $conf : '15'));
} }
$this->redirect(false, (isset($conf) ? $conf : '15')); $this->errors[] = Tools::displayError('Archive cannot be extracted.');
} }
$this->errors[] = Tools::displayError('Archive cannot be extracted.'); else
$this->errors[] = sprintf(Tools::displayError('ISO CODE invalid "%1$s" for the following file: "%2$s"'), $iso_code, $filename);
} }
} }
translations/fr/errors.php
+1
View File
@@ -424,6 +424,7 @@ $_ERRORS['a34d208d4c1e25fa85739aa0b2f51553'] = 'Une erreur s\'est produite lors
$_ERRORS['a4469e51691856c0d06b6cca6842666d'] = 'Une erreur est survenue lors de l\'envoi de l\'e-mail.'; $_ERRORS['a4469e51691856c0d06b6cca6842666d'] = 'Une erreur est survenue lors de l\'envoi de l\'e-mail.';
$_ERRORS['a467de484bad00fe4980b05ac6a8af5d'] = 'Vous n\'avez pas la permission d\'utiliser ce module'; $_ERRORS['a467de484bad00fe4980b05ac6a8af5d'] = 'Vous n\'avez pas la permission d\'utiliser ce module';
$_ERRORS['a478ec266116342449ae1705c79d5cc2'] = 'Type d\'archive inconnu'; $_ERRORS['a478ec266116342449ae1705c79d5cc2'] = 'Type d\'archive inconnu';
$_ERRORS['a4a9d544dda922c68fe127c1661441b2'] = 'ISO CODE invalide \"%1$s\" pour le fichier suivant \"%2$s\"';
$_ERRORS['a551c1b1a24beff63aa3cc70ea172351'] = 'Vous devez indiquer un nom afin de créer un bon de réduction'; $_ERRORS['a551c1b1a24beff63aa3cc70ea172351'] = 'Vous devez indiquer un nom afin de créer un bon de réduction';
$_ERRORS['a56b6c43645970e79a8098df1dfc9746'] = 'Cette adresse ne peut pas être effacée.'; $_ERRORS['a56b6c43645970e79a8098df1dfc9746'] = 'Cette adresse ne peut pas être effacée.';
$_ERRORS['a5df8bfce318a15ea55f18082b9b56c0'] = 'Vous n\'avez pas accès à ce produit.'; $_ERRORS['a5df8bfce318a15ea55f18082b9b56c0'] = 'Vous n\'avez pas accès à ce produit.';