Add french language

Author: heloufir

app/Http/Controllers/Auth/LogoutController.php

@@ -12,7 +12,7 @@ class LogoutController extends Controller
     public function __invoke(Request $request)
     {
         Auth::logout();
-        $request->session()->invalidate();
+        // $request->session()->invalidate();
         $request->session()->regenerateToken();
         return redirect('/');
     }

app/Http/Kernel.php

@@ -64,5 +64,6 @@ class Kernel extends HttpKernel
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'can_access_ticket' => \App\Http\Middleware\CanAccessTicket::class,
+        'set_locale' => \App\Http\Middleware\LocaleMiddleware::class,
     ];
 }

app/Http/Livewire/Auth/Login.php

@@ -95,6 +95,7 @@ public function login(): void
             ]);
         }
 
+        session()->put('locale', auth()->user()->locale);
         redirect()->to(route('home'));
 
     }

app/Http/Livewire/MyNotifications.php

@@ -43,7 +43,7 @@ public function markAllRead(): void
         Notification::make()
             ->success()
             ->title(__('Notifications updated'))
-            ->body(__('All unread notifications is not marked as read'))
+            ->body(__('All unread notifications is marked as read'))
             ->send();
     }
 }

app/Http/Livewire/MyProfile.php

@@ -4,6 +4,7 @@
 
 use App\Models\User;
 use Filament\Forms\Components\Grid;
+use Filament\Forms\Components\Radio;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Concerns\InteractsWithForms;
@@ -42,7 +43,8 @@ private function initProfile(): void
         $this->user = User::where('id', auth()->user()->id)->first();
         $this->form->fill([
             'name' => $this->user->name,
-            'email' => $this->user->email
+            'email' => $this->user->email,
+            'locale' => $this->user->locale,
         ]);
         if (session()->has('profile_updated')) {
             Notification::make()
@@ -86,6 +88,14 @@ protected function getFormSchema(): array
                         ->label(__('Password confirmation'))
                         ->dehydrated(false),
                 ]),
+
+            Grid::make(1)
+                ->schema([
+                    Radio::make('locale')
+                        ->label(__('Default language'))
+                        ->options(locales())
+                        ->required()
+                ]),
         ];
     }
 
@@ -95,10 +105,12 @@ public function save(): void
         if (Hash::check($data['current_password'], $this->user->password)) {
             $this->user->name = $data['name'];
             $this->user->email = $data['email'];
+            $this->user->locale = $data['locale'];
             if ($data['new_password']) {
                 $this->user->password = bcrypt($data['new_password']);
             }
             $this->user->save();
+            session()->put('locale', $this->user->locale);
             session()->flash('profile_updated', true);
             redirect()->to(route('my-profile'));
         } else {

app/Http/Middleware/LocaleMiddleware.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class LocaleMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $locale = config('app.locale');
+        if (session()->has('locale') && in_array(session()->get('locale'), array_keys(config('system.locales')))) {
+            $locale = session()->get('locale');
+        } else if (auth()->user()?->locale && in_array(auth()->user()?->locale, array_keys(config('system.locales')))) {
+            $locale = auth()->user()?->locale;
+        }
+        app()->setLocale($locale);
+        return $next($request);
+    }
+}

app/Models/User.php

@@ -29,6 +29,7 @@ class User extends Authenticatable
         'password',
         'role',
         'register_token',
+        'locale',
     ];
 
     /**

app/helpers.php

@@ -147,3 +147,19 @@ function types_list(): array
         return $priorities;
     }
 }
+
+if (!function_exists('locales')) {
+    /**
+     * Return application locales as an array of KEY (locale id) => VALUE (locale title)
+     *
+     * @return array
+     */
+    function locales(): array
+    {
+        $roles = [];
+        foreach (config('system.locales') as $key => $value) {
+            $roles[$key] = __($value);
+        }
+        return $roles;
+    }
+}

composer.json

@@ -17,6 +17,7 @@
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
+        "kkomelin/laravel-translatable-string-exporter": "^1.17",
         "laravel/pint": "^1.0",
         "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.4",