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 @@ + tal:condition="python: filter != 'published' and moderation_enabled">Approve @@ -122,7 +122,7 @@ - Publishing the comment makes it visible to other users. + Approving the comment makes it visible to other users. Publish + i18n:translate="">Approve Review comments