From 0df3de638b67c680fe4a0036c5314df89aafb631 Mon Sep 17 00:00:00 2001
From: Bastien Le Querrec <blq@laquadrature.net>
Date: Mon, 9 Nov 2020 11:56:35 +0100
Subject: [PATCH] fallback to UTF8 version of locale before failing
---
app/controller/controller.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/controller/controller.php b/app/controller/controller.php
index 5074a62..e9d92e3 100644
--- a/app/controller/controller.php
+++ b/app/controller/controller.php
@@ -58,7 +58,11 @@ class Controller
putenv("LANGUAGE=".$lang);
if (!setlocale(LC_ALL, $lang)) {
- echo "<!-- setlocale $lang failed -->";
+ // try the UTF8 version
+ putenv("LC_MESSAGES=".$lang.".utf8");
+ putenv("LANG=".$lang.".utf8");
+ putenv("LANGUAGE=".$lang.".utf8");
+ if (!setlocale(LC_ALL, $lang.".utf8")) echo "<!-- setlocale $lang failed -->";
}
if (!textdomain("messages")) {
--
GitLab