From 5ce942d1d2d54eda71e111f1219b47c9177fe12a Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Fri, 19 Mar 2010 09:58:35 +0000
Subject: [PATCH] Rename 'publish comment' to 'approve comment'. This fixes
 #1608470.

svn path=/plone.app.discussion/trunk/; revision=35342
---
 CHANGES.txt                                                 | 3 +++
 plone/app/discussion/browser/moderation.pt                  | 4 ++--
 plone/app/discussion/browser/moderation.py                  | 2 +-
 .../workflows/comment_review_workflow/definition.xml        | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a3e36b3..0d71240 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Changelog
 1.0b4 (unreleased)
 ------------------
 
+* Rename 'publish comment' to 'approve comment'. This fixes #1608470.
+  [timo]
+  
 * Show a warning in the moderation view if the moderation workflow is disabled.
   [timo]
 
diff --git a/plone/app/discussion/browser/moderation.pt b/plone/app/discussion/browser/moderation.pt
index 8dbdd99..675d581 100644
--- a/plone/app/discussion/browser/moderation.pt
+++ b/plone/app/discussion/browser/moderation.pt
@@ -59,7 +59,7 @@
                                     <option selected="selected" value="-1" i18n:translate="title_bulkactions">Bulk Actions</option>
                                     <option value="publish"
                                             i18n:translate="bulkactions_publish"
-                                            tal:condition="python: filter != 'published' and moderation_enabled">Publish</option>
+                                            tal:condition="python: filter != 'published' and moderation_enabled">Approve</option>
                                     <option value="delete" i18n:translate="bulkactions_delete">Delete</option>
                                 </select>
                                 <input type="hidden" name="form.button.Filter" tal:attributes="value filter" value="" />
@@ -122,7 +122,7 @@
                                     <input id=""
                                            class="context comment-publish-button"
                                            type="submit"
-                                           value="Publish"
+                                           value="Approve"
                                            name="form.button.Publish"
                                            i18n:attributes="value label_publish;"
                                            tal:attributes="id item/id"
diff --git a/plone/app/discussion/browser/moderation.py b/plone/app/discussion/browser/moderation.py
index 216254b..27cc767 100644
--- a/plone/app/discussion/browser/moderation.py
+++ b/plone/app/discussion/browser/moderation.py
@@ -105,7 +105,7 @@ class PublishComment(BrowserView):
         catalog.reindexObject(comment)
 
         IStatusMessage(self.context.REQUEST).addStatusMessage(
-            _("Comment published."),
+            _("Comment approved."),
             type="info")
 
         return self.context.REQUEST.RESPONSE.redirect(self.context.REQUEST.HTTP_REFERER)
diff --git a/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml b/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
index a53fe39..a118277 100644
--- a/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
+++ b/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
@@ -55,16 +55,16 @@
  </state>
 
  <transition transition_id="publish" new_state="published"
-             title="Reviewer publishes content"
+             title="Reviewer approves content"
              trigger="USER"
              before_script="" after_script=""
              i18n:attributes="title">
   <description i18n:translate="">
-    Publishing the comment makes it visible to other users.
+    Approving the comment makes it visible to other users.
   </description>
   <action url="%(content_url)s/content_status_modify?workflow_action=publish"
           category="workflow"
-          i18n:translate="">Publish</action>
+          i18n:translate="">Approve</action>
   <guard>
    <guard-permission>Review comments</guard-permission>
   </guard>