diff --git a/modules/comment/comment.module b/modules/comment/comment.module index ef4f0ee39296a4909f92a52ae342f0d924b85e3f..df966be921e2745fa2f9b00110b4e1fae3fc4d70 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -106,7 +106,7 @@ function comment_help($path, $arg) { return '
' . 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.") . '
'; case 'admin/content/comment/approval': - return '' . 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.") . '
'; + return '' . t("Below is a list of the unapproved comments posted to your site. To approve comments, select them with the checkbox, choose Publish the selected comments from Update options and click the Update button. To delete them, choose Delete the selected comments instead. Use edit to individually modify a comment's content.") . '
'; } } @@ -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 4a3d08736994512e6a1e673da67ac5cf04e9f473..fdfd54dbb73535a415d538f5b5478a828fee8427 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);