From f6d2dea7163742cf0153fd23230b7baef140bd40 Mon Sep 17 00:00:00 2001
From: Amanmyrat <tekemuradov@gmail.com>
Date: Mon, 5 Dec 2022 15:18:48 +0500
Subject: [PATCH] locale fix

---
 .../Controllers/Admin/LocalizationController.php     | 12 ++++++------
 app/Http/Middleware/WebLocalization.php              |  1 +
 .../vendor/backpack/base/inc/breadcrumbs.blade.php   |  6 +++---
 routes/web.php                                       |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Admin/LocalizationController.php b/app/Http/Controllers/Admin/LocalizationController.php
index 6f18c1f..da4c9c3 100644
--- a/app/Http/Controllers/Admin/LocalizationController.php
+++ b/app/Http/Controllers/Admin/LocalizationController.php
@@ -8,17 +8,17 @@ use Illuminate\Support\Facades\App;
 
 class LocalizationController extends Controller
 {
-    public function setLang(Request $request){
-        if($request->lang == 'ru'){
-            $request->session()->put('locale', $request->lang);
+    public function setLang($lang){
+        if($lang == 'ru'){
+            session()->put('locale', $lang);
             App::setLocale('ru');
         }
-        elseif($request->lang == 'tm'){
-            $request->session()->put('locale', $request->lang);
+        elseif($lang == 'tm'){
+            session()->put('locale', $lang);
             App::setLocale('tm');
         }
         else{
-            $request->session()->put('locale', $request->lang);
+            session()->put('locale', $lang);
             App::setLocale('en');
         }
         return redirect()->back();
diff --git a/app/Http/Middleware/WebLocalization.php b/app/Http/Middleware/WebLocalization.php
index 9f1c46c..f736a1e 100644
--- a/app/Http/Middleware/WebLocalization.php
+++ b/app/Http/Middleware/WebLocalization.php
@@ -17,6 +17,7 @@ class WebLocalization
     public function handle(Request $request, Closure $next)
     {
         $raw_locale = $request->session()->get('locale');
+        
         if (in_array($raw_locale, Config::get('app.locales'))) {
             $locale = $raw_locale;
         }
diff --git a/resources/views/vendor/backpack/base/inc/breadcrumbs.blade.php b/resources/views/vendor/backpack/base/inc/breadcrumbs.blade.php
index 87b9966..5bebc7e 100644
--- a/resources/views/vendor/backpack/base/inc/breadcrumbs.blade.php
+++ b/resources/views/vendor/backpack/base/inc/breadcrumbs.blade.php
@@ -28,9 +28,9 @@
                     </svg> &nbsp; {{ app()->getLocale() }}
                   </button>
                   <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="">
-                    <a class="dropdown-item" href="/set-lang?lang=ru">RU</a>
-                    <a class="dropdown-item" href="/set-lang?lang=en">EN</a>
-                    <a class="dropdown-item" href="/set-lang?lang=tm">TM</a>
+                    <a class="dropdown-item" href="/set-lang/ru">RU</a>
+                    <a class="dropdown-item" href="/set-lang/en">EN</a>
+                    <a class="dropdown-item" href="/set-lang/tm">TM</a>
                   </div>
                 </div>
             </div>
diff --git a/routes/web.php b/routes/web.php
index 810d255..6b80ef8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -62,4 +62,4 @@ Route::group(['middleware' => 'auth:sanctum'], function () {
 
     Route::get('logout-confirm', [HomeController::class, 'logoutConfirm'])->name('logout_confirm');
 });
-Route::get('/set-lang', [LocalizationController::class, 'setLang']);
\ No newline at end of file
+Route::get('/set-lang/{lang}', [LocalizationController::class, 'setLang']);
\ No newline at end of file