X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/1cb6ae39c8a6eedad457a37ce406c8c0a700bc80..refs/pull/2022/head:/app/Http/Middleware/Localization.php

diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php
index 528ff4047..d24e8a9b5 100644
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@ -7,7 +7,43 @@ use Illuminate\Http\Request;
 class Localization
 {
 
-    protected $rtlLocales = ['ar'];
+    /**
+     * Array of right-to-left locales
+     * @var array
+     */
+    protected $rtlLocales = ['ar', 'he'];
+
+    /**
+     * Map of BookStack locale names to best-estimate system locale names.
+     * @var array
+     */
+    protected $localeMap = [
+        'ar' => 'ar',
+        'da' => 'da_DK',
+        'de' => 'de_DE',
+        'de_informal' => 'de_DE',
+        'en' => 'en_GB',
+        'es' => 'es_ES',
+        'es_AR' => 'es_AR',
+        'fr' => 'fr_FR',
+        'he' => 'he_IL',
+        'it' => 'it_IT',
+        'ja' => 'ja',
+        'ko' => 'ko_KR',
+        'nl' => 'nl_NL',
+        'pl' => 'pl_PL',
+        'pt' => 'pl_PT',
+        'pt_BR' => 'pt_BR',
+        'ru' => 'ru',
+        'sk' => 'sk_SK',
+        'sl' => 'sl_SI',
+        'sv' => 'sv_SE',
+        'uk' => 'uk_UA',
+        'vi' => 'vi_VN',
+        'zh_CN' => 'zh_CN',
+        'zh_TW' => 'zh_TW',
+        'tr' => 'tr_TR',
+    ];
 
     /**
      * Handle an incoming request.
@@ -19,6 +55,7 @@ class Localization
     public function handle($request, Closure $next)
     {
         $defaultLang = config('app.locale');
+        config()->set('app.default_locale', $defaultLang);
 
         if (user()->isDefault() && config('app.auto_detect_locale')) {
             $locale = $this->autoDetectLocale($request, $defaultLang);
@@ -26,6 +63,8 @@ class Localization
             $locale = setting()->getUser(user(), 'language', $defaultLang);
         }
 
+        config()->set('app.lang', str_replace('_', '-', $this->getLocaleIso($locale)));
+
         // Set text direction
         if (in_array($locale, $this->rtlLocales)) {
             config()->set('app.rtl', true);
@@ -33,6 +72,7 @@ class Localization
 
         app()->setLocale($locale);
         Carbon::setLocale($locale);
+        $this->setSystemDateLocale($locale);
         return $next($request);
     }
 
@@ -53,4 +93,28 @@ class Localization
         }
         return $default;
     }
+
+    /**
+     * Get the ISO version of a BookStack language name
+     * @param  string $locale
+     * @return string
+     */
+    public function getLocaleIso(string $locale)
+    {
+        return $this->localeMap[$locale] ?? $locale;
+    }
+
+    /**
+     * Set the system date locale for localized date formatting.
+     * Will try both the standard locale name and the UTF8 variant.
+     * @param string $locale
+     */
+    protected function setSystemDateLocale(string $locale)
+    {
+        $systemLocale = $this->getLocaleIso($locale);
+        $set = setlocale(LC_TIME, $systemLocale);
+        if ($set === false) {
+            setlocale(LC_TIME, $systemLocale . '.utf8');
+        }
+    }
 }