Updated 'Spanish Argentina' translation.

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

diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php
index 31cb5d9a2bfb2e7eb1fb48c67ddf5d9419faca97..466c1442b92eca75c6fa692564ed163c16a00fca 100644 (file)
--- a/app/Http/Middleware/Localization.php
+++ b/app/Http/Middleware/Localization.php
@@ -15,7 +15,19 @@ class Localization
     public function handle($request, Closure $next)
     {
         $defaultLang = config('app.locale');
     public function handle($request, Closure $next)
     {
         $defaultLang = config('app.locale');

-        $locale = setting()->getUser(user(), 'language', $defaultLang);
+        if (user()->isDefault()) {
+            $locale = $defaultLang;
+            $availableLocales = config('app.locales');
+            foreach ($request->getLanguages() as $lang) {
+                if (!in_array($lang, $availableLocales)) {
+                    continue;
+                }
+                $locale = $lang;
+                break;
+            }
+        } else {
+            $locale = setting()->getUser(user(), 'language', $defaultLang);
+        }

         app()->setLocale($locale);
         Carbon::setLocale($locale);
         return $next($request);
         app()->setLocale($locale);
         Carbon::setLocale($locale);
         return $next($request);