Commit 47ae9735 authored by pguillard's avatar pguillard Committed by juampynr
Browse files

Issue #2637302 by swentel, pguillard, lauriii, juampynr: Replace !placeholder with @

parent de22e922
......@@ -115,7 +115,7 @@ abstract class XmlSitemapTestBase extends WebTestBase {
protected function assertNoResponse($code, $message = '', $group = 'Browser') {
$curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
$match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code;
return $this->assertFalse($match, $message ? $message : t('HTTP response not expected !code, actual !curl_code', array('!code' => $code, '!curl_code' => $curl_code)), t('Browser'));
return $this->assertFalse($match, $message ? $message : t('HTTP response not expected @code, actual @curl_code', array('@code' => $code, '@curl_code' => $curl_code)), t('Browser'));
}
/**
......@@ -378,11 +378,11 @@ abstract class XmlSitemapTestBase extends WebTestBase {
$levels = watchdog_severity_levels();
}
return t('@timestamp - @severity - @type - !message', array(
return t('@timestamp - @severity - @type - @message', array(
'@timestamp' => $message->timestamp,
'@severity' => $levels[$message->severity],
'@type' => $message->type,
// '!message' => theme_dblog_message(array('event' => $message, 'link' => FALSE)),
// '@message' => theme_dblog_message(array('event' => $message, 'link' => FALSE)),
));
}
......
......@@ -67,7 +67,7 @@ function xmlsitemap_requirements($phase) {
$items = array('#type' => 'item_list', 'items' => array_keys($directories));
$requirements['xmlsitemap_directory']['value'] = $t('Not found or not writable');
$requirements['xmlsitemap_directory']['severity'] = REQUIREMENT_ERROR;
$requirements['xmlsitemap_directory']['description'] = $t('The following directories were not found or are not writable by the server. See <a href="@docpage">@docpage</a> for more information. !directories', array('!directories' => drupal_render($items), '@docpage' => 'http://drupal.org/node/34025'));
$requirements['xmlsitemap_directory']['description'] = $t('The following directories were not found or are not writable by the server. See <a href="@docpage">@docpage</a> for more information. @directories', array('@directories' => drupal_render($items), '@docpage' => 'http://drupal.org/node/34025'));
}
}
$sitemaps = xmlsitemap_sitemap_load_multiple();
......@@ -121,7 +121,7 @@ function xmlsitemap_requirements($phase) {
$generated_ago = REQUEST_TIME - $generated_last;
$requirements['xmlsitemap_generated'] = array(
'title' => $t('XML sitemap'),
'value' => $generated_last ? $t('Last attempted generation on !date (!interval ago).', array('!date' => format_date($generated_last, 'small'), '!interval' => \Drupal::service('date.formatter')->formatInterval($generated_ago))) : $t('Cached files have not been generated yet.'),
'value' => $generated_last ? $t('Last attempted generation on @date (@interval ago).', array('@date' => format_date($generated_last, 'small'), '@interval' => \Drupal::service('date.formatter')->formatInterval($generated_ago))) : $t('Cached files have not been generated yet.'),
'severity' => REQUIREMENT_OK,
);
if (\Drupal::state()->get('xmlsitemap_rebuild_needed')) {
......
......@@ -2339,7 +2339,7 @@ function xmlsitemap_check_status() {
'#type' => 'item_list',
'#items' => array($messages),
);
$message = t('One or more problems were detected with your XML sitemap configuration: !messages', array('!messages' => \Drupal::service('renderer')->render($messages)));
$message = t('One or more problems were detected with your XML sitemap configuration: @messages', array('@messages' => \Drupal::service('renderer')->render($messages)));
drupal_set_message($message, 'warning', FALSE);
if (\Drupal::currentUser()->hasPermission('access site reports')) {
drupal_set_message(t('Check the <a href="@status-report">status report</a> for more information.', array('@status-report' => Url::fromRoute('system.status')->toString())), 'warning', FALSE);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment