X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/623ccd4cfa5c9a283c5ac52ac89a8685f80d1628..refs/pull/3918/head:/app/Util/LanguageManager.php diff --git a/app/Util/LanguageManager.php b/app/Util/LanguageManager.php index fcc56b07e..ed68f647c 100644 --- a/app/Util/LanguageManager.php +++ b/app/Util/LanguageManager.php @@ -28,6 +28,7 @@ class LanguageManager 'de' => ['iso' => 'de_DE', 'windows' => 'German'], 'de_informal' => ['iso' => 'de_DE', 'windows' => 'German'], 'en' => ['iso' => 'en_GB', 'windows' => 'English'], + 'el' => ['iso' => 'el_GR', 'windows' => 'Greek'], 'es' => ['iso' => 'es_ES', 'windows' => 'Spanish'], 'es_AR' => ['iso' => 'es_AR', 'windows' => 'Spanish'], 'et' => ['iso' => 'et_EE', 'windows' => 'Estonian'], @@ -116,12 +117,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, ]);