localization fix try 2
This commit is contained in:
parent
8c1612e1ec
commit
8aa0694876
|
|
@ -21,6 +21,7 @@ class Kernel extends HttpKernel
|
|||
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
|
||||
\App\Http\Middleware\TrimStrings::class,
|
||||
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
|
||||
'web_localization',
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -65,5 +66,6 @@ class Kernel extends HttpKernel
|
|||
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
|
||||
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
|
||||
'check_october_session' => \App\Http\Middleware\CheckOctoberSession::class,
|
||||
'web_localization' => \App\Http\Middleware\WebLocalization::class
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
<?php
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Config;
|
||||
|
||||
class WebLocalization
|
||||
{
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
$raw_locale = $request->session()->get('locale');
|
||||
if (in_array($raw_locale, Config::get('app.locales'))) {
|
||||
$locale = $raw_locale;
|
||||
}
|
||||
else $locale = Config::get('app.locale');
|
||||
$request->session()->put('locale', $locale ?? 'en');
|
||||
app()->setLocale($locale);
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue