From 692ba94f9102330c381e0afeb53a09d9a09d411e Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 3 May 2012 09:28:19 +0000 Subject: [PATCH] //fixed bug #PSCFV-124 --- modules/blockcart/translations/fr.php | 2 +- modules/blockcms/translations/fr.php | 3 +-- modules/blockwishlist/translations/fr.php | 24 +++++++++---------- modules/sendtoafriend/translations/fr.php | 1 - .../statsbestcategories.php | 6 ++--- .../statsbestcustomers/statsbestcustomers.php | 6 ++--- .../statsbestmanufacturers.php | 6 ++--- .../statsbestproducts/statsbestproducts.php | 6 ++--- .../statsbestsuppliers/statsbestsuppliers.php | 4 ++-- .../statsbestvouchers/statsbestvouchers.php | 6 ++--- 10 files changed, 31 insertions(+), 33 deletions(-) diff --git a/modules/blockcart/translations/fr.php b/modules/blockcart/translations/fr.php index ca09c0f2d..5632a5b23 100644 --- a/modules/blockcart/translations/fr.php +++ b/modules/blockcart/translations/fr.php @@ -17,6 +17,7 @@ $_MODULE['<{blockcart}prestashop>blockcart_20351b3328c35ab617549920f5cb4939'] = $_MODULE['<{blockcart}prestashop>blockcart_ed6e9a09a111035684bb23682561e12d'] = 'supprimer cet article du panier'; $_MODULE['<{blockcart}prestashop>blockcart_c6995d6cc084c192bc2e742f052a5c74'] = 'Livraison gratuite !'; $_MODULE['<{blockcart}prestashop>blockcart_e7a6ca4e744870d455a57b644f696457'] = 'Gratuite !'; +$_MODULE['<{blockcart}prestashop>blockcart_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer'; $_MODULE['<{blockcart}prestashop>blockcart_a85eba4c6c699122b2bb1387ea4813ad'] = 'Panier'; $_MODULE['<{blockcart}prestashop>blockcart_86024cad1e83101d97359d7351051156'] = 'articles'; $_MODULE['<{blockcart}prestashop>blockcart_f5bf48aa40cad7891eb709fcf1fde128'] = 'article'; @@ -24,7 +25,6 @@ $_MODULE['<{blockcart}prestashop>blockcart_9e65b51e82f2a9b9f72ebe3e083582bb'] = $_MODULE['<{blockcart}prestashop>blockcart_4b7d496eedb665d0b5f589f2f874e7cb'] = 'Détails de l\'article'; $_MODULE['<{blockcart}prestashop>blockcart_853ae90f0351324bd73ea615e6487517'] = ' :'; $_MODULE['<{blockcart}prestashop>blockcart_09dc02ecbb078868a3a86dded030076d'] = 'Aucun produit'; -$_MODULE['<{blockcart}prestashop>blockcart_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer'; $_MODULE['<{blockcart}prestashop>blockcart_ea9cf7e47ff33b2be14e6dd07cbcefc6'] = 'Expédition'; $_MODULE['<{blockcart}prestashop>blockcart_ba794350deb07c0c96fe73bd12239059'] = 'Emballage'; $_MODULE['<{blockcart}prestashop>blockcart_4b78ac8eb158840e9638a3aeb26c4a9d'] = 'Taxes'; diff --git a/modules/blockcms/translations/fr.php b/modules/blockcms/translations/fr.php index 23b634bfc..0d58af484 100755 --- a/modules/blockcms/translations/fr.php +++ b/modules/blockcms/translations/fr.php @@ -17,6 +17,7 @@ $_MODULE['<{blockcms}prestashop>blockcms_e5f7d0903a8ea59c07b4b2797ee0cff9'] = 'I $_MODULE['<{blockcms}prestashop>blockcms_32c532e462a1f85b1b103ed9989a1aba'] = 'Afficher \"Propulsé par PrestaShop\"'; $_MODULE['<{blockcms}prestashop>blockcms_6e95f87c9d99340ea0945d8b528f22d1'] = 'Afficher les informations du pied de page'; $_MODULE['<{blockcms}prestashop>blockcms_38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer'; +$_MODULE['<{blockcms}prestashop>blockcms_be58fccb15fb119b8c3d485e3a8561c4'] = 'Configuration du bloc CMS'; $_MODULE['<{blockcms}prestashop>blockcms_e83c1afa1d3dbe19fa9becebb5ca8480'] = 'Modification du bloc CMS'; $_MODULE['<{blockcms}prestashop>blockcms_5aa1602194579edb6f91d7dd53eadb32'] = 'Nouveau bloc CMS'; $_MODULE['<{blockcms}prestashop>blockcms_ab278feec882a679b078490639232d69'] = 'Nom du bloc'; @@ -37,9 +38,7 @@ $_MODULE['<{blockcms}prestashop>blockcms_6ff622ab34b8eb293b440a4c98e0b7cc'] = 'I $_MODULE['<{blockcms}prestashop>blockcms_ddd7d8a072783afaf23e5e6843398fc9'] = 'Le bloc CMS a bien été ajouté'; $_MODULE['<{blockcms}prestashop>blockcms_31a22821c66edf7e3aa33ef1c8109f4c'] = 'Le bloc CMS a bien été modifié'; $_MODULE['<{blockcms}prestashop>blockcms_87a2663d841b78f01c27c0edb4f50b76'] = 'Suppression réussie'; -$_MODULE['<{blockcms}prestashop>blockcms_be58fccb15fb119b8c3d485e3a8561c4'] = 'Configuration du bloc CMS'; $_MODULE['<{blockcms}prestashop>blockcms_34c869c542dee932ef8cd96d2f91cae6'] = 'Nos magasins'; -$_MODULE['<{blockcms}prestashop>blockcms_c4c95c36570d5a8834be5e88e2f0f6b2'] = 'Informations'; $_MODULE['<{blockcms}prestashop>blockcms_d1aa22a3126f04664e0fe3f598994014'] = 'Promotions'; $_MODULE['<{blockcms}prestashop>blockcms_9ff0635f5737513b1a6f559ac2bff745'] = 'Nouveaux produits'; $_MODULE['<{blockcms}prestashop>blockcms_3cb29f0ccc5fd220a97df89dafe46290'] = 'Meilleures ventes'; diff --git a/modules/blockwishlist/translations/fr.php b/modules/blockwishlist/translations/fr.php index 641204e61..cfbcd0cab 100644 --- a/modules/blockwishlist/translations/fr.php +++ b/modules/blockwishlist/translations/fr.php @@ -54,6 +54,18 @@ $_MODULE['<{blockwishlist}prestashop>managewishlist_44749712dbec183e983dcd78a773 $_MODULE['<{blockwishlist}prestashop>managewishlist_09dc02ecbb078868a3a86dded030076d'] = 'Aucun produit'; $_MODULE['<{blockwishlist}prestashop>my-account_7ec9cceb94985909c6994e95c31c1aa8'] = 'Mes listes de cadeaux'; $_MODULE['<{blockwishlist}prestashop>my-account_723edf7c24638ed18d2fa831e647a5cc'] = 'liste cadeaux'; +$_MODULE['<{blockwishlist}prestashop>view_641254d77e7a473aa5910574f3f9453c'] = 'Liste de cadeaux'; +$_MODULE['<{blockwishlist}prestashop>view_9862d189193590487b2686b1c9043714'] = 'Autres listes de'; +$_MODULE['<{blockwishlist}prestashop>view_3d01e7d8174b6a9b088b44870714cf07'] = 'Bienvenue sur la liste de '; +$_MODULE['<{blockwishlist}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Voir'; +$_MODULE['<{blockwishlist}prestashop>view_4b7d496eedb665d0b5f589f2f874e7cb'] = 'Détail produit'; +$_MODULE['<{blockwishlist}prestashop>view_3d0d1f906e27800531e054a3b6787b7c'] = 'Quantité :'; +$_MODULE['<{blockwishlist}prestashop>view_05f32f85cccc8308d09a81e7bad3f80e'] = 'Priorité :'; +$_MODULE['<{blockwishlist}prestashop>view_655d20c1ca69519ca647684edbb2db35'] = 'Haute'; +$_MODULE['<{blockwishlist}prestashop>view_87f8a6ab85c9ced3702b4ea641ad4bb5'] = 'Moyenne'; +$_MODULE['<{blockwishlist}prestashop>view_28d0edd045e05cf5af64e35ae0c4c6ef'] = 'Basse'; +$_MODULE['<{blockwishlist}prestashop>view_2d0f6b8300be19cf35e89e66f0677f95'] = 'Ajouter au panier'; +$_MODULE['<{blockwishlist}prestashop>view_09dc02ecbb078868a3a86dded030076d'] = 'Aucun produit'; $_MODULE['<{blockwishlist}prestashop>mywishlist_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'Mon compte'; $_MODULE['<{blockwishlist}prestashop>mywishlist_7ec9cceb94985909c6994e95c31c1aa8'] = 'Mes listes'; $_MODULE['<{blockwishlist}prestashop>mywishlist_06c335f27f292a096a9bf39e3a58e97b'] = 'Nouvelle liste'; @@ -68,15 +80,3 @@ $_MODULE['<{blockwishlist}prestashop>mywishlist_4351cfebe4b61d8aa5efa1d020710005 $_MODULE['<{blockwishlist}prestashop>mywishlist_d025259319054206be54336a00defe89'] = 'Souhaitez-vous réellement supprimer cette liste ?'; $_MODULE['<{blockwishlist}prestashop>mywishlist_0b3db27bc15f682e92ff250ebb167d4b'] = 'Retour à votre compte'; $_MODULE['<{blockwishlist}prestashop>mywishlist_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil'; -$_MODULE['<{blockwishlist}prestashop>view_641254d77e7a473aa5910574f3f9453c'] = 'Liste de cadeaux'; -$_MODULE['<{blockwishlist}prestashop>view_9862d189193590487b2686b1c9043714'] = 'Autres listes de'; -$_MODULE['<{blockwishlist}prestashop>view_3d01e7d8174b6a9b088b44870714cf07'] = 'Bienvenue sur la liste de '; -$_MODULE['<{blockwishlist}prestashop>view_4351cfebe4b61d8aa5efa1d020710005'] = 'Voir'; -$_MODULE['<{blockwishlist}prestashop>view_4b7d496eedb665d0b5f589f2f874e7cb'] = 'Détail produit'; -$_MODULE['<{blockwishlist}prestashop>view_3d0d1f906e27800531e054a3b6787b7c'] = 'Quantité :'; -$_MODULE['<{blockwishlist}prestashop>view_05f32f85cccc8308d09a81e7bad3f80e'] = 'Priorité :'; -$_MODULE['<{blockwishlist}prestashop>view_655d20c1ca69519ca647684edbb2db35'] = 'Haute'; -$_MODULE['<{blockwishlist}prestashop>view_87f8a6ab85c9ced3702b4ea641ad4bb5'] = 'Moyenne'; -$_MODULE['<{blockwishlist}prestashop>view_28d0edd045e05cf5af64e35ae0c4c6ef'] = 'Basse'; -$_MODULE['<{blockwishlist}prestashop>view_2d0f6b8300be19cf35e89e66f0677f95'] = 'Ajouter au panier'; -$_MODULE['<{blockwishlist}prestashop>view_09dc02ecbb078868a3a86dded030076d'] = 'Aucun produit'; diff --git a/modules/sendtoafriend/translations/fr.php b/modules/sendtoafriend/translations/fr.php index d6c40e3e4..8cbcb1ffd 100644 --- a/modules/sendtoafriend/translations/fr.php +++ b/modules/sendtoafriend/translations/fr.php @@ -21,4 +21,3 @@ $_MODULE['<{sendtoafriend}prestashop>sendtoafriend_7ae8a9a7a5d8fa40d4515fc52f16b $_MODULE['<{sendtoafriend}prestashop>sendtoafriend_2541d938b0a58946090d7abdde0d3890'] = 'envoyer'; $_MODULE['<{sendtoafriend}prestashop>sendtoafriend_68728c1897e5936032fe21ffb6b10c2e'] = 'Retour à la fiche produit'; $_MODULE['<{sendtoafriend}prestashop>sendtoafriend_ajax_22c4733a9ceb239bf825a0cecd1cfaec'] = 'Un ami'; -$_MODULE['<{sendtoafriend}prestashop>sendtoafriend_ajax_ffa719e6b8863717a9e86579249c7d9b'] = 'vous à envoyé un lien vers'; diff --git a/modules/statsbestcategories/statsbestcategories.php b/modules/statsbestcategories/statsbestcategories.php index 4e8698414..3eecb85a4 100644 --- a/modules/statsbestcategories/statsbestcategories.php +++ b/modules/statsbestcategories/statsbestcategories.php @@ -45,7 +45,9 @@ class StatsBestCategories extends ModuleGrid $this->version = 1.0; $this->author = 'PrestaShop'; $this->need_instance = 0; - + + parent::__construct(); + $this->_defaultSortColumn = 'totalPriceSold'; $this->_defaultSortDirection = 'DESC'; $this->_emptyMessage = $this->l('Empty recordset returned'); @@ -82,8 +84,6 @@ class StatsBestCategories extends ModuleGrid ) ); - parent::__construct(); - $this->displayName = $this->l('Best categories'); $this->description = $this->l('A list of the best categories'); } diff --git a/modules/statsbestcustomers/statsbestcustomers.php b/modules/statsbestcustomers/statsbestcustomers.php index 64a6d17b2..ba1fbbc90 100644 --- a/modules/statsbestcustomers/statsbestcustomers.php +++ b/modules/statsbestcustomers/statsbestcustomers.php @@ -45,7 +45,9 @@ class StatsBestCustomers extends ModuleGrid $this->version = 1.0; $this->author = 'PrestaShop'; $this->need_instance = 0; - + + parent::__construct(); + $this->_defaultSortColumn = 'totalMoneySpent'; $this->_defaultSortDirection = 'DESC'; $this->_emptyMessage = $this->l('Empty recordset returned'); @@ -84,8 +86,6 @@ class StatsBestCustomers extends ModuleGrid 'align' => 'right') ); - parent::__construct(); - $this->displayName = $this->l('Best customers'); $this->description = $this->l('A list of the best customers'); } diff --git a/modules/statsbestmanufacturers/statsbestmanufacturers.php b/modules/statsbestmanufacturers/statsbestmanufacturers.php index 1c3f05225..f1aa8c599 100755 --- a/modules/statsbestmanufacturers/statsbestmanufacturers.php +++ b/modules/statsbestmanufacturers/statsbestmanufacturers.php @@ -45,7 +45,9 @@ class StatsBestManufacturers extends ModuleGrid $this->version = '1.0'; $this->author = 'PrestaShop'; $this->need_instance = 0; - + + parent::__construct(); + $this->_defaultSortColumn = 'sales'; $this->_defaultSortDirection = 'DESC'; $this->_emptyMessage = $this->l('Empty recordset returned'); @@ -75,8 +77,6 @@ class StatsBestManufacturers extends ModuleGrid ) ); - parent::__construct(); - $this->displayName = $this->l('Best manufacturers'); $this->description = $this->l('A list of the best manufacturers'); } diff --git a/modules/statsbestproducts/statsbestproducts.php b/modules/statsbestproducts/statsbestproducts.php index 44a18caa7..4ef4fd1d2 100644 --- a/modules/statsbestproducts/statsbestproducts.php +++ b/modules/statsbestproducts/statsbestproducts.php @@ -46,6 +46,8 @@ class StatsBestProducts extends ModuleGrid $this->author = 'PrestaShop'; $this->need_instance = 0; + parent::__construct(); + $this->_defaultSortColumn = 'totalPriceSold'; $this->_defaultSortDirection = 'DESC'; $this->_emptyMessage = $this->l('Empty recordset returned'); @@ -109,9 +111,7 @@ class StatsBestProducts extends ModuleGrid 'align' => 'right' ) ); - - parent::__construct(); - + $this->displayName = $this->l('Best products'); $this->description = $this->l('A list of the best products'); } diff --git a/modules/statsbestsuppliers/statsbestsuppliers.php b/modules/statsbestsuppliers/statsbestsuppliers.php index 2d541047c..128f5be18 100644 --- a/modules/statsbestsuppliers/statsbestsuppliers.php +++ b/modules/statsbestsuppliers/statsbestsuppliers.php @@ -46,6 +46,8 @@ class StatsBestSuppliers extends ModuleGrid $this->author = 'PrestaShop'; $this->need_instance = 0; + parent::__construct(); + $this->_defaultSortColumn = 'sales'; $this->_defaultSortDirection = 'DESC'; $this->_emptyMessage = $this->l('Empty recordset returned'); @@ -75,8 +77,6 @@ class StatsBestSuppliers extends ModuleGrid ) ); - parent::__construct(); - $this->displayName = $this->l('Best suppliers'); $this->description = $this->l('A list of the best suppliers'); } diff --git a/modules/statsbestvouchers/statsbestvouchers.php b/modules/statsbestvouchers/statsbestvouchers.php index 5cecfa9c5..47e4a352a 100644 --- a/modules/statsbestvouchers/statsbestvouchers.php +++ b/modules/statsbestvouchers/statsbestvouchers.php @@ -45,7 +45,9 @@ class StatsBestVouchers extends ModuleGrid $this->version = 1.0; $this->author = 'PrestaShop'; $this->need_instance = 0; - + + parent::__construct(); + $this->_defaultSortColumn = 'ca'; $this->_defaultSortDirection = 'DESC'; $this->_emptyMessage = $this->l('Empty recordset returned'); @@ -75,8 +77,6 @@ class StatsBestVouchers extends ModuleGrid ) ); - parent::__construct(); - $this->displayName = $this->l('Best vouchers'); $this->description = $this->l('A list of the best vouchers'); }