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

[-] BO : #PSTEST-667 - Fix bug with logo and multishop

Browse Source
This commit is contained in:
mDeflotte
2012-02-07 09:20:01 +00:00
parent 2be9ef2493
commit 0ddef0ac8b
8 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Mail.php
+2 -2
View File
@@ -187,8 +187,8 @@ class MailCore
/* Create mail and attach differents parts */
$message = new Swift_Message('['.Configuration::get('PS_SHOP_NAME').'] '.$subject);
$templateVars['{shop_logo}'] = (file_exists(_PS_IMG_DIR_.'logo_mail.jpg')) ? $message->attach(new Swift_Message_Image(new Swift_File(_PS_IMG_DIR_.'logo_mail.jpg'))) :
((file_exists(_PS_IMG_DIR_.'logo.jpg')) ? $message->attach(new Swift_Message_Image(new Swift_File(_PS_IMG_DIR_.'logo.jpg'))) : '');
$templateVars['{shop_logo}'] = (file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL'))) ? $message->attach(new Swift_Message_Image(new Swift_File(_PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL')))) :
((file_exists(_PS_IMG_DIR_.'logo.jpg')) ? $message->attach(new Swift_Message_Image(new Swift_File(_PS_IMG_DIR_.Configuration::get('PS_LOGO')) : '');
$templateVars['{shop_name}'] = Tools::safeOutput(Configuration::get('PS_SHOP_NAME'));
$templateVars['{shop_url}'] = Tools::getShopDomain(true, true).__PS_BASE_URI__;
$swift->attachPlugin(new Swift_Plugin_Decorator(array($to_plugin => $templateVars)), 'decorator');
classes/controller/FrontController.php
+2 -1
View File
@@ -670,7 +670,8 @@ class FrontControllerCore extends Controller
'logo_image_width' => Configuration::get('SHOP_LOGO_WIDTH'),
'logo_image_height' => Configuration::get('SHOP_LOGO_HEIGHT'),
'priceDisplayPrecision' => _PS_PRICE_DISPLAY_PRECISION_,
'content_only' => (int)Tools::getValue('content_only')
'content_only' => (int)Tools::getValue('content_only'),
'logo_url' => _PS_IMG_.Configuration::get('PS_LOGO').'?'.Configuration::get('PS_IMG_UPDATE_TIME')
));
}
classes/pdf/HTMLTemplate.php
+4 -4
View File
@@ -104,10 +104,10 @@ abstract class HTMLTemplateCore
{
$logo = '';
if (file_exists(_PS_IMG_DIR_.'logo_invoice.jpg'))
$logo = _PS_IMG_.'logo_invoice.jpg';
else if (file_exists(_PS_IMG_DIR_.'logo.jpg'))
$logo = _PS_IMG_.'logo.jpg';
if (file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE')))
$logo = _PS_IMG_.Configuration::get('PS_LOGO_INVOICE');
else if (file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO')))
$logo = _PS_IMG_.Configuration::get('PS_LOGO');
return $logo;
}
classes/webservice/WebserviceSpecificManagementImages.php
+4 -4
View File
@@ -333,8 +333,8 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage
case 'mail':
if (in_array($this->wsObject->method, array('GET','HEAD','PUT')))
{
$path = _PS_IMG_DIR_.'logo_mail.jpg';
$alternative_path = _PS_IMG_DIR_.'logo.jpg';
$path = _PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL');
$alternative_path = _PS_IMG_DIR_.Configuration::get('PS_LOGO');
}
else
throw new WebserviceException('This method is not allowed with general image resources.', array(50, 405));
@@ -344,8 +344,8 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage
case 'invoice':
if (in_array($this->wsObject->method, array('GET','HEAD','PUT')))
{
$path = _PS_IMG_DIR_.'logo_invoice.jpg';
$alternative_path = _PS_IMG_DIR_.'logo.jpg';
$path = _PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE');
$alternative_path = _PS_IMG_DIR_.Configuration::get('PS_LOGO');
}
else
throw new WebserviceException('This method is not allowed with general image resources.', array(51, 405));
controllers/admin/AdminThemesController.php
+35 -30
View File
@@ -88,13 +88,13 @@ class AdminThemesControllerCore extends AdminController
'tab' => 'AdminStores',
)
);
public $className = 'Theme';
public $table = 'theme';
public function __construct()
public function init()
{
$this->className = 'Theme';
$this->table = 'theme';
parent::__construct();
parent::init();
// Thumbnails filenames depend on multishop activation
if (Shop::isFeatureActive())
@@ -107,16 +107,16 @@ class AdminThemesControllerCore extends AdminController
'title' => $this->l('Appearance'),
'icon' => 'email',
'fields' => array(
'PS_LOGO' => array('title' => $this->l('Header logo:'), 'desc' => $this->l('Will appear on main page'), 'type' => 'file', 'thumb' => _PS_IMG_.'logo'.$shop_suffix.'.jpg?date='.time()),
'PS_LOGO_MAIL' => array('title' => $this->l('Mail logo:'), 'desc' => $this->l('Will appear on e-mail headers, if undefined the Header logo will be used'), 'type' => 'file', 'thumb' => (file_exists(_PS_IMG_DIR_.'logo_mail'.$shop_suffix.'.jpg')) ? _PS_IMG_.'logo_mail'.$shop_suffix.'.jpg?date='.time() : _PS_IMG_.'logo'.$shop_suffix.'.jpg?date='.time()),
'PS_LOGO_INVOICE' => array('title' => $this->l('Invoice logo:'), 'desc' => $this->l('Will appear on invoices headers, if undefined the Header logo will be used'), 'type' => 'file', 'thumb' => file_exists(_PS_IMG_DIR_.'logo_invoice'.$shop_suffix.'.jpg') ? _PS_IMG_.'logo_invoice'.$shop_suffix.'.jpg?date='.time() : _PS_IMG_.'logo'.$shop_suffix.'.jpg?date='.time()),
'PS_LOGO' => array('title' => $this->l('Header logo:'), 'desc' => $this->l('Will appear on main page'), 'type' => 'file', 'thumb' => _PS_IMG_.Configuration::get('PS_LOGO').'?date='.time()),
'PS_LOGO_MAIL' => array('title' => $this->l('Mail logo:'), 'desc' => $this->l('Will appear on e-mail headers, if undefined the Header logo will be used'), 'type' => 'file', 'thumb' => (file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_MAIL'))) ? _PS_IMG_.Configuration::get('PS_LOGO_MAIL').'?date='.time() : _PS_IMG_.Configuration::get('PS_LOGO').'?date='.time()),
'PS_LOGO_INVOICE' => array('title' => $this->l('Invoice logo:'), 'desc' => $this->l('Will appear on invoices headers, if undefined the Header logo will be used'), 'type' => 'file', 'thumb' => file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE')) ? _PS_IMG_.Configuration::get('PS_LOGO_INVOICE').'?date='.time() : _PS_IMG_.Configuration::get('PS_LOGO').'?date='.time()),
'PS_FAVICON' => array('title' => $this->l('Favicon:'), 'desc' => $this->l('Will appear in the address bar of your web browser'), 'type' => 'file', 'thumb' => _PS_IMG_.'favicon'.$shop_suffix.'.ico?date='.time()),
'PS_STORES_ICON' => array('title' => $this->l('Store icon:'), 'desc' => $this->l('Will appear on the store locator (inside Google Maps)').'<br />'.$this->l('Suggested size: 30x30, Transparent GIF'), 'type' => 'file', 'thumb' => _PS_IMG_.'logo_stores'.$shop_suffix.'.gif?date='.time()),
'PS_NAVIGATION_PIPE' => array('title' => $this->l('Navigation pipe:'), 'desc' => $this->l('Used for navigation path inside categories/product'), 'cast' => 'strval', 'type' => 'text', 'size' => 20),
),
'submit' => array('title' => $this->l(' Save '), 'class' => 'button')
),
);
),
);
$this->fieldsDisplay = array(
'id_theme' => array(
@@ -291,23 +291,14 @@ class AdminThemesControllerCore extends AdminController
$content = '';
if (file_exists(_PS_IMG_DIR_.'logo.jpg'))
{
list($width, $height, $type, $attr) = getimagesize(_PS_IMG_DIR_.'logo.jpg');
list($width, $height, $type, $attr) = getimagesize(_PS_IMG_DIR_.Configuration::get('PS_LOGO'));
Configuration::updateValue('SHOP_LOGO_WIDTH', (int)round($width));
Configuration::updateValue('SHOP_LOGO_HEIGHT', (int)round($height));
}
// No cache for auto-refresh uploaded logo
header('Cache-Control: no-cache, must-revalidate');
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
// $this->displayOptionsList();
/* if (@ini_get('allow_url_fopen') AND @fsockopen('addons.prestashop.com', 80, $errno, $errst, 3))
$content .= '<script type="text/javascript">
$.post("'.dirname(self::$currentIndex).'/ajax.php",{page:"themes"},function(a){getE("prestastore-content").innerHTML="<legend><img src=\"../img/admin/prestastore.gif\" class=\"middle\" /> '.$this->l('Live from PrestaShop Addons!').'</legend>"+a;});
</script>
<fieldset id="prestastore-content" class="width3">ZZZZZ</fieldset>';
else
$content .= '<a href="http://addons.prestashop.com/3-prestashop-themes">'.$this->l('Find new themes on PrestaShop Addons!').'</a>';
*/
$this->content .= $content;
return parent::initContent();
}
@@ -453,10 +444,15 @@ class AdminThemesControllerCore extends AdminController
$tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS');
if (!$tmp_name || !move_uploaded_file($_FILES['PS_LOGO']['tmp_name'], $tmp_name))
return false;
if ($id_shop == Configuration::get('PS_SHOP_DEFAULT') && !@ImageManager::resize($tmp_name, _PS_IMG_DIR_.'logo.jpg'))
$this->errors[] = 'an error occurred during logo copy';
if (($id_shop == Configuration::get('PS_SHOP_DEFAULT') || $id_shop == 0) && !@ImageManager::resize($tmp_name, _PS_IMG_DIR_.'logo.jpg'))
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
if (!@ImageManager::resize($tmp_name, _PS_IMG_DIR_.'logo-'.(int)$id_shop.'.jpg'))
$this->errors[] = 'an error occurred during logo copy';
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
else
Configuration::updateValue('PS_LOGO', 'logo-'.(int)$id_shop.'.jpg');
Configuration::updateGlobalValue('PS_LOGO', 'logo.jpg');
unlink($tmp_name);
}
@@ -476,9 +472,14 @@ class AdminThemesControllerCore extends AdminController
if (!$tmp_name || !move_uploaded_file($_FILES['PS_LOGO_MAIL']['tmp_name'], $tmp_name))
return false;
if ($id_shop == Configuration::get('PS_SHOP_DEFAULT') && !@ImageManager::resize($tmp_name, _PS_IMG_DIR_.'logo_mail.jpg'))
$this->errors[] = 'an error occurred during logo copy';
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
if (!@ImageManager::resize($tmp_name, _PS_IMG_DIR_.'logo_mail-'.(int)$id_shop.'.jpg'))
$this->errors[] = 'an error occurred during logo copy';
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
else
Configuration::updateValue('PS_LOGO_MAIL', 'logo_mail-'.(int)$id_shop.'.jpg');
Configuration::updateGlobalValue('PS_LOGO_MAIL', 'logo_mail.jpg');
unlink($tmp_name);
}
}
@@ -497,9 +498,13 @@ class AdminThemesControllerCore extends AdminController
if (!$tmp_name || !move_uploaded_file($_FILES['PS_LOGO_INVOICE']['tmp_name'], $tmp_name))
return false;
if ($id_shop == Configuration::get('PS_SHOP_DEFAULT') && !@ImageManager::resize($tmp_name, _PS_IMG_DIR_.'logo_invoice.jpg'))
$this->errors[] = 'an error occurred during logo copy';
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
if (!@ImageManager::resize($tmp_name, _PS_IMG_DIR_.'logo_invoice-'.(int)$id_shop.'.jpg'))
$this->errors[] = 'an error occurred during logo copy';
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
else
Configuration::updateValue('PS_LOGO_INVOICE', 'logo_invoice-'.(int)$id_shop.'.jpg');
Configuration::updateGlobalValue('PS_LOGO_INVOICE', 'logo_invoice.jpg');
unlink($tmp_name);
}
@@ -519,9 +524,9 @@ class AdminThemesControllerCore extends AdminController
if (!$tmp_name || !move_uploaded_file($_FILES['PS_STORES_ICON']['tmp_name'], $tmp_name))
return false;
if ($id_shop = Configuration::get('PS_SHOP_DEFAULT') && !@ImageManager::resize($tmp_name, _PS_IMG_DIR_.'logo_stores.gif'))
$this->errors[] = 'an error occurred during logo copy';
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
if (!@ImageManager::resize($tmp_name, _PS_IMG_DIR_.'logo_stores-'.(int)$id_shop.'.gif'))
$this->errors[] = 'an error occurred during logo copy';
$this->errors[] = Tools::displayError('An error occurred during logo copy.');
unlink($tmp_name);
}
@@ -540,7 +545,7 @@ class AdminThemesControllerCore extends AdminController
// Copy new ico
elseif (!copy($_FILES[$name]['tmp_name'], $dest))
$this->errors[] = Tools::displayError('an error occurred while uploading favicon: '.$_FILES[$name]['tmp_name'].' to '.$dest);
$this->errors[] = sprintf(Tools::displayError('An error occurred while uploading favicon: %s to %s'), $_FILES[$name]['tmp_name'], $dest);
}
return !count($this->errors) ? true : false;
}
install-dev/data/xml/configuration.xml
+6
View File
@@ -857,5 +857,11 @@
<configuration id="PS_SHOP_ACTIVITY" name="PS_SHOP_ACTIVITY">
<value>10</value>
</configuration>
<configuration id="PS_LOGO" name="PS_LOGO">
<value>logo-1.jpg</value>
</configuration>
<configuration id="PS_LOGO_1" name="PS_LOGO">
<value>logo.jpg</value>
</configuration>
</entities>
</entity_configuration>
themes/default/header.tpl
+1 -1
View File
@@ -72,7 +72,7 @@
<!-- Header -->
<div id="header" class="grid_9 alpha omega">
<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'htmlall':'UTF-8'}">
<img class="logo" src="{$img_ps_dir}logo.jpg?{$img_update_time}" alt="{$shop_name|escape:'htmlall':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if} />
<img class="logo" src="{$logo_url}" alt="{$shop_name|escape:'htmlall':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if} />
</a>
<div id="header_right" class="grid_6 omega">
{$HOOK_TOP}
translations/fr/errors.php
+18 -19
View File
@@ -8,39 +8,34 @@ $_ERRORS['b8ab75688d5796c2e61d3047b91acc17'] = 'Cette association contient trop
$_ERRORS['d312d5c57aff77e76cab1b5981bc5606'] = 'Ce nom n\'est pas autorisé';
$_ERRORS['35f55f4e657f542d5f27853332c46f80'] = 'Erreur de syntaxe avec ce motif';
$_ERRORS['b72591580ab2e9ecb08d1a26ac23641b'] = 'Cette clé est utilisée trop de fois (une seule autorisée)';
$_ERRORS['702f5592024f4a807d5bd1b145c93300'] = 'la date de début est invalide (format YYYY-mm-dd)';
$_ERRORS['2a0fad646bb2694202cbd53ce9dcf3f8'] = 'la date de fin est invalide (format YYYY-mm-dd)';
$_ERRORS['08de2fdaabcd120b8ca1388d21179921'] = 'accès interdit';
$_ERRORS['472266472e3353d32d8a8ffa25c60154'] = 'une erreur s\'est produite pendant la suppression de l\'image';
$_ERRORS['b1367942aa02ea8c9d4aa07cdf5e473c'] = 'vous devez garder au moins un objet';
$_ERRORS['ec5f6f7f65190788d12ef16ab6135009'] = 'vous ne pouvez pas tous les supprimer';
$_ERRORS['9476b0a23e72aed97f3551779d987674'] = 'Vous ne pouvez pas supprimer ces objets.';
$_ERRORS['f8a12963c3dc4b4904584daa232d0e08'] = 'Impossible de supprimer les images associées.';
$_ERRORS['bc33aa1314e7dcd3472db72472b909b2'] = 'une erreur s\'est produite pendant la suppression';
$_ERRORS['f90676e0d2061813a868bc9d86c4d982'] = 'une erreur s\'est produite pendant la suppression de l\'objet';
$_ERRORS['77ae44aa6c998166fcf1a87496278ad5'] = 'impossible de charger l\'objet';
$_ERRORS['2c092e2d230d9d1d6b2d68c5ef83b13c'] = 'une erreur s\'est produite pendant la création de l\'objet';
$_ERRORS['9ddf236daae81f831ccf3c0bfe9751e5'] = 'une erreur s\'est produite pendant la mise à jour';
$_ERRORS['66f24b4cb390959a74fae0280bf8cdec'] = 'Erreur dans la mise à jour les champs requis ';
$_ERRORS['03596501a6ce61f5a66dc0146fbab03e'] = 'Vous n\'avez pas les droits nécessaires pour supprimer un élément.';
$_ERRORS['63a3342bcb133c141890746783007eaa'] = 'une erreur s\'est produite pendant la mise à jour du statut';
$_ERRORS['cc7e699f0084632117f35dc294d29f16'] = 'une erreur s\'est produite pendant la mise à jour du statut de l\'objet';
$_ERRORS['2406c65c7d678cfca3aad1233c50283a'] = 'Vous n\'avez pas la permission de changer quelque chose ici.';
$_ERRORS['45ebc64529137a007889ee445d64611c'] = 'Impossible de mettre à jour la position.';
$_ERRORS['dea9b328f904f025e4031bf8dfb7b392'] = 'une erreur s\'est produite pendant la suppression de la sélection';
$_ERRORS['ddd4e7f16c2032d59cb4fb4b86576bc5'] = 'vous devez sélectionner au moins un élément pour pouvoir supprimer';
$_ERRORS['9ddf236daae81f831ccf3c0bfe9751e5'] = 'une erreur s\'est produite pendant la mise à jour';
$_ERRORS['2c092e2d230d9d1d6b2d68c5ef83b13c'] = 'une erreur s\'est produite pendant la création de l\'objet';
$_ERRORS['68f608519f1015caf55d76b1d571a58b'] = 'Vous n\'avez pas les droits suffisants pour l\'ajout.';
$_ERRORS['702f5592024f4a807d5bd1b145c93300'] = 'la date de début est invalide (format YYYY-mm-dd)';
$_ERRORS['2a0fad646bb2694202cbd53ce9dcf3f8'] = 'la date de fin est invalide (format YYYY-mm-dd)';
$_ERRORS['66f24b4cb390959a74fae0280bf8cdec'] = 'Erreur dans la mise à jour les champs requis ';
$_ERRORS['06e3d36fa30cea095545139854ad1fb9'] = 'champ';
$_ERRORS['ee66f9c9930cb33d2a5dde9b240d3f7e'] = 'requis';
$_ERRORS['8ae0cb74f9724518e1ce68c503377002'] = 'invalide';
$_ERRORS['2406c65c7d678cfca3aad1233c50283a'] = 'Vous n\'avez pas la permission de changer quelque chose ici.';
$_ERRORS['56b207f28525081cec398738b3d25225'] = 'objet impossible à charger (introuvable)';
$_ERRORS['5ca4012f9738274ebeb214a961f1c829'] = 'objet impossible à charger (identifiant manquant ou invalide)';
$_ERRORS['03596501a6ce61f5a66dc0146fbab03e'] = 'Vous n\'avez pas les droits nécessaires pour supprimer un élément.';
$_ERRORS['68f608519f1015caf55d76b1d571a58b'] = 'Vous n\'avez pas les droits suffisants pour l\'ajout.';
$_ERRORS['44ec51a3b11e47451c0b4f6dccb20df6'] = 'Vous n\'avez pas les droits suffisants pour la visualisation.';
$_ERRORS['5636dd80d3968f9b1ce4400bd71c5a7a'] = 'une erreur est apparue lors de l\'upload d\'image';
$_ERRORS['dea9b328f904f025e4031bf8dfb7b392'] = 'une erreur s\'est produite pendant la suppression de la sélection';
$_ERRORS['ddd4e7f16c2032d59cb4fb4b86576bc5'] = 'vous devez sélectionner au moins un élément pour pouvoir supprimer';
$_ERRORS['5dc4546d015c4ded73df784359755c74'] = 'Une erreur s\'est produite lors de l\'affectation d\'une zone pour la sélection.';
$_ERRORS['f1af7a5b67241bb73be668c457a6e6fa'] = 'Vous devez sélectionner au moins un élément à affecter à la zone.';
$_ERRORS['08de2fdaabcd120b8ca1388d21179921'] = 'accès interdit';
$_ERRORS['e9192643ed3b0619fcd8347015806e2a'] = 'Nom de table invalide :';
$_ERRORS['1b073c8ca6b9aabf07935221e17b7c42'] = 'obtenir la liste des paramètres est impossible';
$_ERRORS['56b207f28525081cec398738b3d25225'] = 'objet impossible à charger (introuvable)';
$_ERRORS['5ca4012f9738274ebeb214a961f1c829'] = 'objet impossible à charger (identifiant manquant ou invalide)';
$_ERRORS['6262d9cbf1b6649b8a9433a0fa2db8e0'] = 'Le dossier de backup n\'existe pas';
$_ERRORS['4e0ac45de6bd848503ffa98ff6247f2f'] = 'Suppression d\'erreur';
$_ERRORS['c1c8a564c10a0efe07bb4e4b20d88cc9'] = 'Identifiant non valide';
@@ -57,9 +52,9 @@ $_ERRORS['4c4492297de90e9e2f5665bf87b4e034'] = 'Ce bon de réduction n\'est pas
$_ERRORS['097d067ff8635d1496467ce7dd236c07'] = 'Vous ne pouvez pas utiliser ce bon de réduction';
$_ERRORS['fd6034a1544218709264bfa5c70ffb69'] = 'Vous ne pouvez pas utiliser ce bon de réduction dans votre pays de livraison';
$_ERRORS['1a7bdc2c01aaa7757d475e204f2bc6f9'] = 'Vous ne pouvez pas utiliser ce bon de réduction avec ce transporteur';
$_ERRORS['f9330b1b2afa3c4dbc8e31e14a0b150a'] = 'Vous ne pouvez pas utiliser ce bon de réduction avec ces produits';
$_ERRORS['b40ad46c25c153a3d2fde078c0e1b0f8'] = 'Veuillez vous connectez';
$_ERRORS['83b7f89088941f0fc56136c41d76d21b'] = 'Votre commande n\'atteint pas le montant minimum requis pour utiliser ce bon de réduction';
$_ERRORS['f9330b1b2afa3c4dbc8e31e14a0b150a'] = 'Vous ne pouvez pas utiliser ce bon de réduction avec ces produits';
$_ERRORS['8243462d21cc70da864e92c31c29486a'] = 'Requête SQL pour les sous-domaines invalide';
$_ERRORS['e07269088946aa33a280b8c05529b46c'] = 'Impossible de récupérer le flux !';
$_ERRORS['6f775dff2aa88bce2301e5d5309c5f7e'] = 'Aucune devise par défaut détectée !';
@@ -92,6 +87,7 @@ $_ERRORS['e970d66f1c952edf7a4e5dfcf3e18958'] = 'Une erreur est survenue lors de
$_ERRORS['28c39342f22a394f233ec0cba0ecfa02'] = 'Une erreur est survenue pendant la récupération d\'un état';
$_ERRORS['37c73343e4118943bc088bb4ad94a56c'] = 'Propriété de taxe invalide.';
$_ERRORS['42a8c33bd3e937c419378c5a965e65ac'] = 'Une erreur est survenue lors de l\'import d\'une taxe';
$_ERRORS['36f9983aadfde9d77db0d357abe6e85e'] = 'La rêgle d etaxe ne peut être enregistrée.';
$_ERRORS['19f29a24f0ccb9b96b37182473b27d63'] = 'Propriété de devise invalide';
$_ERRORS['bdc3ce1a2e9e6d8ab5bd0dd31c1a03fe'] = 'Une erreur est survenue lors de l\'import d\'une devise';
$_ERRORS['a258f8e051c4e2508a6cc3ecd39d2807'] = 'Impossible d\'analyser les monnaies du flux XML.';
@@ -566,6 +562,8 @@ $_ERRORS['e0d4da0607fb1793b6e1d348c36d52cb'] = 'config.xml est manquant dans le
$_ERRORS['1d112c010ef14e32e478b36aca8d3414'] = 'config.xml dans votre dossier de thème n\'est pas un fichier xml valide';
$_ERRORS['6364b8f0fcf00c1fedb76a7a7b7ad03e'] = 'Le fichier config.xml du thème n\'a pas été créé pour cette version de Prestashop';
$_ERRORS['db4c57ec9dc07e5858740dac2954afe0'] = 'Vous pouvez désactiver cette fonction sur cette page';
$_ERRORS['aa2154c174605e6c5bae0daa7ea56352'] = 'Une erreur s\'est produite lors de la copie du logo.';
$_ERRORS['62f79d981ad8e433cf9c9203f286a2e2'] = 'Une erreur s\'est produite durant de la copie du favicon %s vers %s.';
$_ERRORS['ec531fd2b656df91f11e8f94b2bd2f9b'] = 'une erreur s\'est produite pendant la création de l\'archive';
$_ERRORS['4b9fa5f1ff63eb63f4f42277ce26f17c'] = 'Merci de choisir une langue et un thème';
$_ERRORS['f787618e514c038851726224d7e4421e'] = 'aucun fichier selectionné';
@@ -606,6 +604,7 @@ $_ERRORS['b30545c7b2d429352b9afdd85be810c7'] = 'vous devez spécifié un nom';
$_ERRORS['b74c118d823d908d653cfbf1c877ae55'] = 'ce nom est déjà utilisé par une autre liste';
$_ERRORS['7098d49878bbd102b13038a748125e27'] = 'impossible de supprimer cette wishlist';
$_ERRORS['7cff73659ca47fea5d29644da84f35e2'] = 'Token de liste de voeux invalide';
$_ERRORS['97385ca11c6260e29733c586df8b09ae'] = 'L\'exportation a échoué.';
$_ERRORS['28c6bb9c984948ba9c01976ea6ff250e'] = 'Objet CartRule incorrect.';
$_ERRORS['8b80d4b6307990874b832cc15a92e5a3'] = 'Des paramètres sont manquants';
$_ERRORS['da393a0fcc28b1678ba1f8f59ea94b50'] = 'Object commande incorrect';