' . 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 indivdually 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'), ); @@ -820,7 +820,7 @@ function comment_save($edit) { // Explain the approval queue if necessary, and then // redirect the user to the node he's commenting on. if ($edit['status'] == COMMENT_NOT_PUBLISHED) { - 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 { drupal_set_message(t('Your comment has been posted.')); Index: modules/comment/comment.test =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v retrieving revision 1.18 diff -u -p -r1.18 comment.test --- modules/comment/comment.test 21 Nov 2008 14:48:59 -0000 1.18 +++ modules/comment/comment.test 22 Nov 2008 16:53:53 -0000 @@ -511,7 +511,7 @@ class CommentApprovalTest extends Commen $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); @@ -545,9 +545,9 @@ class CommentApprovalTest extends Commen $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 unaproved comment id. + // Get unapproved comment id. $this->drupalLogin($this->admin_user); $anonymous_comment4 = $this->getUnapprovedComment($subject); $anonymous_comment4 = (object) array('id' => $anonymous_comment4, 'subject' => $subject, 'comment' => $body);