From 9943fb28dd2035ec05e421cc1031ca2b6c10270d Mon Sep 17 00:00:00 2001 From: 1Day Date: Thu, 16 Dec 2021 11:06:54 +0100 Subject: [PATCH] Updates --- .../Controllers/TranslationController.php | 21 +++++++++++++++++++ app/Http/Kernel.php | 2 +- app/Http/Middleware/SetLocale.php | 7 ++++--- resources/views/layouts/main.blade.php | 12 +++++++++++ routes/web.php | 3 +++ 5 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 app/Http/Controllers/TranslationController.php diff --git a/app/Http/Controllers/TranslationController.php b/app/Http/Controllers/TranslationController.php new file mode 100644 index 00000000..40a6bd05 --- /dev/null +++ b/app/Http/Controllers/TranslationController.php @@ -0,0 +1,21 @@ +inputLocale); + return redirect()->back(); + } +} diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index fb20e60e..7aea78bf 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -26,7 +26,6 @@ class Kernel extends HttpKernel \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, - \App\Http\Middleware\SetLocale::class, ]; /** @@ -45,6 +44,7 @@ class Kernel extends HttpKernel \Illuminate\Routing\Middleware\SubstituteBindings::class, LastSeen::class, CreditsDisplayName::class, + \App\Http\Middleware\SetLocale::class, ], 'api' => [ diff --git a/app/Http/Middleware/SetLocale.php b/app/Http/Middleware/SetLocale.php index dd8aef33..712e3858 100644 --- a/app/Http/Middleware/SetLocale.php +++ b/app/Http/Middleware/SetLocale.php @@ -3,6 +3,7 @@ namespace App\Http\Middleware; use Closure; +use Illuminate\Http\Request; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Session; @@ -12,8 +13,8 @@ class SetLocale * * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param Request $request + * @param Closure $next * @return mixed */ public function handle($request, Closure $next) @@ -23,7 +24,7 @@ class SetLocale } else { $locale = substr($request->server('HTTP_ACCEPT_LANGUAGE'), 0, 2); - if (!in_array($locale,config('app.available_locales'))) { + if (!in_array($locale, config('app.available_locales'))) { $locale = config('app.locale'); } } diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index 46019818..5266ff9d 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -46,6 +46,18 @@ + +
+ @csrf + +
+ diff --git a/routes/web.php b/routes/web.php index ffbadb29..2e0cbc31 100644 --- a/routes/web.php +++ b/routes/web.php @@ -19,6 +19,7 @@ use App\Http\Controllers\ProductController as FrontProductController; use App\Http\Controllers\ProfileController; use App\Http\Controllers\ServerController; use App\Http\Controllers\StoreController; +use App\Http\Controllers\TranslationController; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Route; @@ -75,6 +76,8 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () { #voucher redeem Route::post('/voucher/redeem', [VoucherController::class, 'redeem'])->middleware('throttle:5,1')->name('voucher.redeem'); + #switch language + Route::post('changelocale', [TranslationController::class, 'changeLocale'])->name('changeLocale'); #admin Route::prefix('admin')->name('admin.')->middleware('admin')->group(function () {