diff --git a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php index 3ebfc5f..9b0947c 100644 --- a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php +++ b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php @@ -93,10 +93,10 @@ public function getDerivativeDefinitions($base_plugin_definition) { if (empty($desc)) { if ($display->display['display_title'] == $display->definition['title']) { - $desc = t('!view', array('!view' => $view->label())); + $desc = t('@view', array('@view' => $view->label())); } else { - $desc = t('!view: !display', array('!view' => $view->label(), '!display' => $display->display['display_title'])); + $desc = t('@view: @display', array('@view' => $view->label(), '@display' => $display->display['display_title'])); } } $this->derivatives[$delta] = array( diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php index f2e5604..0d001a4 100644 --- a/core/modules/views/src/Plugin/views/HandlerBase.php +++ b/core/modules/views/src/Plugin/views/HandlerBase.php @@ -185,7 +185,7 @@ public function adminLabel($short = FALSE) { return $title; } $title = ($short && isset($this->definition['title short'])) ? $this->definition['title short'] : $this->definition['title']; - return $this->t('!group: !title', array('!group' => $this->definition['group'], '!title' => $title)); + return $this->t('@group: @title', array('@group' => $this->definition['group'], '@title' => $title)); } /** diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php index 4bad5f9..000db15 100644 --- a/core/modules/views/src/Plugin/views/PluginBase.php +++ b/core/modules/views/src/Plugin/views/PluginBase.php @@ -562,7 +562,7 @@ protected function listLanguages($flags = LanguageInterface::STATE_ALL, array $c $name = $types_info[$id]['name']; // Surround IDs by '***LANGUAGE_...***', to avoid query collisions. $id = '***LANGUAGE_' . $id . '***'; - $list[$id] = $this->t('!type language selected for page', array('!type' => $name)); + $list[$id] = $this->t('@type language selected for page', array('@type' => $name)); } } if (!empty($current_values)) { @@ -572,7 +572,7 @@ protected function listLanguages($flags = LanguageInterface::STATE_ALL, array $c // add that option too, so it is not lost. If not among the current // values, skip displaying it to avoid user confusion. if (isset($type['name']) && !isset($list[$id]) && in_array($id, $current_values)) { - $list[$id] = $this->t('!type language selected for page', array('!type' => $type['name'])); + $list[$id] = $this->t('@type language selected for page', array('@type' => $type['name'])); } } } diff --git a/core/modules/views/src/Plugin/views/area/HTTPStatusCode.php b/core/modules/views/src/Plugin/views/area/HTTPStatusCode.php index 036e369..cadb796 100644 --- a/core/modules/views/src/Plugin/views/area/HTTPStatusCode.php +++ b/core/modules/views/src/Plugin/views/area/HTTPStatusCode.php @@ -48,7 +48,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { // Add the HTTP status code, so it's easier for people to find it. array_walk($options, function($title, $code) use(&$options) { - $options[$code] = $this->t('@code (!title)', array('@code' => $code, '!title' => $title)); + $options[$code] = $this->t('@code (@title)', array('@code' => $code, '@title' => $title)); }); $form['status_code'] = array( diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php index f9ae57a..500557e 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -1545,7 +1545,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { if ($access_plugin->usesOptions()) { $form['markup'] = array( '#prefix' => '
', - '#markup' => $this->t('You may also adjust the !settings for the currently selected access restriction.', array('!settings' => $this->optionLink(t('settings'), 'access_options'))), + '#markup' => $this->t('You may also adjust the @settings for the currently selected access restriction.', array('@settings' => $this->optionLink(t('settings'), 'access_options'))), '#suffix' => '
', ); } @@ -1583,7 +1583,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['markup'] = array( '#prefix' => '
', '#suffix' => '
', - '#markup' => $this->t('You may also adjust the !settings for the currently selected cache mechanism.', array('!settings' => $this->optionLink(t('settings'), 'cache_options'))), + '#markup' => $this->t('You may also adjust the @settings for the currently selected cache mechanism.', array('@settings' => $this->optionLink(t('settings'), 'cache_options'))), ); } break; @@ -1655,7 +1655,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['markup'] = array( '#prefix' => '
', '#suffix' => '
', - '#markup' => $this->t('You may also adjust the !settings for the currently selected style.', array('!settings' => $this->optionLink(t('settings'), 'style_options'))), + '#markup' => $this->t('You may also adjust the @settings for the currently selected style.', array('@settings' => $this->optionLink(t('settings'), 'style_options'))), ); } @@ -1703,7 +1703,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['markup'] = array( '#prefix' => '
', '#suffix' => '
', - '#markup' => $this->t('You may also adjust the !settings for the currently selected row style.', array('!settings' => $this->optionLink(t('settings'), 'row_options'))), + '#markup' => $this->t('You may also adjust the @settings for the currently selected row style.', array('@settings' => $this->optionLink(t('settings'), 'row_options'))), ); } @@ -1798,7 +1798,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['markup'] = array( '#prefix' => '
', '#suffix' => '
', - '#markup' => $this->t('You may also adjust the !settings for the currently selected style.', array('!settings' => $this->optionLink(t('settings'), 'exposed_form_options'))), + '#markup' => $this->t('You may also adjust the @settings for the currently selected style.', array('@settings' => $this->optionLink(t('settings'), 'exposed_form_options'))), ); } break; @@ -1834,7 +1834,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['markup'] = array( '#prefix' => '
', '#suffix' => '
', - '#markup' => $this->t('You may also adjust the !settings for the currently selected pager.', array('!settings' => $this->optionLink(t('settings'), 'pager_options'))), + '#markup' => $this->t('You may also adjust the @settings for the currently selected pager.', array('@settings' => $this->optionLink(t('settings'), 'pager_options'))), ); } diff --git a/core/modules/views/src/Plugin/views/filter/Date.php b/core/modules/views/src/Plugin/views/filter/Date.php index 60dd605..52dabbe 100644 --- a/core/modules/views/src/Plugin/views/filter/Date.php +++ b/core/modules/views/src/Plugin/views/filter/Date.php @@ -37,7 +37,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Value type'), '#options' => array( 'date' => $this->t('A date in any machine readable format. CCYY-MM-DD HH:MM:SS is preferred.'), - 'offset' => $this->t('An offset from the current time such as "!example1" or "!example2"', array('!example1' => '+1 day', '!example2' => '-2 hours -30 minutes')), + 'offset' => $this->t('An offset from the current time such as "@example1" or "@example2"', array('@example1' => '+1 day', '@example2' => '-2 hours -30 minutes')), ), '#default_value' => !empty($this->value['type']) ? $this->value['type'] : 'date', ); diff --git a/core/modules/views/src/Plugin/views/filter/StringFilter.php b/core/modules/views/src/Plugin/views/filter/StringFilter.php index 9713351..a1ab7d2 100644 --- a/core/modules/views/src/Plugin/views/filter/StringFilter.php +++ b/core/modules/views/src/Plugin/views/filter/StringFilter.php @@ -95,7 +95,7 @@ function operators() { ), 'not' => array( 'title' => $this->t('Does not contain'), - 'short' => $this->t('!has'), + 'short' => $this->t('@has'), 'method' => 'opNotLike', 'values' => 1, ), diff --git a/core/modules/views/src/Tests/Handler/FieldKernelTest.php b/core/modules/views/src/Tests/Handler/FieldKernelTest.php index b1897cd..254c559 100644 --- a/core/modules/views/src/Tests/Handler/FieldKernelTest.php +++ b/core/modules/views/src/Tests/Handler/FieldKernelTest.php @@ -202,25 +202,25 @@ public function testFieldTokens() { $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_0, $row) { return $name_field_0->advancedRender($row); }); - $this->assertEqual($output, $expected_output_0, format_string('Test token replacement: "!token" gave "!output"', [ - '!token' => $name_field_0->options['alter']['text'], - '!output' => $output, + $this->assertEqual($output, $expected_output_0, format_string('Test token replacement: "@token" gave "@output"', [ + '@token' => $name_field_0->options['alter']['text'], + '@output' => $output, ])); $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_1, $row) { return $name_field_1->advancedRender($row); }); - $this->assertEqual($output, $expected_output_1, format_string('Test token replacement: "!token" gave "!output"', [ - '!token' => $name_field_1->options['alter']['text'], - '!output' => $output, + $this->assertEqual($output, $expected_output_1, format_string('Test token replacement: "@token" gave "@output"', [ + '@token' => $name_field_1->options['alter']['text'], + '@output' => $output, ])); $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_2, $row) { return $name_field_2->advancedRender($row); }); - $this->assertEqual($output, $expected_output_2, format_string('Test token replacement: "!token" gave "!output"', [ - '!token' => $name_field_2->options['alter']['text'], - '!output' => $output, + $this->assertEqual($output, $expected_output_2, format_string('Test token replacement: "@token" gave "@output"', [ + '@token' => $name_field_2->options['alter']['text'], + '@output' => $output, ])); } @@ -233,10 +233,10 @@ public function testFieldTokens() { $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) { return $job_field->advancedRender($row); }); - $this->assertSubString($output, $random_text, format_string('Make sure the self token (!token => !value) appears in the output (!output)', [ - '!value' => $random_text, - '!output' => $output, - '!token' => $job_field->options['alter']['text'], + $this->assertSubString($output, $random_text, format_string('Make sure the self token (@token => @value) appears in the output (@output)', [ + '@value' => $random_text, + '@output' => $output, + '@token' => $job_field->options['alter']['text'], ])); // Verify the token format used in D7 and earlier does not get substituted. @@ -247,10 +247,10 @@ public function testFieldTokens() { $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) { return $job_field->advancedRender($row); }); - $this->assertEqual($output, $old_token, format_string('Make sure the old token style (!token => !value) is not changed in the output (!output)', [ - '!value' => $random_text, - '!output' => $output, - '!token' => $job_field->options['alter']['text'], + $this->assertEqual($output, $old_token, format_string('Make sure the old token style (@token => @value) is not changed in the output (@output)', [ + '@value' => $random_text, + '@output' => $output, + '@token' => $job_field->options['alter']['text'], ])); // Verify HTML tags are allowed in rewrite templates while token @@ -280,9 +280,9 @@ public function testFieldTokens() { $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) { return $job_field->advancedRender($row); }); - $this->assertEqual($output, $random_text, format_string('Make sure a script tag in the template (!template) is removed, leaving only the replaced token in the output (!output)', [ - '!output' => $output, - '!template' => $rewrite_template, + $this->assertEqual($output, $random_text, format_string('Make sure a script tag in the template (@template) is removed, leaving only the replaced token in the output (@output)', [ + '@output' => $output, + '@template' => $rewrite_template, ])); } diff --git a/core/modules/views/src/Tests/Handler/FieldWebTest.php b/core/modules/views/src/Tests/Handler/FieldWebTest.php index 0435809..98fe8af 100644 --- a/core/modules/views/src/Tests/Handler/FieldWebTest.php +++ b/core/modules/views/src/Tests/Handler/FieldWebTest.php @@ -564,14 +564,14 @@ public function testTextRendering() { $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) { return $name_field->advancedRender($row); }); - $this->assertSubString($output, $trimmed_name, format_string('Make sure the trimmed output (!trimmed) appears in the rendered output (!output).', array('!trimmed' => $trimmed_name, '!output' => $output))); - $this->assertNotSubString($output, $row->views_test_data_name, format_string("Make sure the untrimmed value (!untrimmed) shouldn't appear in the rendered output (!output).", array('!untrimmed' => $row->views_test_data_name, '!output' => $output))); + $this->assertSubString($output, $trimmed_name, format_string('Make sure the trimmed output (@trimmed) appears in the rendered output (@output).', array('@trimmed' => $trimmed_name, '@output' => $output))); + $this->assertNotSubString($output, $row->views_test_data_name, format_string("Make sure the untrimmed value (@untrimmed) shouldn't appear in the rendered output (@output).", array('@untrimmed' => $row->views_test_data_name, '@output' => $output))); $name_field->options['alter']['max_length'] = 9; $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) { return $name_field->advancedRender($row); }); - $this->assertSubString($output, $trimmed_name, format_string('Make sure the untrimmed (!untrimmed) output appears in the rendered output (!output).', array('!trimmed' => $trimmed_name, '!output' => $output))); + $this->assertSubString($output, $trimmed_name, format_string('Make sure the untrimmed (@untrimmed) output appears in the rendered output (@output).', array('@trimmed' => $trimmed_name, '@output' => $output))); // Take word_boundary into account for the tests. $name_field->options['alter']['max_length'] = 5; @@ -615,10 +615,10 @@ public function testTextRendering() { }); if ($tuple['trimmed']) { - $this->assertNotSubString($output, $tuple['value'], format_string('The untrimmed value (!untrimmed) should not appear in the trimmed output (!output).', array('!untrimmed' => $tuple['value'], '!output' => $output))); + $this->assertNotSubString($output, $tuple['value'], format_string('The untrimmed value (@untrimmed) should not appear in the trimmed output (@output).', array('@untrimmed' => $tuple['value'], '@output' => $output))); } if (!empty($tuple['trimmed_value'])) { - $this->assertSubString($output, $tuple['trimmed_value'], format_string('The trimmed value (!trimmed) should appear in the trimmed output (!output).', array('!trimmed' => $tuple['trimmed_value'], '!output' => $output))); + $this->assertSubString($output, $tuple['trimmed_value'], format_string('The trimmed value (@trimmed) should appear in the trimmed output (@output).', array('@trimmed' => $tuple['trimmed_value'], '@output' => $output))); } } diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php index 6965e07..034e516 100644 --- a/core/modules/views/views.api.php +++ b/core/modules/views/views.api.php @@ -482,7 +482,7 @@ function hook_field_views_data(\Drupal\field\FieldStorageConfigInterface $field_ 'id' => 'standard', 'base' => 'file_managed', 'base field' => 'target_id', - 'label' => t('image from !field_name', array('!field_name' => $field_storage->getName())), + 'label' => t('image from @field_name', array('@field_name' => $field_storage->getName())), ); } @@ -526,7 +526,7 @@ function hook_field_views_data_alter(array &$data, \Drupal\field\FieldStorageCon 'field field' => $field_name . '_target_id', 'base' => $entity_type->getBaseTable(), 'base field' => $entity_type->getKey('id'), - 'label' => t('!field_name', array('!field_name' => $field_name)), + 'label' => t('@field_name', array('@field_name' => $field_name)), 'join_extra' => array( 0 => array( 'field' => 'deleted', @@ -583,7 +583,7 @@ function hook_field_views_data_views_data_alter(array &$data, \Drupal\field\Fiel 'field field' => $field_name . '_target_id', 'base' => $entity_type->getBaseTable(), 'base field' => $entity_type->getKey('id'), - 'label' => t('!field_name', array('!field_name' => $field_name)), + 'label' => t('@field_name', array('@field_name' => $field_name)), 'join_extra' => array( 0 => array( 'field' => 'deleted', diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 22424a1..470665e 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -36,14 +36,14 @@ function views_help($route_name, RouteMatchInterface $route_match) { $output = ''; $output .= '

' . t('About') . '

'; $output .= '

' . t('The Views module provides a back end to fetch information from content, user accounts, taxonomy terms, and other entities from the database and present it to the user as a grid, HTML list, table, unformatted list, etc. The resulting displays are known generally as views.') . '

'; - $output .= '

' . t('For more information, see the online documentation for the Views module.', array('!views' => 'https://www.drupal.org/documentation/modules/views')) . '

'; - $output .= '

' . t('In order to create and modify your own views using the administration and configuration user interface, you will need to enable either the Views UI module in core or a contributed module that provides a user interface for Views. See the Views UI module help page for more information.', array('!views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('help.page', array('name' => 'views_ui')) : '#')) . '

'; + $output .= '

' . t('For more information, see the online documentation for the Views module.', array('@views' => 'https://www.drupal.org/documentation/modules/views')) . '

'; + $output .= '

' . t('In order to create and modify your own views using the administration and configuration user interface, you will need to enable either the Views UI module in core or a contributed module that provides a user interface for Views. See the Views UI module help page for more information.', array('@views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('help.page', array('name' => 'views_ui')) : '#')) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Adding functionality to administrative pages') . '
'; $output .= '
' . t('The Views module adds functionality to some core administration pages. For example, admin/content uses Views to filter and sort content. With Views uninstalled, admin/content is more limited.') . '
'; $output .= '
' . t('Expanding Views functionality') . '
'; - $output .= '
' . t('Contributed projects that support the Views module can be found in the online documentation for Views-related contributed modules.', array('!node' => 'https://www.drupal.org/documentation/modules/views/add-ons')) . '
'; + $output .= '
' . t('Contributed projects that support the Views module can be found in the online documentation for Views-related contributed modules.', array('@node' => 'https://www.drupal.org/documentation/modules/views/add-ons')) . '
'; $output .= '
' . t('Improving table accessibility') . '
'; $output .= '
' . t('Views tables include semantic markup to improve accessibility. Data cells are automatically associated with header cells through id and header attributes. To improve the accessibility of your tables you can add descriptive elements within the Views table settings. The caption element can introduce context for a table, making it easier to understand. The summary element can provide an overview of how the data has been organized and how to navigate the table. Both the caption and summary are visible by default and also implemented according to HTML5 guidelines.') . '
'; $output .= '
' . t('Working with multilingual views') . '
'; diff --git a/core/modules/views/views.views.inc b/core/modules/views/views.views.inc index 4f28122..ab15d3f 100644 --- a/core/modules/views/views.views.inc +++ b/core/modules/views/views.views.inc @@ -449,7 +449,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora } if ($aliases) { $data[$table_alias][$field_alias]['aliases'] = $aliases; - $data[$table_alias][$field_alias]['help'] .= ' ' . t('Also known as: !also.', array('!also' => implode(', ', $also_known))); + $data[$table_alias][$field_alias]['help'] .= ' ' . t('Also known as: @also.', array('@also' => implode(', ', $also_known))); } $keys = array_keys($field_columns); @@ -497,12 +497,12 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora } if (count($field_columns) == 1 || $column == 'value') { - $title = t('@label (!name)', array('@label' => $label, '!name' => $field_name)); + $title = t('@label (@name)', array('@label' => $label, '@name' => $field_name)); $title_short = $label; } else { - $title = t('@label (!name:!column)', array('@label' => $label, '!name' => $field_name, '!column' => $column)); - $title_short = t('@label:!column', array('@label' => $label, '!column' => $column)); + $title = t('@label (@name:@column)', array('@label' => $label, '@name' => $field_name, '@column' => $column)); + $title_short = t('@label:@column', array('@label' => $label, '@column' => $column)); } // Expose data for the property. @@ -535,10 +535,10 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora foreach ($all_labels as $label_name => $true) { if ($label != $label_name) { if (count($field_columns) == 1 || $column == 'value') { - $alias_title = t('@label (!name)', array('@label' => $label_name, '!name' => $field_name)); + $alias_title = t('@label (@name)', array('@label' => $label_name, '@name' => $field_name)); } else { - $alias_title = t('@label (!name:!column)', array('@label' => $label_name, '!name' => $field_name, '!column' => $column)); + $alias_title = t('@label (@name:@column)', array('@label' => $label_name, '@name' => $field_name, '@column' => $column)); } $aliases[] = array( 'group' => $group_name, @@ -550,7 +550,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora } if ($aliases) { $data[$table_alias][$column_real_name]['aliases'] = $aliases; - $data[$table_alias][$column_real_name]['help'] .= ' ' . t('Also known as: !also.', array('!also' => implode(', ', $also_known))); + $data[$table_alias][$column_real_name]['help'] .= ' ' . t('Also known as: @also.', array('@also' => implode(', ', $also_known))); } $data[$table_alias][$column_real_name]['argument'] = array( @@ -589,7 +589,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora // Expose additional delta column for multiple value fields. if ($field_storage->isMultiple()) { - $title_delta = t('@label (!name:delta)', array('@label' => $label, '!name' => $field_name)); + $title_delta = t('@label (@name:delta)', array('@label' => $label, '@name' => $field_name)); $title_short_delta = t('@label:delta', array('@label' => $label)); $data[$table_alias]['delta'] = array(