From 35bc5a6c4f7b60f6aa789b9f6a9c489049dbc314 Mon Sep 17 00:00:00 2001
From: Vincent BRIDIER <vincent.bridier@ldc.fr>
Date: Wed, 16 Nov 2022 10:51:46 +0100
Subject: [PATCH] Fix Lang Middleware

---
 app/Http/Middleware/LangCheck.php | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/Http/Middleware/LangCheck.php b/app/Http/Middleware/LangCheck.php
index 11ca98c..e7a98f5 100644
--- a/app/Http/Middleware/LangCheck.php
+++ b/app/Http/Middleware/LangCheck.php
@@ -5,7 +5,6 @@ namespace App\Http\Middleware;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cookie;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\View;
 
 class LangCheck
@@ -21,8 +20,6 @@ class LangCheck
     {
 
         $routName = $request->route()->getName();
-
-        $routeParams = Route::current()->parameters();
         if (preg_match('/^bo\./', $routName)) {
             // Back office.
             if ($request->lang) {
@@ -42,31 +39,25 @@ class LangCheck
             } else {
                 // Not specified in route.
                 if ($this->checkFirstAccess($request)) {
-                    $routNameEN = 'en.' . $routName;
-                    $routNameES = 'es.' . $routName;
                     $sess_lang  = $request->session()->get('lang', config('app.locale'));
-                    switch ($sess_lang) {
-                        case 'en':
-                            return redirect()->route($routNameEN, $routeParams);
-                        case 'es':
-                            return redirect()->route($routNameES, $routeParams);
+                    if ($sess_lang === config('app.locale')) {
+                        return redirect()->route($routName);
                     }
+                    return redirect()->route($sess_lang . $routName);
                 }
-
-                $langset = 'fr';
-                $this->saveUserLocale($langset, $request);
+                $this->saveUserLocale(
+                    config('app.locale'),
+                    $request
+                );
             } //end if
-        }//end if
-
-
+        } //end if
 
         $sess_lang = $request->session()->get('lang', config('app.locale'));
-        app()->setLocale($sess_lang);
-        config(['app.locale' => $sess_lang]);
         $routePrefixer = "";
         if ($sess_lang != config('app.locale')) {
             $routePrefixer = $sess_lang . '.';
         }
+        app()->setLocale($sess_lang);
         View::share('routeprefixer', $routePrefixer);
         return $next($request);
     }