X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a4f6bc63f007e159068a497d558a189829dcd6ab..refs/pull/438/head:/app/Http/Middleware/Localization.php diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php index 31cb5d9a2..14c87c377 100644 --- a/app/Http/Middleware/Localization.php +++ b/app/Http/Middleware/Localization.php @@ -15,7 +15,17 @@ class Localization public function handle($request, Closure $next) { $defaultLang = config('app.locale'); - $locale = setting()->getUser(user(), 'language', $defaultLang); + if (user()->isDefault()) { + $locale = $defaultLang; + $availableLocales = config('app.locales'); + foreach ($request->getLanguages() as $lang) { + if (!in_array($lang, $availableLocales)) continue; + $locale = $lang; + break; + } + } else { + $locale = setting()->getUser(user(), 'language', $defaultLang); + } app()->setLocale($locale); Carbon::setLocale($locale); return $next($request);