',
- '#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($this->t('settings'), 'access_options'))),
'#suffix' => '
',
);
}
@@ -1582,7 +1582,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$form['markup'] = array(
'#prefix' => '",
diff --git a/core/modules/views_ui/src/Form/BreakLockForm.php b/core/modules/views_ui/src/Form/BreakLockForm.php
index 82f1f6f..89f0ce0 100644
--- a/core/modules/views_ui/src/Form/BreakLockForm.php
+++ b/core/modules/views_ui/src/Form/BreakLockForm.php
@@ -79,7 +79,7 @@ public function getDescription() {
'#theme' => 'username',
'#account' => $account,
);
- return $this->t('By breaking this lock, any unsaved changes made by !user will be lost.', array('!user' => drupal_render($username)));
+ return $this->t('By breaking this lock, any unsaved changes made by @user will be lost.', array('@user' => drupal_render($username)));
}
/**
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 1b335de..fec9708 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -139,14 +139,14 @@ public function form(array $form, FormStateInterface $form_state) {
'#account' => $this->entityManager->getStorage('user')->load($view->lock->owner),
);
$lock_message_substitutions = array(
- '!user' => drupal_render($username),
- '!age' => $this->dateFormatter->formatTimeDiffSince($view->lock->updated),
+ '@user' => drupal_render($username),
+ '@age' => $this->dateFormatter->formatTimeDiffSince($view->lock->updated),
'@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,
);
}
@@ -752,14 +752,14 @@ public function renderDisplayTop(ViewUI $view) {
foreach (Views::fetchPluginNames('display', NULL, array($view->get('base_table'))) as $type => $label) {
$element['add_display'][$type] = array(
'#type' => 'submit',
- '#value' => $this->t('Add !display', array('!display' => $label)),
+ '#value' => $this->t('Add @display', array('@display' => $label)),
'#limit_validation_errors' => array(),
'#submit' => array('::submitDisplayAdd', '::submitDelayDestination'),
'#attributes' => array('class' => array('add-display')),
// Allow JavaScript to remove the 'Add ' prefix from the button label when
// placing the button in a "Add" dropdown menu.
'#process' => array_merge(array('views_ui_form_button_was_clicked'), $this->elementInfo->getInfoProperty('submit', '#process', array())),
- '#values' => array($this->t('Add !display', array('!display' => $label)), $label),
+ '#values' => array($this->t('Add @display', array('@display' => $label)), $label),
);
}
@@ -1130,12 +1130,8 @@ public function getFormBucket(ViewUI $view, $type, $display) {
$last = end($keys);
foreach ($contents as $key => $pid) {
if ($key != $last) {
- if ($group_info['groups'][$gid] == 'OR') {
- $store[$pid]['#link'] = $this->t('!link OR', ['!link' => $store[$pid]['#link']]);
- }
- else {
- $store[$pid]['#link'] = $this->t('!link AND', ['!link' => $store[$pid]['#link']]);
- }
+ $operator = $group_info['groups'][$gid] == 'OR' ? $this->t('OR') : $this->t('AND');
+ $store[$pid]['#link'] = SafeMarkup::format('@link
@operator', ['@link' => $store[$pid]['#link'], '@operator' => $operator]);
}
$build['fields'][$pid] = $store[$pid];
}
diff --git a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
index 28a2846..32b9fc7 100644
--- a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
@@ -310,4 +310,47 @@ public function testDecodeEntitiesAndEscape() {
$this->assertSame('<em>répété</em>', $escaped);
}
+ /**
+ * Tests Html::descape().
+ *
+ * @dataProvider providerDescape
+ * @covers ::descape
+ */
+ public function testDescape($expected, $text) {
+ $this->assertEquals($expected, Html::descape($text));
+ }
+
+ /**
+ * Data provider for testDescape().
+ *
+ * @see testDescape()
+ */
+ public function providerDescape() {
+ return [
+ ['Drupal', 'Drupal'],
+ ['