Fix French translations

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

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

-    protected $rtlLocales = ['ar'];
+    /**
+     * Array of right-to-left locales
+     */
+    protected $rtlLocales = ['ar', 'he'];
+
+    /**
+     * Map of BookStack locale names to best-estimate system locale names.
+     */
+    protected $localeMap = [
+        'ar' => 'ar',
+        'bg' => 'bg_BG',
+        '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',
+        'nb' => 'nb_NO',
+        '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.
 
     /**
      * Handle an incoming request.


@@ -19,12 +55,10 @@ 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);
-        } else {
-            $locale = setting()->getUser(user(), 'language', $defaultLang);
-        }
+        $locale = $this->getUserLocale($request, $defaultLang);
+        config()->set('app.lang', str_replace('_', '-', $this->getLocaleIso($locale)));

 
         // Set text direction
         if (in_array($locale, $this->rtlLocales)) {
 
         // Set text direction
         if (in_array($locale, $this->rtlLocales)) {


@@ -33,17 +67,33 @@ class Localization
 
         app()->setLocale($locale);
         Carbon::setLocale($locale);
 
         app()->setLocale($locale);
         Carbon::setLocale($locale);

+        $this->setSystemDateLocale($locale);

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

+    /**
+     * Get the locale specifically for the currently logged in user if available.
+     */
+    protected function getUserLocale(Request $request, string $default): string
+    {
+        try {
+            $user = user();
+        } catch (\Exception $exception) {
+            return $default;
+        }
+
+        if ($user->isDefault() && config('app.auto_detect_locale')) {
+            return $this->autoDetectLocale($request, $default);
+        }
+
+        return setting()->getUser($user, 'language', $default);
+    }
+

     /**
      * Autodetect the visitors locale by matching locales in their headers
      * against the locales supported by BookStack.
     /**
      * Autodetect the visitors locale by matching locales in their headers
      * against the locales supported by BookStack.

-     * @param Request $request
-     * @param string $default
-     * @return string

      */
      */

-    protected function autoDetectLocale(Request $request, string $default)
+    protected function autoDetectLocale(Request $request, string $default): string

     {
         $availableLocales = config('app.locales');
         foreach ($request->getLanguages() as $lang) {
     {
         $availableLocales = config('app.locales');
         foreach ($request->getLanguages() as $lang) {


@@ -53,4 +103,25 @@ class Localization
         }
         return $default;
     }
         }
         return $default;
     }

+
+    /**
+     * Get the ISO version of a BookStack language name
+     */
+    public function getLocaleIso(string $locale): string
+    {
+        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.
+     */
+    protected function setSystemDateLocale(string $locale)
+    {
+        $systemLocale = $this->getLocaleIso($locale);
+        $set = setlocale(LC_TIME, $systemLocale);
+        if ($set === false) {
+            setlocale(LC_TIME, $systemLocale . '.utf8');
+        }
+    }

 }
 }