summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2009-01-14 21:48:24 +0000
committerDries Buytaert2009-01-14 21:48:24 +0000
commit8d128023efc5974331822f0a916880140cd663ef (patch)
tree9b198ef2e9e8d2b32e5ace9600458b7f608cc098
parentd3df2ff356b0b5802e406de32bbe8727af3128b5 (diff)
- Patch #201490 by lilou, keith.smith: fixed inconsistencies in the moderation queue related help texts.7.0-unstable-4
-rw-r--r--modules/comment/comment.module6
-rw-r--r--modules/comment/comment.test4
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index ef4f0ee..df966be 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -106,7 +106,7 @@ function comment_help($path, $arg) {
return '<p>' . t("Below is a list of the latest comments posted to your site. Click on a subject to see the comment, the author's name to edit the author's user information, 'edit' to modify the text, and 'delete' to remove their submission.") . '</p>';
case 'admin/content/comment/approval':
- return '<p>' . t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on 'edit' and then change its 'moderation status' to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, 'edit' to modify the text, and 'delete' to remove their submission.") . '</p>';
+ return '<p>' . t("Below is a list of the unapproved comments posted to your site. To approve comments, select them with the checkbox, choose <em>Publish the selected comments</em> from <em>Update options</em> and click the <em>Update</em> button. To delete them, choose <em>Delete the selected comments</em> instead. Use <em>edit</em> to individually modify a comment's content.") . '</p>';
}
}
@@ -166,7 +166,7 @@ function comment_theme() {
function comment_menu() {
$items['admin/content/comment'] = array(
'title' => 'Comments',
- 'description' => 'List and edit site comments and the comment moderation queue.',
+ 'description' => 'List and edit site comments and the comment approval queue.',
'page callback' => 'comment_admin',
'access arguments' => array('administer comments'),
);
@@ -879,7 +879,7 @@ function comment_save($edit) {
// redirect the user to the node he's commenting on.
if ($edit['status'] == COMMENT_NOT_PUBLISHED) {
if (!user_access('administer comments')) {
- drupal_set_message(t('Your comment has been queued for moderation by site administrators and will be published after approval.'));
+ drupal_set_message(t('Your comment has been queued for review by site administrators and will be published after approval.'));
}
}
else {
diff --git a/modules/comment/comment.test b/modules/comment/comment.test
index 4a3d087..fdfd54d 100644
--- a/modules/comment/comment.test
+++ b/modules/comment/comment.test
@@ -492,7 +492,7 @@ class CommentApprovalTest extends CommentHelperCase {
$subject = $this->randomName();
$body = $this->randomName();
$this->postComment($this->node, $subject, $body, TRUE, TRUE); // Set $contact to true so that it won't check for id and message.
- $this->assertText(t('Your comment has been queued for moderation by site administrators and will be published after approval.'), t('Comment requires approval.'));
+ $this->assertText(t('Your comment has been queued for review by site administrators and will be published after approval.'), t('Comment requires approval.'));
// Get unapproved comment id.
$this->drupalLogin($this->admin_user);
@@ -526,7 +526,7 @@ class CommentApprovalTest extends CommentHelperCase {
$subject = $this->randomName();
$body = $this->randomName();
$this->postComment($this->node, $subject, $body, TRUE, TRUE); // Set $contact to true so that it won't check for id and message.
- $this->assertText(t('Your comment has been queued for moderation by site administrators and will be published after approval.'), t('Comment requires approval.'));
+ $this->assertText(t('Your comment has been queued for review by site administrators and will be published after approval.'), t('Comment requires approval.'));
// Get unapproved comment id.
$this->drupalLogin($this->admin_user);