Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Olivier Legat
d0c8b42eb6 fix direct access with non fr navigator 2022-11-16 18:14:26 +01:00
Vincent BRIDIER
20d1188e87
Merge branch 'trunk' 2022-11-16 10:52:08 +01:00
Vincent BRIDIER
564fbf424e
Merge branch 'develop' into trunk 2022-11-16 10:51:57 +01:00
Vincent BRIDIER
1028507a53
Merge branch 'trunk' 2022-11-16 09:22:08 +01:00
Vincent BRIDIER
280285caef
Merge branch 'develop' into trunk 2022-11-16 09:21:42 +01:00
Vincent BRIDIER
d97aac17a9
Merge remote-tracking branch 'origin/hotfix' 2022-09-22 13:41:48 +02:00

View file

@ -39,11 +39,11 @@ class LangCheck
} else {
// Not specified in route.
if ($this->checkFirstAccess($request)) {
$sess_lang = $request->session()->get('lang', config('app.locale'));
$sess_lang = $request->session()->get('lang', config('app.locale'));
if ($sess_lang === config('app.locale')) {
return redirect()->route($routName);
return redirect()->route($routName, $request->route()->parameters());
}
return redirect()->route($sess_lang . $routName);
return redirect()->route($sess_lang . '.' . $routName, $request->route()->parameters());
}
$this->saveUserLocale(
config('app.locale'),
@ -52,7 +52,7 @@ class LangCheck
} //end if
} //end if
$sess_lang = $request->session()->get('lang', config('app.locale'));
$sess_lang = $request->session()->get('lang', config('app.locale'));
$routePrefixer = "";
if ($sess_lang != config('app.locale')) {
$routePrefixer = $sess_lang . '.';