From 911347802cd6aca692a83375bab5f8fc82f330f4 Mon Sep 17 00:00:00 2001 From: Julien Chanseaume Date: Thu, 25 Feb 2016 09:10:45 +0100 Subject: [PATCH 1/3] Updated Readme --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c1298ce..0795fc1 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,13 @@ The module **Comment** allows customer to add comments on different elements of the website : product, content, ... A comment is composed of a : - -- title + +- title - message - rating - is related to a customer -The message can be moderated by a administrator before being displayed on the website (recommended). +The message can be moderated by a administrator before being displayed on the website (recommended). Only registered and logged in customer can post comment on the website. You can also only authorized customers to post comment on products that they have bought. Customers will receive an email after 15 days (by default) to encourage them @@ -17,7 +17,7 @@ to post comment. If the comment has been accepted the customer can edit or delete it. -This module is compatible with Thelia version 2.1 or greater. +This module is compatible with Thelia version 2.1 or greater. ## Installation @@ -31,7 +31,7 @@ This module is compatible with Thelia version 2.1 or greater. Add it in your main thelia composer.json file ``` -composer require your-vendor/comment-module:~1.0 +composer require thelia/comment-module:~1.0 ``` ## Usage @@ -92,5 +92,3 @@ Ratings are stored in the meta_data table. to retrieve the rating, you can use t {/if} ``` - - From 49eae0ccae2d2022ca807d07d3bc3c641e7cc0cc Mon Sep 17 00:00:00 2001 From: Julien Chanseaume Date: Thu, 25 Feb 2016 09:11:07 +0100 Subject: [PATCH 2/3] Fixed asset issue --- templates/backOffice/default/comments.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/backOffice/default/comments.html b/templates/backOffice/default/comments.html index 80f03fa..281f636 100644 --- a/templates/backOffice/default/comments.html +++ b/templates/backOffice/default/comments.html @@ -35,7 +35,7 @@ {/javascripts} - {javascripts file='assets/js/comment.js'} + {javascripts file='assets/js/comment.js' source='Comment'} {/javascripts} -{/block} \ No newline at end of file +{/block} From 836d45c46191de94ca2f1c0e254de9ae93984ccf Mon Sep 17 00:00:00 2001 From: Julien Chanseaume Date: Thu, 25 Feb 2016 09:11:39 +0100 Subject: [PATCH 3/3] Fixed translations --- I18n/backOffice/default/en_US.php | 0 I18n/backOffice/default/fr_FR.php | 1 + I18n/email/default/en_US.php | 0 I18n/email/default/fr_FR.php | 20 +++++++++++--------- I18n/fr_FR.php | 6 ++++++ I18n/frontOffice/default/en_US.php | 0 I18n/frontOffice/default/fr_FR.php | 3 ++- templates/frontOffice/default/comment.html | 4 ++-- 8 files changed, 22 insertions(+), 12 deletions(-) mode change 100644 => 100755 I18n/backOffice/default/en_US.php mode change 100644 => 100755 I18n/backOffice/default/fr_FR.php mode change 100644 => 100755 I18n/email/default/en_US.php mode change 100644 => 100755 I18n/email/default/fr_FR.php mode change 100644 => 100755 I18n/frontOffice/default/en_US.php mode change 100644 => 100755 I18n/frontOffice/default/fr_FR.php diff --git a/I18n/backOffice/default/en_US.php b/I18n/backOffice/default/en_US.php old mode 100644 new mode 100755 diff --git a/I18n/backOffice/default/fr_FR.php b/I18n/backOffice/default/fr_FR.php old mode 100644 new mode 100755 index 2efa385..b48f4c6 --- a/I18n/backOffice/default/fr_FR.php +++ b/I18n/backOffice/default/fr_FR.php @@ -39,6 +39,7 @@ 'Reference' => 'Référence', 'Refused' => 'Refusé', 'Save' => 'Enregistrer', + 'Send email to customer' => 'Envoyer un email au client', 'Sorry, comment ID=%id was not found.' => 'Désolé, le commentaire ID=%id n\'a pas été trouvé.', 'Status' => 'Statut', 'Status :' => 'Statut :', diff --git a/I18n/email/default/en_US.php b/I18n/email/default/en_US.php old mode 100644 new mode 100755 diff --git a/I18n/email/default/fr_FR.php b/I18n/email/default/fr_FR.php old mode 100644 new mode 100755 index 21bfe3d..187e057 --- a/I18n/email/default/fr_FR.php +++ b/I18n/email/default/fr_FR.php @@ -1,14 +1,16 @@ 'Notification d\'un nouveau commentaire à l\'administrateur de la boutique.', - 'New comment on %ref_type_title "%ref_title"' => 'Nouveau commentaire sur %ref_type_title "%ref_title"', - 'We inform you that a new customer comment has been posted for the %ref_type_title "%ref_title"' - => 'Nous vous informons qu\'un nouveau commentaire client a été posté sur %ref_type_title "%ref_title"', + 'Best Regards.' => 'Cordialement.', + 'Content: ' => 'Contenu: ', + 'Dear' => 'Bonjour', + 'Feel free to contact us for any further information' => 'N\'hésitez pas à nous contacter pour tout autre question.', + 'It would be great to share your thoughts on products with other customers.' => 'Il serait formidable de partager vos avis sur les produits avec d\'autres clients.', 'Rating: ' => 'Note: ', + 'Thank you for your order on our online store %store_name' => 'Merci pour votre commande sur notre boutique en ligne %store_name', 'Title: ' => 'Titre: ', - 'Content: ' => 'Contenu: ', - 'You can now activate this comment by going to the comment management interface: %comment_management_link' - => 'Vous pouvez dores et déjà activer ce commentaire en vous rendant dans l\'interface de gestion des avis: %comment_management_link', - 'You can now activate this comment by going to the comment management interface.' - => 'Vous pouvez dores et déjà activer ce commentaire en vous rendant dans l\'interface de gestion des avis.', + 'We inform you that a new customer comment has been posted for the %ref_type_title "%ref_title"' => 'Nous vous informons qu\'un nouveau commentaire client a été posté sur %ref_type_title "%ref_title"', + 'You can now activate this comment by going to the comment management interface.' => 'Vous pouvez dores et déjà activer ce commentaire en vous rendant dans l\'interface de gestion des avis.', + 'You can now activate this comment by going to the comment management interface: %comment_management_link' => 'Vous pouvez dores et déjà activer ce commentaire en vous rendant dans l\'interface de gestion des avis: %comment_management_link', + 'You can post comments on this products: ' => 'Vous pouvez laisser un commentaire sur les produits suivants : ', ); diff --git a/I18n/fr_FR.php b/I18n/fr_FR.php index cf135ec..4add2ca 100755 --- a/I18n/fr_FR.php +++ b/I18n/fr_FR.php @@ -18,18 +18,24 @@ 'Locale' => 'Langue', 'Missing parameters' => 'Paramètres manquants', 'Moderate' => 'Modération', + 'New comment on %ref_type_title "%ref_title"' => 'Nouveau commentaire pour %ref_type_title "%ref_title" ', + 'Notify store admin of new comment' => 'Notifier l\'administrateur de nouveaux commentaires', 'Notify store managers on new comment' => 'Notifier les administrateurs de la boutique des nouveaux commentaires', 'Only customer' => 'Seuls les clients', 'Only customer are allowed to publish comment' => 'Seul les clients sont autorisés à publier des commentaires', 'Only customers who have bought this product can publish comment' => 'Seuls les clients ayant achetés ce produit peuvent publier des commentaires', 'Only registered customers can post comments.' => 'Seuls les clients enregistrés peuvent publier des commentaires.', 'Only verified' => 'Uniquement vérifié', + 'Product' => 'Produit', 'Product %id does not exist' => 'Le produit %id n\'existe pas', 'Rating' => 'Note', 'Ref' => 'Réf', 'Ref Id' => 'Réf id', 'Reference %ref is not allowed' => 'La référence %ref n\'est pas autorisée', 'Reference not found' => 'Référence inconnue', + 'Request customer' => 'Relance client', + 'Request customer comment' => 'Demande commentaire client', + 'Send an email to request customer comments, x days after a paid order (0 = no request sent).' => 'Envoyer un email au client pour demander un avis, x jours après une commande payée (0 = aucune relance)', 'Send an email to the store managers when a new comment is posted.' => 'Envoyer un email aux administrateurs de la boutique lorsqu\'un nouveau commentaire est posté.', 'Sorry, an unknown error occurred. Please try again.' => 'Désolé, une erreur non gérée est apparue. Veuillez ré-essayer.', 'Status' => 'Statut', diff --git a/I18n/frontOffice/default/en_US.php b/I18n/frontOffice/default/en_US.php old mode 100644 new mode 100755 diff --git a/I18n/frontOffice/default/fr_FR.php b/I18n/frontOffice/default/fr_FR.php old mode 100644 new mode 100755 index 3e08460..cd50f53 --- a/I18n/frontOffice/default/fr_FR.php +++ b/I18n/frontOffice/default/fr_FR.php @@ -8,9 +8,10 @@ 'Comments' => 'Les commentaires', 'Delete' => 'Supprimer', 'Load more comments...' => 'Montrer plus de commentaires...', - 'Mark as inappropriate' => 'Marquer comme inaproprié', + 'Mark as inappropriate' => 'Marquer comme inapproprié', 'No more comments' => 'Plus de commentaire', 'Send' => 'Envoyer', 'There are no comments yet' => 'Il n\'y a pas encore de commentaire', 'Verified' => 'Vérifié', + 'rating:' => 'note :', ); diff --git a/templates/frontOffice/default/comment.html b/templates/frontOffice/default/comment.html index 1c31f73..8fa2c16 100644 --- a/templates/frontOffice/default/comment.html +++ b/templates/frontOffice/default/comment.html @@ -117,7 +117,7 @@ {$rating={meta meta="COMMENT_RATING" key="{$definition->getRef()}" id="{$definition->getRefId()}"}} {if $rating} - rating: {comment_stars value=$rating} + {intl d="comment.fo.default" l="rating:"} {comment_stars value=$rating} {/if} {/if} @@ -125,4 +125,4 @@
- \ No newline at end of file +