Add error messages, fix LDAP error

[bookstack] / app / Http / Middleware / Localization.php

diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php
index 528ff40478dbeb92f436ee747b0cb9f07b9071d8..07852bb00f735a8f265a80c8ac0c7a204a193ba6 100644 (file)
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@ -7,8 +7,38 @@ use Illuminate\Http\Request;
 class Localization
 {
 
 class Localization
 {
 

+    /**
+     * Array of right-to-left locales
+     * @var array
+     */

     protected $rtlLocales = ['ar'];
 
     protected $rtlLocales = ['ar'];
 

+    /**
+     * Map of BookStack locale names to best-estimate system locale names.
+     * @var array
+     */
+    protected $localeMap = [
+        'ar' => 'ar',
+        'de' => 'de_DE',
+        'de_informal' => 'de_DE',
+        'en' => 'en_GB',
+        'es' => 'es_ES',
+        'es_AR' => 'es_AR',
+        'fr' => 'fr_FR',
+        'it' => 'it_IT',
+        'ja' => 'ja',
+        'kr' => 'ko_KR',
+        'nl' => 'nl_NL',
+        'pl' => 'pl_PL',
+        'pt_BR' => 'pt_BR',
+        'ru' => 'ru',
+        'sk' => 'sk_SK',
+        'sv' => 'sv_SE',
+        'uk' => 'uk_UA',
+        'zh_CN' => 'zh_CN',
+        'zh_TW' => 'zh_TW',
+    ];
+

     /**
      * Handle an incoming request.
      *
     /**
      * Handle an incoming request.
      *


@@ -19,6 +49,7 @@ class Localization
     public function handle($request, Closure $next)
     {
         $defaultLang = config('app.locale');
     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);
 
         if (user()->isDefault() && config('app.auto_detect_locale')) {
             $locale = $this->autoDetectLocale($request, $defaultLang);


@@ -33,6 +64,7 @@ class Localization
 
         app()->setLocale($locale);
         Carbon::setLocale($locale);
 
         app()->setLocale($locale);
         Carbon::setLocale($locale);

+        $this->setSystemDateLocale($locale);

         return $next($request);
     }
 
         return $next($request);
     }
 


@@ -53,4 +85,18 @@ class Localization
         }
         return $default;
     }
         }
         return $default;
     }

+
+    /**
+     * 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->localeMap[$locale] ?? $locale;
+        $set = setlocale(LC_TIME, $systemLocale);
+        if ($set === false) {
+            setlocale(LC_TIME, $systemLocale . '.utf8');
+        }
+    }

 }
 }