diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 20ba4a3..02e057d 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -66,15 +66,15 @@ function comment_help($route_name, RouteMatchInterface $route_match) {
switch ($route_name) {
case 'help.page.comment':
$output = '' . t('About') . '
';
- $output .= '' . t('The Comment module allows users to comment on site content, set commenting defaults and permissions, and moderate comments. For more information, see the online documentation for the Comment module.', array('!comment' => 'https://www.drupal.org/documentation/modules/comment')) . '
';
+ $output .= '' . t('The Comment module allows users to comment on site content, set commenting defaults and permissions, and moderate comments. For more information, see the online documentation for the Comment module.', array('@comment' => 'https://www.drupal.org/documentation/modules/comment')) . '
';
$output .= '' . t('Uses') . '
';
$output .= '';
$output .= '- ' . t('Enabling commenting and configuring defaults') . '
';
- $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. For background information about entities, see the Field module help page.', array('!content-type' => (\Drupal::moduleHandler()->moduleExists('node')) ? \Drupal::url('entity.node_type.collection') : '#', '!field' => \Drupal::url('help.page', array('name' => 'field')))) . '
';
+ $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. For background information about entities, see the Field module help page.', array('@content-type' => (\Drupal::moduleHandler()->moduleExists('node')) ? \Drupal::url('entity.node_type.collection') : '#', '@field' => \Drupal::url('help.page', array('name' => 'field')))) . '
';
$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 Unapproved 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_approval'), '!admin-comment' => \Drupal::url('comment.admin'))) . '
';
+ $output .= '- ' . t('Comments from users who have the Skip comment approval permission are published immediately. All other comments are placed in the Unapproved 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_approval'), '@admin-comment' => \Drupal::url('comment.admin'))) . '
';
$output .= '
';
return $output;
@@ -713,8 +713,8 @@ function template_preprocess_comment(&$variables) {
$permalink_uri_parent->setOption('attributes', $attributes);
$variables['parent_title'] = \Drupal::l($comment_parent->getSubject(), $permalink_uri_parent);
$variables['parent_permalink'] = \Drupal::l(t('Parent permalink'), $permalink_uri_parent);
- $variables['parent'] = t('In reply to !parent_title by !parent_username',
- array('!parent_username' => $variables['parent_author'], '!parent_title' => $variables['parent_title']));
+ $variables['parent'] = t('In reply to @parent_title by @parent_username',
+ array('@parent_username' => $variables['parent_author'], '@parent_title' => $variables['parent_title']));
}
else {
$variables['parent_comment'] = '';
diff --git a/core/modules/comment/src/Tests/CommentFieldAccessTest.php b/core/modules/comment/src/Tests/CommentFieldAccessTest.php
index ba1c0d3..ca3fbf0 100644
--- a/core/modules/comment/src/Tests/CommentFieldAccessTest.php
+++ b/core/modules/comment/src/Tests/CommentFieldAccessTest.php
@@ -213,17 +213,17 @@ public function testAccessToAdministrativeFields() {
foreach ($permutations as $set) {
$may_view = $set['comment']->{$field}->access('view', $set['user']);
$may_update = $set['comment']->{$field}->access('edit', $set['user']);
- $this->assertEqual($may_view, $set['user']->hasPermission('administer comments') || ($set['comment']->isPublished() && $set['user']->hasPermission('access comments')), SafeMarkup::format('User @user !state view field !field on comment @comment', [
+ $this->assertEqual($may_view, $set['user']->hasPermission('administer comments') || ($set['comment']->isPublished() && $set['user']->hasPermission('access comments')), SafeMarkup::format('User @user @state view field @field on comment @comment', [
'@user' => $set['user']->getUsername(),
- '!state' => $may_update ? 'can' : 'cannot',
+ '@state' => $may_update ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
- '!field' => $field,
+ '@field' => $field,
]));
- $this->assertEqual($may_update, $set['user']->hasPermission('administer comments'), SafeMarkup::format('User @user !state update field !field on comment @comment', [
+ $this->assertEqual($may_update, $set['user']->hasPermission('administer comments'), SafeMarkup::format('User @user @state update field @field on comment @comment', [
'@user' => $set['user']->getUsername(),
- '!state' => $may_update ? 'can' : 'cannot',
+ '@state' => $may_update ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
- '!field' => $field,
+ '@field' => $field,
]));
}
}
@@ -231,9 +231,9 @@ public function testAccessToAdministrativeFields() {
// Check access to normal field.
foreach ($permutations as $set) {
$may_update = $set['comment']->access('update', $set['user']) && $set['comment']->subject->access('edit', $set['user']);
- $this->assertEqual($may_update, $set['user']->hasPermission('administer comments') || ($set['user']->hasPermission('edit own comments') && $set['user']->id() == $set['comment']->getOwnerId()), SafeMarkup::format('User @user !state update field subject on comment @comment', [
+ $this->assertEqual($may_update, $set['user']->hasPermission('administer comments') || ($set['user']->hasPermission('edit own comments') && $set['user']->id() == $set['comment']->getOwnerId()), SafeMarkup::format('User @user @state update field subject on comment @comment', [
'@user' => $set['user']->getUsername(),
- '!state' => $may_update ? 'can' : 'cannot',
+ '@state' => $may_update ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
]));
}
@@ -245,17 +245,17 @@ public function testAccessToAdministrativeFields() {
$may_view = $set['comment']->{$field}->access('view', $set['user']);
$may_update = $set['comment']->{$field}->access('edit', $set['user']);
$this->assertEqual($may_view, $field != 'hostname' && ($set['user']->hasPermission('administer comments') ||
- ($set['comment']->isPublished() && $set['user']->hasPermission('access comments'))), SafeMarkup::format('User @user !state view field !field on comment @comment', [
+ ($set['comment']->isPublished() && $set['user']->hasPermission('access comments'))), SafeMarkup::format('User @user @state view field @field on comment @comment', [
'@user' => $set['user']->getUsername(),
- '!state' => $may_view ? 'can' : 'cannot',
+ '@state' => $may_view ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
- '!field' => $field,
+ '@field' => $field,
]));
- $this->assertFalse($may_update, SafeMarkup::format('User @user !state update field !field on comment @comment', [
+ $this->assertFalse($may_update, SafeMarkup::format('User @user @state update field @field on comment @comment', [
'@user' => $set['user']->getUsername(),
- '!state' => $may_update ? 'can' : 'cannot',
+ '@state' => $may_update ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
- '!field' => $field,
+ '@field' => $field,
]));
}
}
@@ -295,11 +295,11 @@ public function testAccessToAdministrativeFields() {
$set['comment']->isNew() &&
$set['user']->hasPermission('post comments') &&
$set['comment']->getFieldName() == 'comment_other'
- ), SafeMarkup::format('User @user !state update field !field on comment @comment', [
+ ), SafeMarkup::format('User @user @state update field @field on comment @comment', [
'@user' => $set['user']->getUsername(),
- '!state' => $may_update ? 'can' : 'cannot',
+ '@state' => $may_update ? 'can' : 'cannot',
'@comment' => $set['comment']->getSubject(),
- '!field' => $field,
+ '@field' => $field,
]));
}
}