From f1b1f6e26676b6f2214c13d607839b8b48ab31c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Cmit=20Tun=C3=A7?= <umitreva@gmail.com>
Date: Tue, 4 Nov 2025 15:40:53 -0300
Subject: [PATCH] Add locale management middleware: Introduced SetLocale
 middleware to handle language settings based on user session and available
 languages. Updated app bootstrap to include the middleware, ensuring proper
 localization support throughout the application. Enhanced language selector
 component for improved user experience.

---
 app/Http/Middleware/SetLocale.php             | 52 +++++++++++++++++++
 bootstrap/app.php                             |  4 +-
 .../custom/language-selector.blade.php        |  6 +--
 3 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 app/Http/Middleware/SetLocale.php

diff --git a/app/Http/Middleware/SetLocale.php b/app/Http/Middleware/SetLocale.php
new file mode 100644
index 0000000..432bc9d
--- /dev/null
+++ b/app/Http/Middleware/SetLocale.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Symfony\Component\HttpFoundation\Response;
+
+class SetLocale
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        // Session'dan locale'i al, yoksa varsayılan dil kodunu kullan
+        $locale = session('locale');
+        
+        // Eğer session'da locale yoksa, varsayılan dil kodunu kullan
+        if (!$locale) {
+            if (function_exists('default_language_code')) {
+                $locale = default_language_code();
+            } else {
+                $locale = config('app.locale');
+            }
+        }
+        
+        // Aktif dilleri veritabanından kontrol et
+        if (function_exists('available_language_codes')) {
+            $availableLocales = available_language_codes();
+        } else {
+            $availableLocales = ['tr', 'en'];
+        }
+        
+        // Locale'i aktif diller arasında kontrol et
+        if (in_array($locale, $availableLocales)) {
+            App::setLocale($locale);
+        } else {
+            // Geçersiz locale ise varsayılan locale'e dön
+            if (function_exists('default_language_code')) {
+                App::setLocale(default_language_code());
+            } else {
+                App::setLocale(config('app.locale'));
+            }
+        }
+
+        return $next($request);
+    }
+}
diff --git a/bootstrap/app.php b/bootstrap/app.php
index c183276..ca1d20c 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -11,7 +11,9 @@ return Application::configure(basePath: dirname(__DIR__))
         health: '/up',
     )
     ->withMiddleware(function (Middleware $middleware): void {
-        //
+        $middleware->web(append: [
+            \App\Http\Middleware\SetLocale::class,
+        ]);
     })
     ->withExceptions(function (Exceptions $exceptions): void {
         //
diff --git a/resources/views/components/custom/language-selector.blade.php b/resources/views/components/custom/language-selector.blade.php
index 4589a54..9ccf5ae 100644
--- a/resources/views/components/custom/language-selector.blade.php
+++ b/resources/views/components/custom/language-selector.blade.php
@@ -1,15 +1,13 @@
 @php
     $languages = available_languages();
     $currentLang = current_language_code();
+    $currentLanguage = $languages->firstWhere('code', $currentLang);
 @endphp
 
 <div class="navbar-other w-full !flex !ml-auto">
     <ul class="navbar-nav !flex-row !items-center !ml-auto">
       <li class="nav-item dropdown language-select uppercase group">
         <a class="nav-link dropdown-item dropdown-toggle xl:!text-[.85rem] lg:!text-[.85rem] max-lg:!text-[1.05rem]" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          @php
-              $currentLanguage = $languages->firstWhere('code', $currentLang);
-          @endphp
           @if($currentLanguage)
            {{ strtoupper($currentLanguage->code) }}
           @else
@@ -19,7 +17,7 @@
         <ul class="dropdown-menu group-hover:shadow-[0_0.25rem_0.75rem_rgba(30,34,40,0.15)]">
           @foreach($languages as $language)
             <li class="nav-item">
-              <a class="dropdown-item hover:!text-[#747ed1] {{ $language->code === $currentLang ? 'active' : '' }}" 
+              <a class="dropdown-item hover:!text-[#747ed1] {{ $language->code === $currentLang ? 'active font-bold !text-[#3f78e0]' : '' }}" 
                  href="{{ route('language.switch', $language->code) }}">
               {{ strtoupper($language->code) }}
               </a>