Skip to content

Commit

Permalink
Merge pull request #16 from bibich/fix-asset
Browse files Browse the repository at this point in the history
Fixed asset use
  • Loading branch information
bibich committed Feb 29, 2016
2 parents 121d6b8 + 836d45c commit 20029f9
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 21 deletions.
Empty file modified I18n/backOffice/default/en_US.php
100644 → 100755
Empty file.
1 change: 1 addition & 0 deletions I18n/backOffice/default/fr_FR.php
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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 :',
Expand Down
Empty file modified I18n/email/default/en_US.php
100644 → 100755
Empty file.
20 changes: 11 additions & 9 deletions I18n/email/default/fr_FR.php
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<?php

return array(
'Notify store admin of new comment' => '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 : ',
);
6 changes: 6 additions & 0 deletions I18n/fr_FR.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Empty file modified I18n/frontOffice/default/en_US.php
100644 → 100755
Empty file.
3 changes: 2 additions & 1 deletion I18n/frontOffice/default/fr_FR.php
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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 :',
);
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
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
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

Expand All @@ -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
Expand Down Expand Up @@ -92,5 +92,3 @@ Ratings are stored in the meta_data table. to retrieve the rating, you can use t
</span>
{/if}
```


4 changes: 2 additions & 2 deletions templates/backOffice/default/comments.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<script src="{$asset_url}"></script>
{/javascripts}

{javascripts file='assets/js/comment.js'}
{javascripts file='assets/js/comment.js' source='Comment'}
<script src="{$asset_url}"></script>
{/javascripts}
{/block}
{/block}
4 changes: 2 additions & 2 deletions templates/frontOffice/default/comment.html
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@
{$rating={meta meta="COMMENT_RATING" key="{$definition->getRef()}" id="{$definition->getRefId()}"}}
{if $rating}
<span class="pull-right">
rating: {comment_stars value=$rating}
{intl d="comment.fo.default" l="rating:"} {comment_stars value=$rating}
</span>
{/if}
{/if}
</div>

<div id="comment-list" class="comment-list"></div>
</div>
</div>
</div>

0 comments on commit 20029f9

Please sign in to comment.