ajung/plone.app.discussion
ajung
/
plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename 'publish comment' to 'approve comment'. This fixes #1608470. 

svn path=/plone.app.discussion/trunk/; revision=35342
This commit is contained in:
Timo Stollenwerk 2010-03-19 09:58:35 +00:00
parent 437094d951
commit 5ce942d1d2
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -4,6 +4,9 @@ Changelog
1.0b4 (unreleased) 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. * Show a warning in the moderation view if the moderation workflow is disabled.
[timo] [timo]

4
plone/app/discussion/browser/moderation.pt
View File

@ -59,7 +59,7 @@
<option selected="selected" value="-1" i18n:translate="title_bulkactions">Bulk Actions</option> <option selected="selected" value="-1" i18n:translate="title_bulkactions">Bulk Actions</option>
<option value="publish" <option value="publish"
i18n:translate="bulkactions_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> <option value="delete" i18n:translate="bulkactions_delete">Delete</option>
</select> </select>
<input type="hidden" name="form.button.Filter" tal:attributes="value filter" value="" /> <input type="hidden" name="form.button.Filter" tal:attributes="value filter" value="" />
@ -122,7 +122,7 @@
<input id="" <input id=""
class="context comment-publish-button" class="context comment-publish-button"
type="submit" type="submit"
value="Publish" value="Approve"
name="form.button.Publish" name="form.button.Publish"
i18n:attributes="value label_publish;" i18n:attributes="value label_publish;"
tal:attributes="id item/id" tal:attributes="id item/id"

2
plone/app/discussion/browser/moderation.py
View File

@ -105,7 +105,7 @@ class PublishComment(BrowserView):
catalog.reindexObject(comment) catalog.reindexObject(comment)
IStatusMessage(self.context.REQUEST).addStatusMessage( IStatusMessage(self.context.REQUEST).addStatusMessage(
_("Comment published."), _("Comment approved."),
type="info") type="info")
return self.context.REQUEST.RESPONSE.redirect(self.context.REQUEST.HTTP_REFERER) return self.context.REQUEST.RESPONSE.redirect(self.context.REQUEST.HTTP_REFERER)

6
plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
View File

@ -55,16 +55,16 @@
</state> </state>
<transition transition_id="publish" new_state="published" <transition transition_id="publish" new_state="published"
title="Reviewer publishes content" title="Reviewer approves content"
trigger="USER" trigger="USER"
before_script="" after_script="" before_script="" after_script=""
i18n:attributes="title"> i18n:attributes="title">
<description i18n:translate=""> <description i18n:translate="">
Publishing the comment makes it visible to other users. Approving the comment makes it visible to other users.
</description> </description>
<action url="%(content_url)s/content_status_modify?workflow_action=publish" <action url="%(content_url)s/content_status_modify?workflow_action=publish"
category="workflow" category="workflow"
i18n:translate="">Publish</action> i18n:translate="">Approve</action>
<guard> <guard>
<guard-permission>Review comments</guard-permission> <guard-permission>Review comments</guard-permission>
</guard> </guard>