From: Dan Brown <redacted>
Date: Tue, 20 Sep 2022 10:59:36 +0000 (+0100)
Subject: Added extra setlocale format to help windows support
X-Git-Tag: v22.09.1~1^2~3
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/050d69ea276da40ec23c32d8f0da6f7d958b1427

Added extra setlocale format to help windows support

Related to #3650
---

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,
         ]);