@message
For more help installing or updating code on your server, see the handbook.', array( + $form_state->setErrorByName('connection_settings', $this->t('Failed to connect to the server. The server reports the following message:@message
For more help installing or updating code on your server, see the handbook.', array( '@message' => $e->getMessage(), - '@handbook_url' => 'https://www.drupal.org/documentation/install/modules-themes', + ':handbook_url' => 'https://www.drupal.org/documentation/install/modules-themes', ))); } } diff --git a/core/lib/Drupal/Core/Form/FormValidator.php b/core/lib/Drupal/Core/Form/FormValidator.php index bcf7faa..afead3d 100644 --- a/core/lib/Drupal/Core/Form/FormValidator.php +++ b/core/lib/Drupal/Core/Form/FormValidator.php @@ -133,7 +133,7 @@ public function setInvalidTokenError(FormStateInterface $form_state) { $url = $this->requestStack->getCurrentRequest()->getRequestUri(); // Setting this error will cause the form to fail validation. - $form_state->setErrorByName('form_token', $this->t('The form has become outdated. Copy any unsaved work in the form below and then reload this page.', array('@link' => $url))); + $form_state->setErrorByName('form_token', $this->t('The form has become outdated. Copy any unsaved work in the form below and then reload this page.', array(':link' => $url))); } /** diff --git a/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php b/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php index 19436b0..c2b7914 100644 --- a/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php +++ b/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php @@ -26,11 +26,11 @@ public function __construct(TranslationInterface $string_translation) { $title = $this->t('Drupal already installed'); $message = $this->t('apc.rfc1867 = 1 to your php.ini configuration. Alternatively, it is recommended to use PECL uploadprogress, which supports more than one simultaneous upload.', array('@url' => 'http://pecl.php.net/package/uploadprogress'));
+ $description = t('Your server is capable of displaying file upload progress through APC, but it is not enabled. Add apc.rfc1867 = 1 to your php.ini configuration. Alternatively, it is recommended to use PECL uploadprogress, which supports more than one simultaneous upload.', array(':url' => 'http://pecl.php.net/package/uploadprogress'));
}
elseif (!$implementation) {
$value = t('Not enabled');
- $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.', array('@uploadprogress_url' => 'http://pecl.php.net/package/uploadprogress', '@apc_url' => 'http://php.net/apc'));
+ $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.', array(':uploadprogress_url' => 'http://pecl.php.net/package/uploadprogress', ':apc_url' => 'http://php.net/apc'));
}
elseif ($implementation == 'apc') {
- $value = t('Enabled (APC RFC1867)', array('@url' => 'http://php.net/manual/apc.configuration.php#ini.apc.rfc1867'));
- $description = t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the PECL uploadprogress library if possible.', array('@url' => 'http://pecl.php.net/package/uploadprogress'));
+ $value = t('Enabled (APC RFC1867)', array(':url' => 'http://php.net/manual/apc.configuration.php#ini.apc.rfc1867'));
+ $description = t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the PECL uploadprogress library if possible.', array(':url' => 'http://pecl.php.net/package/uploadprogress'));
}
elseif ($implementation == 'uploadprogress') {
- $value = t('Enabled (PECL uploadprogress)', array('@url' => 'http://pecl.php.net/package/uploadprogress'));
+ $value = t('Enabled (PECL uploadprogress)', array(':url' => 'http://pecl.php.net/package/uploadprogress'));
}
$requirements['file_progress'] = array(
'title' => t('Upload progress'),
diff --git a/core/modules/filter/src/FilterPermissions.php b/core/modules/filter/src/FilterPermissions.php
index 1055fde..8f4c597 100644
--- a/core/modules/filter/src/FilterPermissions.php
+++ b/core/modules/filter/src/FilterPermissions.php
@@ -58,7 +58,7 @@ public function permissions() {
foreach ($formats as $format) {
if ($permission = $format->getPermissionName()) {
$permissions[$permission] = [
- 'title' => $this->t('Use the @label text format', ['@url' => $format->url(), '@label' => $format->label()]),
+ 'title' => $this->t('Use the @label text format', [':url' => $format->url(), '@label' => $format->label()]),
'description' => [
'#prefix' => '',
'#markup' => $this->t('Warning: This permission may have security implications depending on how the text format is configured.'),
diff --git a/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
index 4708cc6..c282f0a 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
@@ -100,7 +100,7 @@ public function tips($long = FALSE) {
}
$output .= '' . $this->t('This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.') . '
'; - $output .= '' . $this->t('For more information see W3C\'s HTML Specifications or use your favorite search engine to find other sites that explain HTML.', array('@html-specifications' => 'http://www.w3.org/TR/html/')) . '
'; + $output .= '' . $this->t('For more information see W3C\'s HTML Specifications or use your favorite search engine to find other sites that explain HTML.', array(':html-specifications' => 'http://www.w3.org/TR/html/')) . '
'; $tips = array( 'a' => array($this->t('Anchors are used to make links to other pages.'), '' . Html::escape(\Drupal::config('system.site')->get('name')) . ''), 'br' => array($this->t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), $this->t('Text with' . $this->t('Most unusual characters can be directly entered without any problems.') . '
'; - $output .= '' . $this->t('If you do encounter problems, try using HTML character entities. A common example looks like & for an ampersand & character. For a full list of entities see HTML\'s entities page. Some of the available characters include:', array('@html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) . '
'; + $output .= '' . $this->t('If you do encounter problems, try using HTML character entities. A common example looks like & for an ampersand & character. For a full list of entities see HTML\'s entities page. Some of the available characters include:', array(':html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) . '
'; $entities = array( array($this->t('Ampersand'), '&'), diff --git a/core/modules/forum/src/Form/Overview.php b/core/modules/forum/src/Form/Overview.php index dae7fb5..5f9b6f3 100644 --- a/core/modules/forum/src/Form/Overview.php +++ b/core/modules/forum/src/Form/Overview.php @@ -87,9 +87,9 @@ public function buildForm(array $form, FormStateInterface $form_state) { unset($form['actions']['reset_alphabetical']); // Use the existing taxonomy overview submit handler. - $form['terms']['#empty'] = $this->t('No containers or forums available. Add container or Add forum.', array( - '@container' => $this->url('forum.add_container'), - '@forum' => $this->url('forum.add_forum') + $form['terms']['#empty'] = $this->t('No containers or forums available. Add container or Add forum.', array( + ':container' => $this->url('forum.add_container'), + ':forum' => $this->url('forum.add_forum') )); return $form; } diff --git a/core/modules/forum/src/ForumUninstallValidator.php b/core/modules/forum/src/ForumUninstallValidator.php index 9c6220d..bf2f73f 100644 --- a/core/modules/forum/src/ForumUninstallValidator.php +++ b/core/modules/forum/src/ForumUninstallValidator.php @@ -76,9 +76,9 @@ public function validate($module) { $vocabulary = $this->getForumVocabulary(); if ($this->hasTermsForVocabulary($vocabulary)) { if ($vocabulary->access('view')) { - $reasons[] = $this->t('To uninstall Forum, first delete all %vocabulary terms', [ + $reasons[] = $this->t('To uninstall Forum, first delete all %vocabulary terms', [ '%vocabulary' => $vocabulary->label(), - '@url' => $vocabulary->url('overview-form'), + ':url' => $vocabulary->url('overview-form'), ]); } else { diff --git a/core/modules/image/src/ImageStyleListBuilder.php b/core/modules/image/src/ImageStyleListBuilder.php index eb5cf32..b55a2fd 100644 --- a/core/modules/image/src/ImageStyleListBuilder.php +++ b/core/modules/image/src/ImageStyleListBuilder.php @@ -91,8 +91,8 @@ public function getDefaultOperations(EntityInterface $entity) { */ public function render() { $build = parent::render(); - $build['#empty'] = $this->t('There are currently no styles. Add a new one.', array( - '!url' => $this->urlGenerator->generateFromRoute('image.style_add'), + $build['#empty'] = $this->t('There are currently no styles. Add a new one.', array( + ':url' => $this->urlGenerator->generateFromRoute('image.style_add'), )); return $build; } diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php index 4605b49..442929f 100644 --- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php +++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php @@ -212,7 +212,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) { '#weight' => 4.1, '#field_prefix' => '' . $this->t('Updates were attempted. If you see no failures below, you may proceed happily back to your site. Otherwise, you may need to update your database manually.', array('@url' => Url::fromRoute('
' . $this->t('Updates were attempted. If you see no failures below, you may proceed happily back to your site. Otherwise, you may need to update your database manually.', array(':url' => Url::fromRoute('
' . t('To run cron from outside the site, go to !cron', array('!cron' => $this->url('system.cron', array('key' => $this->state->get('system.cron_key')), array('absolute' => TRUE)))) . '
', + '#markup' => '' . t('To run cron from outside the site, go to @cron', array(':cron' => $cron_url, '@cron' => $cron_url)) . '
', ); $form['cron'] = array( @@ -119,7 +120,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['cron']['cron_safe_threshold'] = array( '#type' => 'select', '#title' => t('Run cron every'), - '#description' => t('More information about setting up scheduled tasks can be found by reading the cron tutorial on drupal.org.', array('@url' => 'https://www.drupal.org/cron')), + '#description' => t('More information about setting up scheduled tasks can be found by reading the cron tutorial on drupal.org.', array(':url' => 'https://www.drupal.org/cron')), '#default_value' => $config->get('threshold.autorun'), '#options' => array(0 => t('Never')) + array_map(array($this->dateFormatter, 'formatInterval'), array_combine($options, $options)), ); diff --git a/core/modules/system/src/Form/DateFormatFormBase.php b/core/modules/system/src/Form/DateFormatFormBase.php index bf78cc4..964ae96 100644 --- a/core/modules/system/src/Form/DateFormatFormBase.php +++ b/core/modules/system/src/Form/DateFormatFormBase.php @@ -104,7 +104,7 @@ public function form(array $form, FormStateInterface $form_state) { '#type' => 'textfield', '#title' => t('Format string'), '#maxlength' => 100, - '#description' => $this->t('A user-defined date format. See the PHP manual for available options.', array('@url' => 'http://php.net/manual/function.date.php')), + '#description' => $this->t('A user-defined date format. See the PHP manual for available options.', array(':url' => 'http://php.net/manual/function.date.php')), '#required' => TRUE, '#attributes' => [ 'data-drupal-date-formatter' => 'source', diff --git a/core/modules/system/src/Form/PerformanceForm.php b/core/modules/system/src/Form/PerformanceForm.php index 542d691..4d28ac7 100644 --- a/core/modules/system/src/Form/PerformanceForm.php +++ b/core/modules/system/src/Form/PerformanceForm.php @@ -141,7 +141,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $disabled = !$is_writable; $disabled_message = ''; if (!$is_writable) { - $disabled_message = ' ' . t('Set up the public files directory to make these optimizations available.', array('!file-system' => $this->url('system.file_system_settings'))); + $disabled_message = ' ' . t('Set up the public files directory to make these optimizations available.', array(':file-system' => $this->url('system.file_system_settings'))); } $form['bandwidth_optimization'] = array( diff --git a/core/modules/system/src/Form/SiteMaintenanceModeForm.php b/core/modules/system/src/Form/SiteMaintenanceModeForm.php index cde1f57..6370497 100644 --- a/core/modules/system/src/Form/SiteMaintenanceModeForm.php +++ b/core/modules/system/src/Form/SiteMaintenanceModeForm.php @@ -70,7 +70,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#type' => 'checkbox', '#title' => t('Put site into maintenance mode'), '#default_value' => $this->state->get('system.maintenance_mode'), - '#description' => t('Visitors will only see the maintenance mode message. Only users with the "Access site in maintenance mode" permission will be able to access the site. Authorized users can log in directly via the user login page.', array('@permissions-url' => $this->url('user.admin_permissions'), '@user-login' => $this->url('user.login'))), + '#description' => t('Visitors will only see the maintenance mode message. Only users with the "Access site in maintenance mode" permission will be able to access the site. Authorized users can log in directly via the user login page.', array(':permissions-url' => $this->url('user.admin_permissions'), ':user-login' => $this->url('user.login'))), ); $form['maintenance_mode_message'] = array( '#type' => 'textarea', diff --git a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php index a4f8df7..c45b739 100644 --- a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php @@ -89,9 +89,9 @@ public function blockForm($form, FormStateInterface $form_state) { if ($url_system_theme_settings->access() && $url_system_theme_settings_theme->access()) { // Provide links to the Appearance Settings and Theme Settings pages // if the user has access to administer themes. - $site_logo_description = $this->t('Defined on the Appearance Settings or Theme Settings page.', array( - '@appearance' => $url_system_theme_settings->toString(), - '@theme' => $url_system_theme_settings_theme->toString(), + $site_logo_description = $this->t('Defined on the Appearance Settings or Theme Settings page.', array( + ':appearance' => $url_system_theme_settings->toString(), + ':theme' => $url_system_theme_settings_theme->toString(), )); } else { @@ -106,8 +106,8 @@ public function blockForm($form, FormStateInterface $form_state) { // Provide link to Site Information page if the user has access to // administer site configuration. - $site_name_description = $this->t('Defined on the Site Information page.', array('@information' => $site_information_url)); - $site_slogan_description = $this->t('Defined on the Site Information page.', array('@information' => $site_information_url)); + $site_name_description = $this->t('Defined on the Site Information page.', array(':information' => $site_information_url)); + $site_slogan_description = $this->t('Defined on the Site Information page.', array(':information' => $site_information_url)); } else { // Explain that the user does not have access to the Site Information diff --git a/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php index c768e21..ecc6898 100644 --- a/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php @@ -25,7 +25,7 @@ class SystemPoweredByBlock extends BlockBase { * {@inheritdoc} */ public function build() { - return array('#markup' => '' . $this->t('Powered by Drupal', array('@poweredby' => 'https://www.drupal.org')) . ''); + return array('#markup' => '' . $this->t('Powered by Drupal', array(':poweredby' => 'https://www.drupal.org')) . ''); } /** diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php index d607303..f723acf 100644 --- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php +++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php @@ -377,7 +377,7 @@ public function getRequirements() { // Check for filter and rotate support. if (!function_exists('imagefilter') || !function_exists('imagerotate')) { $requirements['version']['severity'] = REQUIREMENT_WARNING; - $requirements['version']['description'] = t('The GD Library for PHP is enabled, but was compiled without support for functions used by the rotate and desaturate effects. It was probably compiled using the official GD libraries from http://www.libgd.org instead of the GD library bundled with PHP. You should recompile PHP --with-gd using the bundled GD library. See the PHP manual.', array('@url' => 'http://www.php.net/manual/book.image.php')); + $requirements['version']['description'] = t('The GD Library for PHP is enabled, but was compiled without support for functions used by the rotate and desaturate effects. It was probably compiled using the official GD libraries from http://www.libgd.org instead of the GD library bundled with PHP. You should recompile PHP --with-gd using the bundled GD library. See the PHP manual.', array(':url' => 'http://www.php.net/manual/book.image.php')); } return $requirements; diff --git a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php index 54ab8b7..6794120 100644 --- a/core/modules/system/src/Tests/System/SiteMaintenanceTest.php +++ b/core/modules/system/src/Tests/System/SiteMaintenanceTest.php @@ -54,7 +54,7 @@ protected function testSiteMaintenance() { ); $this->drupalPostForm('admin/config/development/maintenance', $edit, t('Save configuration')); - $admin_message = t('Operating in maintenance mode. Go online.', array('@url' => \Drupal::url('system.site_maintenance_mode'))); + $admin_message = t('Operating in maintenance mode. Go online.', array(':url' => \Drupal::url('system.site_maintenance_mode'))); $user_message = t('Operating in maintenance mode.'); $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => $this->config('system.site')->get('name'))); diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 433e74a..4e7b46d 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -136,7 +136,7 @@ function system_requirements($phase) { 'title' => t('Apache version'), 'value' => $apache_version_string, 'severity' => REQUIREMENT_ERROR, - 'description' => t('The minimum version of Apache needed to run Drupal without mod_rewrite enabled is 2.2.16. See the enabling clean URLs page for more information on mod_rewrite.', array('@link' => 'http://drupal.org/node/15365')), + 'description' => t('The minimum version of Apache needed to run Drupal without mod_rewrite enabled is 2.2.16. See the enabling clean URLs page for more information on mod_rewrite.', array(':link' => 'http://drupal.org/node/15365')), ); } @@ -145,7 +145,7 @@ function system_requirements($phase) { 'title' => t('Clean URLs'), 'value' => t('Disabled'), 'severity' => REQUIREMENT_WARNING, - 'description' => t('Your server is capable of using clean URLs, but it is not enabled. Using clean URLs gives an improved user experience and is recommended. Enable clean URLs', array('@link' => 'http://drupal.org/node/15365')), + 'description' => t('Your server is capable of using clean URLs, but it is not enabled. Using clean URLs gives an improved user experience and is recommended. Enable clean URLs', array(':link' => 'http://drupal.org/node/15365')), ); } } @@ -154,7 +154,7 @@ function system_requirements($phase) { $phpversion = $phpversion_label = phpversion(); if (function_exists('phpinfo')) { if ($phase === 'runtime') { - $phpversion_label = t('@phpversion (more information)', ['@phpversion' => $phpversion, '@url' => (new Url('system.php'))->toString()]); + $phpversion_label = t('@phpversion (more information)', ['@phpversion' => $phpversion, ':url' => (new Url('system.php'))->toString()]); } $requirements['php'] = array( 'title' => t('PHP'), @@ -165,7 +165,7 @@ function system_requirements($phase) { $requirements['php'] = array( 'title' => t('PHP'), 'value' => $phpversion_label, - 'description' => t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, Enabling and disabling phpinfo() handbook page.', array('@phpinfo' => 'https://www.drupal.org/node/243993')), + 'description' => t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, Enabling and disabling phpinfo() handbook page.', array(':phpinfo' => 'https://www.drupal.org/node/243993')), 'severity' => REQUIREMENT_INFO, ); } @@ -216,8 +216,8 @@ function system_requirements($phase) { } if (!empty($missing_extensions)) { - $description = t('Drupal requires you to enable the PHP extensions in the following list (see the system requirements page for more information):', array( - '@system_requirements' => 'https://www.drupal.org/requirements', + $description = t('Drupal requires you to enable the PHP extensions in the following list (see the system requirements page for more information):', array( + ':system_requirements' => 'https://www.drupal.org/requirements', )); // We use twig inline_template to avoid twig's autoescape. @@ -248,7 +248,7 @@ function system_requirements($phase) { $requirements['php_opcache'] = array( 'value' => t('Not enabled'), 'severity' => REQUIREMENT_WARNING, - 'description' => t('PHP OPcode caching can improve your site\'s performance considerably. It is highly recommended to have OPcache installed on your server.', array('@opcache_link' => 'http://php.net/manual/en/opcache.installation.php')), + 'description' => t('PHP OPcode caching can improve your site\'s performance considerably. It is highly recommended to have OPcache installed on your server.', array(':opcache_link' => 'http://php.net/manual/en/opcache.installation.php')), ); } else { @@ -266,8 +266,8 @@ function system_requirements($phase) { // Make sure PDO is available. $database_ok = extension_loaded('pdo'); if (!$database_ok) { - $pdo_message = t('Your web server does not appear to support PDO (PHP Data Objects). Ask your hosting provider if they support the native PDO extension. See the system requirements page for more information.', array( - '@link' => 'https://www.drupal.org/requirements/pdo', + $pdo_message = t('Your web server does not appear to support PDO (PHP Data Objects). Ask your hosting provider if they support the native PDO extension. See the system requirements page for more information.', array( + ':link' => 'https://www.drupal.org/requirements/pdo', )); } else { @@ -275,16 +275,16 @@ function system_requirements($phase) { $drivers = drupal_detect_database_types(); if (empty($drivers)) { $database_ok = FALSE; - $pdo_message = t('Your web server does not appear to support any common PDO database extensions. Check with your hosting provider to see if they support PDO (PHP Data Objects) and offer any databases that Drupal supports.', array( - '@drupal-databases' => 'https://www.drupal.org/node/270#database', + $pdo_message = t('Your web server does not appear to support any common PDO database extensions. Check with your hosting provider to see if they support PDO (PHP Data Objects) and offer any databases that Drupal supports.', array( + ':drupal-databases' => 'https://www.drupal.org/node/270#database', )); } // Make sure the native PDO extension is available, not the older PEAR // version. (See install_verify_pdo() for details.) if (!defined('PDO::ATTR_DEFAULT_FETCH_MODE')) { $database_ok = FALSE; - $pdo_message = t('Your web server seems to have the wrong version of PDO installed. Drupal requires the PDO extension from PHP core. This system has the older PECL version. See the system requirements page for more information.', array( - '@link' => 'https://www.drupal.org/requirements/pdo#pecl', + $pdo_message = t('Your web server seems to have the wrong version of PDO installed. Drupal requires the PDO extension from PHP core. This system has the older PECL version. See the system requirements page for more information.', array( + ':link' => 'https://www.drupal.org/requirements/pdo#pecl', )); } } @@ -339,7 +339,7 @@ function system_requirements($phase) { $description['memory'] = t('Contact your system administrator or hosting provider for assistance with increasing your PHP memory limit.'); } - $handbook_link = t('For more information, see the online handbook entry for increasing the PHP memory limit.', array('@memory-limit' => 'https://www.drupal.org/node/207036')); + $handbook_link = t('For more information, see the online handbook entry for increasing the PHP memory limit.', array(':memory-limit' => 'https://www.drupal.org/node/207036')); $description = array( '#type' => 'inline_template', @@ -430,11 +430,12 @@ function system_requirements($phase) { // Check for the string which was added to the recommended .htaccess file // in the latest security update. if (!file_exists($htaccess_file) || !($contents = @file_get_contents($htaccess_file)) || strpos($contents, 'Drupal_Security_Do_Not_Remove_See_SA_2013_003') === FALSE) { + $url = 'https://www.drupal.org/SA-CORE-2013-003'; $requirements[$htaccess_file] = array( 'title' => $info['title'], 'value' => t('Not fully protected'), 'severity' => REQUIREMENT_ERROR, - 'description' => t('See @url for information about the recommended .htaccess file which should be added to the %directory directory to help protect against arbitrary code execution.', array('@url' => 'https://www.drupal.org/SA-CORE-2013-003', '%directory' => $info['directory'])), + 'description' => t('See @url for information about the recommended .htaccess file which should be added to the %directory directory to help protect against arbitrary code execution.', array(':url' => $url, '@url' => $url, '%directory' => $info['directory'])), ); } } @@ -478,18 +479,19 @@ function system_requirements($phase) { '#suffix' => ' ', ], [ - '#markup' => t('For more information, see the online handbook entry for configuring cron jobs.', ['@cron-handbook' => 'https://www.drupal.org/cron']), + '#markup' => t('For more information, see the online handbook entry for configuring cron jobs.', [':cron-handbook' => 'https://www.drupal.org/cron']), '#suffix' => ' ', ], ]; } + $cron_url = \Drupal::url('system.cron', ['key' => \Drupal::state()->get('system.cron_key'), ['absolute' => TRUE]]); $requirements['cron']['description'][] = [ [ - '#markup' => t('You can run cron manually.', ['@cron' => \Drupal::url('system.run_cron')]), + '#markup' => t('You can run cron manually.', [':cron' => \Drupal::url('system.run_cron')]), ], [ '#prefix' => '', - '#markup' => $this->t('You can find modules and themes on drupal.org. The following file extensions are supported: %extensions.', array( - '@module_url' => 'https://www.drupal.org/project/modules', - '@theme_url' => 'https://www.drupal.org/project/themes', - '@drupal_org_url' => 'https://www.drupal.org', + '#markup' => $this->t('You can find modules and themes on drupal.org. The following file extensions are supported: %extensions.', array( + ':module_url' => 'https://www.drupal.org/project/modules', + ':theme_url' => 'https://www.drupal.org/project/themes', + ':drupal_org_url' => 'https://www.drupal.org', '%extensions' => archiver_get_extensions(), )), '#suffix' => '
', diff --git a/core/modules/update/src/Form/UpdateReady.php b/core/modules/update/src/Form/UpdateReady.php index 8ac54c1..d74d5c4 100644 --- a/core/modules/update/src/Form/UpdateReady.php +++ b/core/modules/update/src/Form/UpdateReady.php @@ -98,7 +98,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { $form['backup'] = array( '#prefix' => '', - '#markup' => $this->t('Back up your database and site before you continue. Learn how.', array('@backup_url' => 'https://www.drupal.org/node/22281')), + '#markup' => $this->t('Back up your database and site before you continue. Learn how.', array(':backup_url' => 'https://www.drupal.org/node/22281')), '#suffix' => '', ); diff --git a/core/modules/update/src/UpdateSettingsForm.php b/core/modules/update/src/UpdateSettingsForm.php index 9c40e73..12f2e4b 100644 --- a/core/modules/update/src/UpdateSettingsForm.php +++ b/core/modules/update/src/UpdateSettingsForm.php @@ -98,7 +98,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { 'all' => t('All newer versions'), 'security' => t('Only security updates'), ), - '#description' => t('You can choose to send email only if a security update is available, or to be notified about all newer versions. If there are updates available of Drupal core or any of your installed modules and themes, your site will always print a message on the status report page, and will also display an error message on administration pages if there is a security update.', array('@status_report' => $this->url('system.status'))) + '#description' => t('You can choose to send email only if a security update is available, or to be notified about all newer versions. If there are updates available of Drupal core or any of your installed modules and themes, your site will always print a message on the status report page, and will also display an error message on administration pages if there is a security update.', array(':status_report' => $this->url('system.status'))) ); return parent::buildForm($form, $form_state); diff --git a/core/modules/update/update.install b/core/modules/update/update.install index 3a95866..b2223f1 100644 --- a/core/modules/update/update.install +++ b/core/modules/update/update.install @@ -113,10 +113,10 @@ function _update_requirement_check($project, $type) { // a single paragraph. $requirement['description'][] = ['#markup' => _update_message_text($type, $status)]; if (_update_manager_access()) { - $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the available updates page for more information and to install your missing updates.', ['@available_updates' => \Drupal::url('update.report_update')])]; + $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the available updates page for more information and to install your missing updates.', [':available_updates' => \Drupal::url('update.report_update')])]; } else { - $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the available updates page for more information.', ['@available_updates' => \Drupal::url('update.status')])]; + $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the available updates page for more information.', [':available_updates' => \Drupal::url('update.status')])]; } } switch ($status) { diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc index 4afcb0f..f9c7c5f 100644 --- a/core/modules/update/update.manager.inc +++ b/core/modules/update/update.manager.inc @@ -99,10 +99,10 @@ function _update_manager_check_backends(&$form, $operation) { $available_backends = drupal_get_filetransfer_info(); if (empty($available_backends)) { if ($operation == 'update') { - $form['available_backends']['#markup'] = t('Your server does not support updating modules and themes from this interface. Instead, update modules and themes by uploading the new versions directly to the server, as described in the handbook.', array('@handbook_url' => 'https://www.drupal.org/getting-started/install-contrib')); + $form['available_backends']['#markup'] = t('Your server does not support updating modules and themes from this interface. Instead, update modules and themes by uploading the new versions directly to the server, as described in the handbook.', array(':handbook_url' => 'https://www.drupal.org/getting-started/install-contrib')); } else { - $form['available_backends']['#markup'] = t('Your server does not support installing modules and themes from this interface. Instead, install modules and themes by uploading them directly to the server, as described in the handbook.', array('@handbook_url' => 'https://www.drupal.org/getting-started/install-contrib')); + $form['available_backends']['#markup'] = t('Your server does not support installing modules and themes from this interface. Instead, install modules and themes by uploading them directly to the server, as described in the handbook.', array(':handbook_url' => 'https://www.drupal.org/getting-started/install-contrib')); } return FALSE; } @@ -114,21 +114,21 @@ function _update_manager_check_backends(&$form, $operation) { if ($operation == 'update') { $form['available_backends']['#markup'] = \Drupal::translation()->formatPlural( count($available_backends), - 'Updating modules and themes requires @backends access to your server. See the handbook for other update methods.', - 'Updating modules and themes requires access to your server via one of the following methods: @backends. See the handbook for other update methods.', + 'Updating modules and themes requires @backends access to your server. See the handbook for other update methods.', + 'Updating modules and themes requires access to your server via one of the following methods: @backends. See the handbook for other update methods.', array( '@backends' => implode(', ', $backend_names), - '@handbook_url' => 'https://www.drupal.org/getting-started/install-contrib', + ':handbook_url' => 'https://www.drupal.org/getting-started/install-contrib', )); } else { $form['available_backends']['#markup'] = \Drupal::translation()->formatPlural( count($available_backends), - 'Installing modules and themes requires @backends access to your server. See the handbook for other installation methods.', - 'Installing modules and themes requires access to your server via one of the following methods: @backends. See the handbook for other installation methods.', + 'Installing modules and themes requires @backends access to your server. See the handbook for other installation methods.', + 'Installing modules and themes requires access to your server via one of the following methods: @backends. See the handbook for other installation methods.', array( '@backends' => implode(', ', $backend_names), - '@handbook_url' => 'https://www.drupal.org/getting-started/install-contrib', + ':handbook_url' => 'https://www.drupal.org/getting-started/install-contrib', )); } return TRUE; diff --git a/core/modules/update/update.module b/core/modules/update/update.module index d5ed50a..060c56d 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -286,9 +286,9 @@ function update_storage_clear_submit($form, FormStateInterface $form_state) { */ function _update_no_data() { $destination = \Drupal::destination()->getAsArray(); - return t('No update information available. Run cron or check manually.', array( - '@run_cron' => \Drupal::url('system.run_cron', [], ['query' => $destination]), - '@check_manually' => \Drupal::url('update.manual_status', [], ['query' => $destination]), + return t('No update information available. Run cron or check manually.', array( + ':run_cron' => \Drupal::url('system.run_cron', [], ['query' => $destination]), + ':check_manually' => \Drupal::url('update.manual_status', [], ['query' => $destination]), )); } @@ -525,10 +525,10 @@ function _update_message_text($msg_type, $msg_reason, $langcode = NULL) { case UPDATE_NOT_FETCHED: case UPDATE_FETCH_PENDING: if ($msg_type == 'core') { - $text = t('There was a problem checking available updates for Drupal.', array('@update-report' => \Drupal::url('update.status')), array('langcode' => $langcode)); + $text = t('There was a problem checking available updates for Drupal.', array(':update-report' => \Drupal::url('update.status')), array('langcode' => $langcode)); } else { - $text = t('There was a problem checking available updates for your modules or themes.', array('@update-report' => \Drupal::url('update.status')), array('langcode' => $langcode)); + $text = t('There was a problem checking available updates for your modules or themes.', array(':update-report' => \Drupal::url('update.status')), array('langcode' => $langcode)); } break; } @@ -596,7 +596,7 @@ function update_verify_update_archive($project, $archive_file, $directory) { && file_exists("$directory/$project/core/modules/system/system.module") ) { return array( - 'no-core' => t('Automatic updating of Drupal core is not supported. See the upgrade guide for information on how to update Drupal core manually.', array('@upgrade-guide' => 'https://www.drupal.org/upgrade')), + 'no-core' => t('Automatic updating of Drupal core is not supported. See the upgrade guide for information on how to update Drupal core manually.', array(':upgrade-guide' => 'https://www.drupal.org/upgrade')), ); } diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php index f6feb2e..f1c505d 100644 --- a/core/modules/user/src/AccountForm.php +++ b/core/modules/user/src/AccountForm.php @@ -151,10 +151,10 @@ public function form(array $form, FormStateInterface $form_state) { // The user may only change their own password without their current // password if they logged in via a one-time login link. if (!$form_state->get('user_pass_reset')) { - $form['account']['current_pass']['#description'] = $this->t('Required if you want to change the %mail or %pass below. Reset your password.', array( + $form['account']['current_pass']['#description'] = $this->t('Required if you want to change the %mail or %pass below. Reset your password.', array( '%mail' => $form['account']['mail']['#title'], '%pass' => $this->t('Password'), - '!request_new_url' => $this->url('user.pass'), + ':request_new_url' => $this->url('user.pass'), )); } } diff --git a/core/modules/user/src/AccountSettingsForm.php b/core/modules/user/src/AccountSettingsForm.php index 41ec240..6cdc238 100644 --- a/core/modules/user/src/AccountSettingsForm.php +++ b/core/modules/user/src/AccountSettingsForm.php @@ -174,7 +174,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { '#type' => 'radios', '#title' => $this->t('When cancelling a user account'), '#default_value' => $config->get('cancel_method'), - '#description' => $this->t('Users with the %select-cancel-method or %administer-users permissions can override this default method.', array('%select-cancel-method' => $this->t('Select method for cancelling account'), '%administer-users' => $this->t('Administer users'), '@permissions-url' => $this->url('user.admin_permissions'))), + '#description' => $this->t('Users with the %select-cancel-method or %administer-users permissions can override this default method.', array('%select-cancel-method' => $this->t('Select method for cancelling account'), '%administer-users' => $this->t('Administer users'), ':permissions-url' => $this->url('user.admin_permissions'))), ); $form['registration_cancellation']['user_cancel_method'] += user_cancel_methods(); foreach (Element::children($form['registration_cancellation']['user_cancel_method']) as $key) { diff --git a/core/modules/user/src/Controller/UserController.php b/core/modules/user/src/Controller/UserController.php index 27f9519..21c81a2 100644 --- a/core/modules/user/src/Controller/UserController.php +++ b/core/modules/user/src/Controller/UserController.php @@ -98,8 +98,8 @@ public function resetPass($uid, $timestamp, $hash) { // A different user is already logged in on the computer. else { if ($reset_link_user = $this->userStorage->load($uid)) { - drupal_set_message($this->t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please logout and try using the link again.', - array('%other_user' => $account->getUsername(), '%resetting_user' => $reset_link_user->getUsername(), '@logout' => $this->url('user.logout'))), 'warning'); + drupal_set_message($this->t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please logout and try using the link again.', + array('%other_user' => $account->getUsername(), '%resetting_user' => $reset_link_user->getUsername(), ':logout' => $this->url('user.logout'))), 'warning'); } else { // Invalid one-time link specifies an unknown user. diff --git a/core/modules/user/src/Form/UserLoginForm.php b/core/modules/user/src/Form/UserLoginForm.php index 1c7a342..f9ec804 100644 --- a/core/modules/user/src/Form/UserLoginForm.php +++ b/core/modules/user/src/Form/UserLoginForm.php @@ -224,15 +224,15 @@ public function validateFinal(array &$form, FormStateInterface $form_state) { if ($flood_control_triggered = $form_state->get('flood_control_triggered')) { if ($flood_control_triggered == 'user') { - $form_state->setErrorByName('name', $this->formatPlural($flood_config->get('user_limit'), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array('@url' => $this->url('user.pass')))); + $form_state->setErrorByName('name', $this->formatPlural($flood_config->get('user_limit'), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array(':url' => $this->url('user.pass')))); } else { // We did not find a uid, so the limit is IP-based. - $form_state->setErrorByName('name', $this->t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.', array('@url' => $this->url('user.pass')))); + $form_state->setErrorByName('name', $this->t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.', array(':url' => $this->url('user.pass')))); } } else { - $form_state->setErrorByName('name', $this->t('Sorry, unrecognized username or password. Have you forgotten your password?', array('@password' => $this->url('user.pass', [], array('query' => array('name' => $form_state->getValue('name'))))))); + $form_state->setErrorByName('name', $this->t('Sorry, unrecognized username or password. Have you forgotten your password?', array(':password' => $this->url('user.pass', [], array('query' => array('name' => $form_state->getValue('name'))))))); $accounts = $this->userStorage->loadByProperties(array('name' => $form_state->getValue('name'))); if (!empty($accounts)) { $this->logger('user')->notice('Login attempt failed for %user.', array('%user' => $form_state->getValue('name'))); diff --git a/core/modules/user/src/RegisterForm.php b/core/modules/user/src/RegisterForm.php index 53dad45..f7aa866 100644 --- a/core/modules/user/src/RegisterForm.php +++ b/core/modules/user/src/RegisterForm.php @@ -116,7 +116,7 @@ public function save(array $form, FormStateInterface $form_state) { // New administrative account without notification. if ($admin && !$notify) { - drupal_set_message($this->t('Created a new user account for %name. No email has been sent.', array('@url' => $account->url(), '%name' => $account->getUsername()))); + drupal_set_message($this->t('Created a new user account for %name. No email has been sent.', array(':url' => $account->url(), '%name' => $account->getUsername()))); } // No email verification required; log in user immediately. elseif (!$admin && !\Drupal::config('user.settings')->get('verify_mail') && $account->isActive()) { @@ -128,13 +128,13 @@ public function save(array $form, FormStateInterface $form_state) { // No administrator approval required. elseif ($account->isActive() || $notify) { if (!$account->getEmail() && $notify) { - drupal_set_message($this->t('The new user %name was created without an email address, so no welcome message was sent.', array('@url' => $account->url(), '%name' => $account->getUsername()))); + drupal_set_message($this->t('The new user %name was created without an email address, so no welcome message was sent.', array(':url' => $account->url(), '%name' => $account->getUsername()))); } else { $op = $notify ? 'register_admin_created' : 'register_no_approval_required'; if (_user_mail_notify($op, $account)) { if ($notify) { - drupal_set_message($this->t('A welcome message with further instructions has been emailed to the new user %name.', array('@url' => $account->url(), '%name' => $account->getUsername()))); + drupal_set_message($this->t('A welcome message with further instructions has been emailed to the new user %name.', array(':url' => $account->url(), '%name' => $account->getUsername()))); } else { drupal_set_message($this->t('A welcome message with further instructions has been sent to your email address.')); diff --git a/core/modules/user/src/Tests/UserLoginTest.php b/core/modules/user/src/Tests/UserLoginTest.php index 8a31137..f5dbc55 100644 --- a/core/modules/user/src/Tests/UserLoginTest.php +++ b/core/modules/user/src/Tests/UserLoginTest.php @@ -169,11 +169,11 @@ function assertFailedLogin($account, $flood_trigger = NULL) { $this->assertNoFieldByXPath("//input[@name='pass' and @value!='']", NULL, 'Password value attribute is blank.'); if (isset($flood_trigger)) { if ($flood_trigger == 'user') { - $this->assertRaw(\Drupal::translation()->formatPlural($this->config('user.flood')->get('user_limit'), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array('@url' => \Drupal::url('user.pass')))); + $this->assertRaw(\Drupal::translation()->formatPlural($this->config('user.flood')->get('user_limit'), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or request a new password.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or request a new password.', array(':url' => \Drupal::url('user.pass')))); } else { // No uid, so the limit is IP-based. - $this->assertRaw(t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.', array('@url' => \Drupal::url('user.pass')))); + $this->assertRaw(t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or request a new password.', array(':url' => \Drupal::url('user.pass')))); } } else { diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php index f5bd131..e54dc96 100644 --- a/core/modules/user/src/Tests/UserPasswordResetTest.php +++ b/core/modules/user/src/Tests/UserPasswordResetTest.php @@ -220,8 +220,8 @@ public function testUserResetPasswordTextboxFilled() { 'pass' => $this->randomMachineName(), ); $this->drupalPostForm('user/login', $edit, t('Log in')); - $this->assertRaw(t('Sorry, unrecognized username or password. Have you forgotten your password?', - array('@password' => \Drupal::url('user.pass', [], array('query' => array('name' => $edit['name'])))))); + $this->assertRaw(t('Sorry, unrecognized username or password. Have you forgotten your password?', + array(':password' => \Drupal::url('user.pass', [], array('query' => array('name' => $edit['name'])))))); unset($edit['pass']); $this->drupalGet('user/password', array('query' => array('name' => $edit['name']))); $this->assertFieldByName('name', $edit['name'], 'User name found.'); diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php index 55c6ea4..c4d5fe9 100644 --- a/core/modules/user/user.api.php +++ b/core/modules/user/user.api.php @@ -136,7 +136,7 @@ function hook_user_login($account) { $config = \Drupal::config('system.date'); // If the user has a NULL time zone, notify them to set a time zone. if (!$account->getTimezone() && $config->get('timezone.user.configurable') && $config->get('timezone.user.warn')) { - drupal_set_message(t('Configure your account time zone setting.', array('@user-edit' => $account->url('edit-form', array('query' => \Drupal::destination()->getAsArray(), 'fragment' => 'edit-timezone'))))); + drupal_set_message(t('Configure your account time zone setting.', array(':user-edit' => $account->url('edit-form', array('query' => \Drupal::destination()->getAsArray(), 'fragment' => 'edit-timezone'))))); } } diff --git a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php index d79e4eb..4f8bcce 100644 --- a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php +++ b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php @@ -159,7 +159,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta ); if ($this->view->storage->access('edit') && \Drupal::moduleHandler()->moduleExists('views_ui')) { - $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore. (Try changing it directly in @name.)', array('@url' => \Drupal::url('entity.view.edit_display_form', array('view' => $this->view->storage->id(), 'display_id' => $this->displayID)), '@name' => $this->view->storage->label())); + $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore. (Try changing it directly in @name.)', array(':url' => \Drupal::url('entity.view.edit_display_form', array('view' => $this->view->storage->id(), 'display_id' => $this->displayID)), '@name' => $this->view->storage->label())); } else { $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore.'); diff --git a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php index c59a55c..25e7393 100644 --- a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php +++ b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php @@ -82,9 +82,9 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta else { if ($this->currentUser->hasPermission('administer views') && $this->moduleHandler->moduleExists('views_ui')) { $form['view']['no_view_help'] = array( - '#markup' => '' . $this->t('No eligible views were found. Create a view with an Entity Reference display, or add such a display to an existing view.', array( - '@create' => Url::fromRoute('views_ui.add')->toString(), - '@existing' => Url::fromRoute('entity.view.collection')->toString(), + '#markup' => '
' . $this->t('No eligible views were found. Create a view with an Entity Reference display, or add such a display to an existing view.', array( + ':create' => Url::fromRoute('views_ui.add')->toString(), + ':existing' => Url::fromRoute('entity.view.collection')->toString(), )) . '
', ); } diff --git a/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php b/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php index ac3aeff..abbbd10 100644 --- a/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php +++ b/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php @@ -61,7 +61,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta $id = $view->storage->id(); $label = $view->storage->label(); if ($this->moduleHandler->moduleExists('views_ui')) { - $message = $this->t('This link is provided by the Views module. The path can be changed by editing the view @label', array('@url' => \Drupal::url('entity.view.edit_form', array('view' => $id)), '@label' => $label)); + $message = $this->t('This link is provided by the Views module. The path can be changed by editing the view @label', array(':url' => \Drupal::url('entity.view.edit_form', array('view' => $id)), '@label' => $label)); } else { $message = $this->t('This link is provided by the Views module from view %label.', array('%label' => $label)); diff --git a/core/modules/views/src/Plugin/views/display/Block.php b/core/modules/views/src/Plugin/views/display/Block.php index 08e4467..8e4e5d2 100644 --- a/core/modules/views/src/Plugin/views/display/Block.php +++ b/core/modules/views/src/Plugin/views/display/Block.php @@ -196,7 +196,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { $form['block_category'] = array( '#type' => 'textfield', '#autocomplete_route_name' => 'block.category_autocomplete', - '#description' => $this->t('The category this block will appear under on the blocks placement page.', array('@href' => \Drupal::url('block.admin_display'))), + '#description' => $this->t('The category this block will appear under on the blocks placement page.', array(':href' => \Drupal::url('block.admin_display'))), '#default_value' => $this->getOption('block_category'), ); break; diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php index 021162f..23eccf2 100644 --- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php @@ -716,7 +716,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { '#title' => $this->t('Text'), '#type' => 'textarea', '#default_value' => $this->options['alter']['text'], - '#description' => $this->t('The text to display for this field. You may include HTML or Twig. You may enter data from this view as per the "Replacement patterns" below.', array('@url' => CoreUrl::fromUri('http://twig.sensiolabs.org/documentation')->toString())), + '#description' => $this->t('The text to display for this field. You may include HTML or Twig. You may enter data from this view as per the "Replacement patterns" below.', array(':url' => CoreUrl::fromUri('http://twig.sensiolabs.org/documentation')->toString())), '#states' => array( 'visible' => array( ':input[name="options[alter][alter_text]"]' => array('checked' => TRUE), diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php index 3b1d6af..dc7a312 100644 --- a/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -141,12 +141,12 @@ public function form(array $form, FormStateInterface $form_state) { $lock_message_substitutions = array( '@user' => drupal_render($username), '@age' => $this->dateFormatter->formatTimeDiffSince($view->lock->updated), - '@url' => $view->url('break-lock-form'), + ':url' => $view->url('break-lock-form'), ); $form['locked'] = array( '#type' => 'container', '#attributes' => array('class' => array('view-locked', 'messages', 'messages--warning')), - '#children' => $this->t('This view is being edited by user @user, and is therefore locked from editing by others. This lock is @age old. Click here to break this lock.', $lock_message_substitutions), + '#children' => $this->t('This view is being edited by user @user, and is therefore locked from editing by others. This lock is @age old. Click here to break this lock.', $lock_message_substitutions), '#weight' => -10, ); }