diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index cb84bad..e817146 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -72,8 +72,8 @@ function comment_help($route_name, RouteMatchInterface $route_match) { $output .= '
' . t('Comment functionality can be enabled for any entity sub-type (for example, a content type). On the Manage fields page for each entity sub-type, you can enable commenting by adding a Comments field. The entity sub-types each have their own default comment settings configured as: Open to allow new comments, Closed to view existing comments, but prevent new comments, or Hidden to hide existing comments and prevent new comments.', array('!content-type' => \Drupal::url('node.overview_types'), '!entity-help' => \Drupal::url('help.page', array('name' => 'entity')))) . '
'; $output .= '
' . t('Overriding default settings') . '
'; $output .= '
' . t('When you create an entity item, you can override the default comment settings. Changing the entity sub-type defaults will not affect existing entity items, whether they used the default settings or had overrides.') . '
'; - $output .= '
' . t('Approving and managing comments') . '
'; - $output .= '
' . t('Comments from users who have the Skip comment approval permission are published immediately. All other comments are placed in the Unpublished comments queue, until a user who has permission to Administer comments and comment settings publishes or deletes them. Published comments can be bulk managed on the Published comments administration page. When a comment has no replies, it remains editable by its author, as long as the author has Edit own comments permission.', array('!comment-approval' => \Drupal::url('comment.admin_unpublished'), '!admin-comment' => \Drupal::url('comment.admin'))) . '
'; + $output .= '
' . t('Publishing and managing comments') . '
'; + $output .= '
' . t('Comments from users who have the Skip comment approval permission are published immediately. All other comments are placed in the Unpublished comments queue, until a user who has permission to Administer comments and comment settings publishes or deletes them. Published comments can be bulk managed on the Published comments administration page. When a comment has no replies, it remains editable by its author, as long as the author has Edit own comments permission.', array('!unpublished-comments' => \Drupal::url('comment.admin_unpublished'), '!admin-comment' => \Drupal::url('comment.admin'))) . '
'; $output .= ''; return $output; diff --git a/core/modules/comment/src/CommentViewsData.php b/core/modules/comment/src/CommentViewsData.php index 2a7083c..2a1446d 100644 --- a/core/modules/comment/src/CommentViewsData.php +++ b/core/modules/comment/src/CommentViewsData.php @@ -100,12 +100,12 @@ public function getViewsData() { ), ); - $data['comment_field_data']['status']['title'] = t('Approved status'); - $data['comment_field_data']['status']['help'] = t('Whether the comment is approved (or still in the moderation queue).'); + $data['comment_field_data']['status']['title'] = t('Published status'); + $data['comment_field_data']['status']['help'] = t('Whether the comment is published (or still in the moderation queue).'); $data['comment_field_data']['status']['field']['output formats'] = array( - 'approved-not-approved' => array(t('Approved'), t('Not Approved')), + 'published-unpublished' => array(t('Published'), t('Not Published')), ); - $data['comment_field_data']['status']['filter']['label'] = t('Approved comment status'); + $data['comment_field_data']['status']['filter']['label'] = t('Published comment status'); $data['comment_field_data']['status']['filter']['type'] = 'yes-no'; $data['comment']['view_comment'] = array( @@ -132,11 +132,11 @@ public function getViewsData() { ), ); - $data['comment']['approve_comment'] = array( + $data['comment']['publish_comment'] = array( 'field' => array( - 'title' => t('Link to approve comment'), - 'help' => t('Provide a simple link to approve the comment.'), - 'id' => 'comment_link_approve', + 'title' => t('Link to publish comment'), + 'help' => t('Provide a simple link to publish the comment.'), + 'id' => 'comment_link_publish', ), ); diff --git a/core/modules/comment/src/Tests/CommentAdminTest.php b/core/modules/comment/src/Tests/CommentAdminTest.php index db6b769..02b76e3 100644 --- a/core/modules/comment/src/Tests/CommentAdminTest.php +++ b/core/modules/comment/src/Tests/CommentAdminTest.php @@ -133,9 +133,9 @@ function testApprovalNodeInterface() { // Publish comment. $this->drupalLogin($this->admin_user); $this->drupalGet('comment/1/publish'); - $this->assertResponse(403, 'Forged comment approval was denied.'); + $this->assertResponse(403, 'Forged comment publish request was denied.'); $this->drupalGet('comment/1/publish', array('query' => array('token' => 'forged'))); - $this->assertResponse(403, 'Forged comment approval was denied.'); + $this->assertResponse(403, 'Forged comment publish request was denied.'); $this->drupalGet('comment/1/edit'); $this->assertFieldChecked('edit-status-0'); $this->drupalGet('node/' . $this->node->id());