From ed2e31f1144925ba80e41a7fe5637ffe110c1f12 Mon Sep 17 00:00:00 2001
From: Dick Visser <dick.visser@geant.org>
Date: Fri, 23 Nov 2018 12:03:06 +0100
Subject: [PATCH] Use full msgid string in twig template This allows more
graceful fallback for untranslated languages. Also, use `raw` filter to keep
the embedded HTML working.
---
templates/base.twig | 7 ++++++-
templates/includes/header.php | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/templates/base.twig b/templates/base.twig
index d7fdd3533..25ede327b 100644
--- a/templates/base.twig
+++ b/templates/base.twig
@@ -22,7 +22,12 @@
<div id="content">
<div class="wrap">
{% if not isProduction -%}
- <div class="message-box warning">{{ 'pre-production-warning' | trans }}</div>
+ <div class="message-box warning">{{ (
+"You are now accessing a pre-production system. This authentication setup " ~
+"is for testing and pre-production verification only. If someone sent you " ~
+"a link that pointed you here, and you are not <i>a tester</i> you " ~
+"probably got the wrong link, and should <b>not be here</b>."
+) | trans | raw }}</div>
{% endif -%}
{% block contentwrapper -%}
{% block content %}{% endblock -%}
diff --git a/templates/includes/header.php b/templates/includes/header.php
index 6ddad9279..deefedecb 100644
--- a/templates/includes/header.php
+++ b/templates/includes/header.php
@@ -208,5 +208,5 @@ if (!empty($this->data['htmlinject']['htmlContentPre'])) {
}
$config = \SimpleSAML\Configuration::getInstance();
if(! $config->getBoolean('production', true)) {
- echo '<div class="caution">' . $this->t('{preprodwarning:warning:warning}'). '</div>';
+ echo '<div class="caution">' . $this->t('{preprodwarning:warning:warning}'). '</div>';
}
--
GitLab