From 050d69ea276da40ec23c32d8f0da6f7d958b1427 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 20 Sep 2022 11:59:36 +0100
Subject: [PATCH] Added extra setlocale format to help windows support
Related to #3650
---
app/Util/LanguageManager.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/Util/LanguageManager.php b/app/Util/LanguageManager.php
index fcc56b07e..201bbda3d 100644
--- a/app/Util/LanguageManager.php
+++ b/app/Util/LanguageManager.php
@@ -116,12 +116,14 @@ class LanguageManager
*/
public function setPhpDateTimeLocale(string $language): void
{
- $isoLang = $this->localeMap[$language]['iso'] ?? false;
+ $isoLang = $this->localeMap[$language]['iso'] ?? '';
+ $isoLangPrefix = explode('_', $isoLang)[0];
$locales = array_filter([
$isoLang ? $isoLang . '.utf8' : false,
$isoLang ?: false,
$isoLang ? str_replace('_', '-', $isoLang) : false,
+ $isoLang ? $isoLangPrefix . '.UTF-8' : false,
$this->localeMap[$language]['windows'] ?? false,
$language,
]);