From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 9 Dec 2020 07:04:49 +0000 (+0100)
Subject: wip #3753
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=40077af0fdb6e061c3663dba426d7cc7dcc52783;p=cubist_cms-back.git

wip #3753
---

diff --git a/src/app/Middleware/BackLocaleSelector.php b/src/app/Middleware/BackLocaleSelector.php
index e913396..7635ab1 100644
--- a/src/app/Middleware/BackLocaleSelector.php
+++ b/src/app/Middleware/BackLocaleSelector.php
@@ -4,6 +4,8 @@
 namespace Cubist\Backpack\Middleware;
 
 
+use Closure;
+use Cubist\Locale\Locale;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 
@@ -12,8 +14,17 @@ class BackLocaleSelector extends CubistMiddleware
     public function handle(Request $request, Closure $next)
     {
         parent::handle($request, $next);
-
-        $locale='fr';
+        $availableLanguages = config('backpack.base.locales', ['en']);
+
+        $user = backpack_user();
+        if (null === $user) {
+            $locale = $request->getPreferredLanguage($availableLanguages);
+        } else {
+            $locale = $user->locale;
+        }
+        if (!isset($locale) || !in_array($locale, $availableLanguages, true)) {
+            $locale = $availableLanguages[0];
+        }
         $this->setLocale($locale);
 
         return $this->getResponse();