From cfb5c8fe68073b53669d023c1e6d7ba633ef8dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Tue, 20 Oct 2020 09:46:31 +0200
Subject: [PATCH] :ambulance: fix(config) Fix locale change check
Language::isAvailable now also work if you pass a lang without charset.
This fixes the language field of configuration screen.
issue #6051
---
include/class_Language.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/class_Language.inc b/include/class_Language.inc
index 6bdaa11ac..aeddcb541 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -134,6 +134,10 @@ class Language
*/
public static function isAvailable (string $lang): bool
{
+ if (strpos($lang, '.') === FALSE) {
+ $lang = $lang.'.UTF-8';
+ }
+
/* Store current locale */
$locale = setlocale(LC_ALL, 0);
--
GitLab