From 31697fde3ce6c51196f261810a48eb3870e384bb Mon Sep 17 00:00:00 2001 From: Fabio Chelly Date: Mon, 23 Sep 2013 11:24:14 +0200 Subject: [PATCH] [-] MO productcomments: confirmation message takes moderation mode into account --- modules/productcomments/js/productcomments.js | 2 +- modules/productcomments/productcomments.php | 3 ++- themes/default/modules/productcomments/productcomments.tpl | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/productcomments/js/productcomments.js b/modules/productcomments/js/productcomments.js index daebc3d0b..dec24c678 100644 --- a/modules/productcomments/js/productcomments.js +++ b/modules/productcomments/js/productcomments.js @@ -70,7 +70,7 @@ $(function() { $.fancybox.close(); var buttons = {}; buttons[productcomment_ok] = "productcommentRefreshPage"; - fancyChooseBox(productcomment_added, productcomment_title, buttons); + fancyChooseBox(moderation_active ? productcomment_added_moderation : productcomment_added, productcomment_title, buttons); } else { diff --git a/modules/productcomments/productcomments.php b/modules/productcomments/productcomments.php index eab62c58d..95e87fe61 100644 --- a/modules/productcomments/productcomments.php +++ b/modules/productcomments/productcomments.php @@ -755,7 +755,8 @@ class ProductComments extends Module 'mediumSize' => Image::getSize(ImageType::getFormatedName('medium')), 'nbComments' => (int)ProductComment::getCommentNumber((int)Tools::getValue('id_product')), 'productcomments_controller_url' => $this->context->link->getModuleLink('productcomments'), - 'productcomments_url_rewriting_activated' => Configuration::get('PS_REWRITING_SETTINGS', 0) + 'productcomments_url_rewriting_activated' => Configuration::get('PS_REWRITING_SETTINGS', 0), + 'moderation_active' => (int)Configuration::get('PRODUCT_COMMENTS_MODERATE') )); $this->context->controller->pagination((int)ProductComment::getCommentNumber((int)Tools::getValue('id_product'))); diff --git a/themes/default/modules/productcomments/productcomments.tpl b/themes/default/modules/productcomments/productcomments.tpl index 7b3821a27..3cb407777 100644 --- a/themes/default/modules/productcomments/productcomments.tpl +++ b/themes/default/modules/productcomments/productcomments.tpl @@ -27,9 +27,11 @@ var productcomments_controller_url = '{$productcomments_controller_url}'; var confirm_report_message = "{l s='Are you sure you want report this comment?' mod='productcomments'}"; var secure_key = "{$secure_key}"; var productcomments_url_rewrite = '{$productcomments_url_rewriting_activated}'; -var productcomment_added = '{l s='Your comment has been added !' mod='productcomments'}'; +var productcomment_added = '{l s='Your comment has been added!' mod='productcomments'}'; +var productcomment_added_moderation = '{l s='Your comment has been added and will be available once approved by a moderator' mod='productcomments'}'; var productcomment_title = '{l s='New comment' mod='productcomments'}'; var productcomment_ok = '{l s='OK' mod='productcomments'}'; +var moderation_active = {$moderation_active};