From 95ce1c103b48bf778a594bcd817f2d4ac0e5c592 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 10 Aug 2018 22:26:55 +0200
Subject: [PATCH] Remove deprecated use of translations
---
modules/core/templates/frontpage_config.tpl.php | 6 +-----
modules/core/templates/frontpage_config.twig | 6 +-----
modules/core/www/frontpage_config.php | 8 ++++++++
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/modules/core/templates/frontpage_config.tpl.php b/modules/core/templates/frontpage_config.tpl.php
index aeaa64af1..3e4b52701 100644
--- a/modules/core/templates/frontpage_config.tpl.php
+++ b/modules/core/templates/frontpage_config.tpl.php
@@ -67,11 +67,7 @@ if ($this->data['isadmin']) {
echo '<h2>' . $this->t('{core:frontpage:warnings}') . '</h2>';
foreach($this->data['warnings'] AS $warning) {
- if (is_array($warning)) {
- echo '<div class="caution">' . $this->t($warning[0], $warning[1]) . '</div>';
- } else {
- echo '<div class="caution">'.$this->t($warning).'</div>';
- }
+ echo '<div class="caution">'.$warning.'</div>';
}
}
?>
diff --git a/modules/core/templates/frontpage_config.twig b/modules/core/templates/frontpage_config.twig
index 21a65bbfd..20802aebb 100644
--- a/modules/core/templates/frontpage_config.twig
+++ b/modules/core/templates/frontpage_config.twig
@@ -35,11 +35,7 @@
{% if warnings is defined and warnings is not empty %}
<h2>{{ '{core:frontpage:warnings}'|trans|escape('html') }}</h2>
{% for key, warning in warnings %}
- {% if warning is iterable %}
- <div class="caution">{{ warning[0]|trans(warning[1], "app")|raw }}</div>
- {% else %}
- <div class="caution">{{ warning|trans|raw }}</div>
- {% endif %}
+ <div class="caution">{{ warning|raw }}</div>
{% endfor %}
{% endif %}
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index be6ed2cd1..5a621107c 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -164,6 +164,14 @@ $t->data['pageid'] = 'frontpage_config';
$t->data['header'] = $translator->t('{core:frontpage:page_title}');
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
+
+foreach ($warnings as &$warning) {
+ if (is_array($warning)) {
+ $warning = $translator->t($warning[0], $warning[1]);
+ } else {
+ $warning = $translator->t($warning);
+ }
+}
$t->data['warnings'] = $warnings;
--
GitLab