From 5afe23e9735a2df6fc66dde9ca8d231f1a9745ae Mon Sep 17 00:00:00 2001
From: "Pedro X." <pxpm88@gmail.com>
Date: Wed, 17 Jan 2024 13:41:28 +0000
Subject: [PATCH 1/2] fix routes

---
 resources/views/language-switcher.blade.php   |  9 ++++++++-
 routes/language-switcher.php                  | 20 +++++++++++--------
 .../LanguageSwitcherController.php            |  6 ++++--
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/resources/views/language-switcher.blade.php b/resources/views/language-switcher.blade.php
index 0b9ad18..50e2905 100644
--- a/resources/views/language-switcher.blade.php
+++ b/resources/views/language-switcher.blade.php
@@ -14,9 +14,16 @@
         @endif
     </a>
     <ul class="dropdown-menu dropdown-menu-right dropdown-menu-end" style="right: 0">
+        @php
+            $useAdminPrefix = config('backpack.language-switcher.use_backpack_route_prefix_on_admin_routes');
+        @endphp
         @foreach(config('backpack.crud.locales', []) as $locale => $name)
         <li>
-            <a class="dropdown-item {{ $locale === $helper->getCurrentLocale() ? 'active disabled' : '' }}" href="{{ route('language-switcher.locale', $locale) }}">
+            <a class="dropdown-item {{ $locale === $helper->getCurrentLocale() ? 'active disabled' : '' }}" href="{{ route('language-switcher.locale', [
+                    'locale' => $useAdminPrefix ? $locale : null, 
+                    'backpack_prefix' => $useAdminPrefix ? config('backpack.base.route_prefix') : 'set-locale',
+                    'setLocale' => $useAdminPrefix ? 'set-locale' : $locale
+                ])}}">
                 @if($flags ?? true)
                 <span class="nav-link-icon" style="width: fit-content">
                     <x-dynamic-component component="flag-{{ $helper->getFlagOrFallback($locale) }}" style="width: 1.5rem" />
diff --git a/routes/language-switcher.php b/routes/language-switcher.php
index 4a3f1cd..aa38dd1 100644
--- a/routes/language-switcher.php
+++ b/routes/language-switcher.php
@@ -11,11 +11,15 @@
 | handled by the Backpack\LanguageSwitcher package.
 |
 */
-Route::group([
-    'namespace' => 'Backpack\LanguageSwitcher\Http\Controllers',
-    'middleware' => ['web', 'throttle:60,1'],
-], function () {
-    // set locale
-    Route::any('set-locale/{locale}', [LanguageSwitcherController::class, 'setLocale'])
-        ->name('language-switcher.locale');
-});
+if(config('backpack.language-switcher.setup_routes')) {
+    Route::group([
+        'middleware' => ['web', 'throttle:60,1'],
+    ], function () {
+        // set locale
+        Route::any('{backpack_prefix?}/{setLocale}/{locale?}', [\Backpack\LanguageSwitcher\Http\Controllers\LanguageSwitcherController::class, 'setLocale'])
+            ->name('language-switcher.locale')
+            ->whereIn('setLocale', array_merge(['set-locale'],array_keys(config('backpack.crud.locales'))))
+            ->whereIn('backpack_prefix', ['set-locale', config('backpack.base.route_prefix')]);
+    });
+}
+
diff --git a/src/Http/Controllers/LanguageSwitcherController.php b/src/Http/Controllers/LanguageSwitcherController.php
index d98fc32..16a0696 100644
--- a/src/Http/Controllers/LanguageSwitcherController.php
+++ b/src/Http/Controllers/LanguageSwitcherController.php
@@ -16,12 +16,14 @@ class LanguageSwitcherController extends Controller
     /**
      * Set's the app locale
      */
-    public function setLocale(string $locale): Redirector | RedirectResponse
+    public function setLocale(?string $backpackPrefix = null, ?string $setLocale = null, ?string $locale = null): Redirector | RedirectResponse
     {
+        $locale ??= $setLocale;
+
         if (in_array($locale, array_keys(config('backpack.crud.locales')))) {
             Session::put('backpack.language-switcher.locale', $locale);
         }
 
-        return redirect(url()->previous());
+        return redirect()->back();
     }
 }

From fd13326db806c26d37bd338a0afb1a44a4756e12 Mon Sep 17 00:00:00 2001
From: "Pedro X." <pxpm88@gmail.com>
Date: Wed, 17 Jan 2024 13:43:18 +0000
Subject: [PATCH 2/2] fix

---
 routes/language-switcher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/language-switcher.php b/routes/language-switcher.php
index aa38dd1..7becba7 100644
--- a/routes/language-switcher.php
+++ b/routes/language-switcher.php
@@ -1,6 +1,6 @@
 <?php
 
-use Backpack\LanguageSwitcher\Http\Controllers\LanguageSwitcherController;
+use Illuminate\Support\Facades\Route;
 
 /*
 |--------------------------------------------------------------------------