Fix Lang Middleware
This commit is contained in:
parent
8530d45a35
commit
35bc5a6c4f
1 changed files with 9 additions and 18 deletions
|
|
@ -5,7 +5,6 @@ namespace App\Http\Middleware;
|
|||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Cookie;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use Illuminate\Support\Facades\View;
|
||||
|
||||
class LangCheck
|
||||
|
|
@ -21,8 +20,6 @@ class LangCheck
|
|||
{
|
||||
|
||||
$routName = $request->route()->getName();
|
||||
|
||||
$routeParams = Route::current()->parameters();
|
||||
if (preg_match('/^bo\./', $routName)) {
|
||||
// Back office.
|
||||
if ($request->lang) {
|
||||
|
|
@ -42,31 +39,25 @@ class LangCheck
|
|||
} else {
|
||||
// Not specified in route.
|
||||
if ($this->checkFirstAccess($request)) {
|
||||
$routNameEN = 'en.' . $routName;
|
||||
$routNameES = 'es.' . $routName;
|
||||
$sess_lang = $request->session()->get('lang', config('app.locale'));
|
||||
switch ($sess_lang) {
|
||||
case 'en':
|
||||
return redirect()->route($routNameEN, $routeParams);
|
||||
case 'es':
|
||||
return redirect()->route($routNameES, $routeParams);
|
||||
if ($sess_lang === config('app.locale')) {
|
||||
return redirect()->route($routName);
|
||||
}
|
||||
return redirect()->route($sess_lang . $routName);
|
||||
}
|
||||
|
||||
$langset = 'fr';
|
||||
$this->saveUserLocale($langset, $request);
|
||||
$this->saveUserLocale(
|
||||
config('app.locale'),
|
||||
$request
|
||||
);
|
||||
} //end if
|
||||
}//end if
|
||||
|
||||
|
||||
} //end if
|
||||
|
||||
$sess_lang = $request->session()->get('lang', config('app.locale'));
|
||||
app()->setLocale($sess_lang);
|
||||
config(['app.locale' => $sess_lang]);
|
||||
$routePrefixer = "";
|
||||
if ($sess_lang != config('app.locale')) {
|
||||
$routePrefixer = $sess_lang . '.';
|
||||
}
|
||||
app()->setLocale($sess_lang);
|
||||
View::share('routeprefixer', $routePrefixer);
|
||||
return $next($request);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue