fix: SetLocale fallback redirect (#628)

code4romania · Feb 22, 2024 · 0a217a2 · 0a217a2
1 parent acd6b41
commit 0a217a2
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/app/Http/Middleware/Front/SetLocale.php b/app/Http/Middleware/Front/SetLocale.php
@@ -20,6 +20,13 @@ public function handle(Request $request, Closure $next)
     {
         $locale = $request->segment(1);
 
+        // Set default locale as fallback
+        tap(settings('site.default_locale'), function ($locale) {
+            if (active_locales()->has($locale)) {
+                app()->setFallbackLocale($locale);
+            }
+        });
+
         if (! active_locales()->has($locale)) {
             return redirect()->to(
                 collect($request->segments())
@@ -30,13 +37,6 @@ public function handle(Request $request, Closure $next)
 
         app()->setLocale($locale);
 
-        // Set default locale as fallback
-        tap(settings('site.default_locale'), function ($locale) {
-            if (active_locales()->has($locale)) {
-                app()->setFallbackLocale($locale);
-            }
-        });
-
         return $next($request);
     }
 }