From f1373b56456271d0be04aacefddacf28419e08a3 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 9 Dec 2021 21:59:17 +0100
Subject: [PATCH] Fix translations for included templates
---
lib/SimpleSAML/Error/Error.php | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/lib/SimpleSAML/Error/Error.php b/lib/SimpleSAML/Error/Error.php
index a73305672..21c0da472 100644
--- a/lib/SimpleSAML/Error/Error.php
+++ b/lib/SimpleSAML/Error/Error.php
@@ -7,6 +7,7 @@ namespace SimpleSAML\Error;
use SimpleSAML\Assert\Assert;
use SimpleSAML\Configuration;
use SimpleSAML\Logger;
+use SimpleSAML\Module;
use SimpleSAML\Session;
use SimpleSAML\Utils;
use SimpleSAML\XHTML\Template;
@@ -269,6 +270,15 @@ class Error extends Exception
Assert::true(false);
} else {
$t = new Template($config, 'error.twig', 'errors');
+
+ // Include translations for the module that holds the included template
+ if ($this->includeTemplate !== null) {
+ $module = explode(':', $this->includeTemplate, 2);
+ if (count($module) === 2 && Module::isModuleEnabled($module[0])) {
+ $t->getLocalization()->addModuleDomain($module[0]);
+ }
+ }
+
$t->setStatusCode($this->httpCode);
$t->data = array_merge($t->data, $data);
$t->send();
--
GitLab