Adding APP_VIEWS_BOOKSHELF to .ENV

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

diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php
index de48cb19619273ba60eceac771ff79657197d9af..597d2836548286ac8afb20f5677119f5b8ca2be3 100644 (file)
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@ -9,32 +9,37 @@ class Localization
 
     /**
      * Array of right-to-left locales
 
     /**
      * Array of right-to-left locales

-     * @var array

      */
      */

-    protected $rtlLocales = ['ar'];
+    protected $rtlLocales = ['ar', 'he'];

 
     /**
      * Map of BookStack locale names to best-estimate system locale names.
 
     /**
      * Map of BookStack locale names to best-estimate system locale names.

-     * @var array

      */
     protected $localeMap = [
         'ar' => 'ar',
      */
     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',
         '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',
         'it' => 'it_IT',
         'ja' => 'ja',
         'ko' => 'ko_KR',
         'nl' => 'nl_NL',

+        'nb' => 'nb_NO',

         'pl' => 'pl_PL',
         'pl' => 'pl_PL',

+        'pt' => 'pl_PT',

         'pt_BR' => 'pt_BR',
         'ru' => 'ru',
         'sk' => 'sk_SK',
         'pt_BR' => 'pt_BR',
         'ru' => 'ru',
         'sk' => 'sk_SK',

+        'sl' => 'sl_SI',

         'sv' => 'sv_SE',
         'uk' => 'uk_UA',
         'sv' => 'sv_SE',
         'uk' => 'uk_UA',

+        'vi' => 'vi_VN',

         'zh_CN' => 'zh_CN',
         'zh_TW' => 'zh_TW',
         'tr' => 'tr_TR',
         'zh_CN' => 'zh_CN',
         'zh_TW' => 'zh_TW',
         'tr' => 'tr_TR',


@@ -52,12 +57,7 @@ class Localization
         $defaultLang = config('app.locale');
         config()->set('app.default_locale', $defaultLang);
 
         $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
         config()->set('app.lang', str_replace('_', '-', $this->getLocaleIso($locale)));
 
         // Set text direction


@@ -71,14 +71,29 @@ class Localization
         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) {


@@ -91,10 +106,8 @@ class Localization
 
     /**
      * Get the ISO version of a BookStack language name
 
     /**
      * Get the ISO version of a BookStack language name

-     * @param  string $locale
-     * @return string

      */
      */

-    public function getLocaleIso(string $locale)
+    public function getLocaleIso(string $locale): string

     {
         return $this->localeMap[$locale] ?? $locale;
     }
     {
         return $this->localeMap[$locale] ?? $locale;
     }


@@ -102,7 +115,6 @@ class Localization
     /**
      * Set the system date locale for localized date formatting.
      * Will try both the standard locale name and the UTF8 variant.
     /**
      * 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)
     {
      */
     protected function setSystemDateLocale(string $locale)
     {