fixed language switching in the frontend

app/Http/Middleware/HandleInertiaRequests.php

@@ -5,6 +5,7 @@ namespace App\Http\Middleware;
 use Illuminate\Foundation\Inspiring;
 use Illuminate\Http\Request;
 use Inertia\Middleware;
+use App\Support\LocaleConfig;
 
 class HandleInertiaRequests extends Middleware
 {
@@ -38,19 +39,10 @@ class HandleInertiaRequests extends Middleware
     {
         [$message, $author] = str(Inspiring::quotes()->random())->explode('-');
 
-        $supportedLocales = collect(explode(',', (string) env('APP_SUPPORTED_LOCALES', 'de,en')))
-            ->map(fn ($l) => trim((string) $l))
-            ->filter()
-            ->unique()
-            ->values()
-            ->all();
+        $supportedLocales = LocaleConfig::normalized();
+        $defaultLocale = LocaleConfig::canonicalize($supportedLocales[0] ?? null);
 
-        if (empty($supportedLocales)) {
-            $supportedLocales = array_values(array_unique(array_filter([
-                config('app.locale'),
-                config('app.fallback_locale'),
-            ])));
-        }
+        $currentLocale = LocaleConfig::canonicalize($request->route('locale') ?? $request->segment(1) ?? app()->getLocale());
 
         return [
             ...parent::share($request),
@@ -60,9 +52,10 @@ class HandleInertiaRequests extends Middleware
                 'user' => $request->user(),
             ],
             'supportedLocales' => $supportedLocales,
+            'defaultLocale' => $defaultLocale,
             'appUrl' => rtrim(config('app.url'), '/'),
             'sidebarOpen' => $request->cookie('sidebar_state', 'false') === 'true',
-            'locale' => app()->getLocale(),
+            'locale' => $currentLocale,
             'translations' => [
                 'marketing' => __('marketing'),
                 'auth' => __('auth'),

app/Http/Middleware/SetLocaleFromRequest.php

@@ -6,16 +6,18 @@ use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Session;
+use App\Support\LocaleConfig;
 
 class SetLocaleFromRequest
 {
     public function handle(Request $request, Closure $next)
     {
-        $supportedLocales = $this->supportedLocales();
+        $supportedLocales = LocaleConfig::normalized();
 
-        $locale = (string) $request->route('locale');
+        $locale = (string) ($request->route('locale') ?? $request->segment(1));
+        $normalizedLocale = LocaleConfig::canonicalize($locale);
 
-        if (! $locale || ! in_array($locale, $supportedLocales, true)) {
+        if (! $locale || ! in_array($normalizedLocale, $supportedLocales, true)) {
             $preferred = Session::get('preferred_locale');
 
             if ($preferred && in_array($preferred, $supportedLocales, true)) {
@@ -27,35 +29,11 @@ class SetLocaleFromRequest
             return $next($request);
         }
 
-        App::setLocale($locale);
-        Session::put('preferred_locale', $locale);
-        Session::put('locale', $locale);
-        $request->attributes->set('preferred_locale', $locale);
+        App::setLocale($normalizedLocale);
+        Session::put('preferred_locale', $normalizedLocale);
+        Session::put('locale', $normalizedLocale);
+        $request->attributes->set('preferred_locale', $normalizedLocale);
 
         return $next($request);
     }
-
-    /**
-     * @return array<int, string>
-     */
-    private function supportedLocales(): array
-    {
-        $configured = array_filter(array_map(
-            static fn ($value) => trim((string) $value),
-            explode(',', (string) env('APP_SUPPORTED_LOCALES', ''))
-        ));
-
-        if (empty($configured)) {
-            $configured = array_filter([
-                config('app.locale'),
-                config('app.fallback_locale'),
-            ]);
-        }
-
-        if (empty($configured)) {
-            $configured = ['de', 'en'];
-        }
-
-        return array_values(array_unique($configured));
-    }
 }