Added more complexity in an attempt to make ldap host failover fit

[bookstack] / app / Util / LanguageManager.php

diff --git a/app/Util/LanguageManager.php b/app/Util/LanguageManager.php
index fcc56b07e513434e042e611fe3f9eacf0fa37993..201bbda3d576cba2842b85f18221faae853c9b5c 100644 (file)
--- 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,
         ]);