webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Merge branch 'master' into 2019-design

Browse Source
This commit is contained in:
Dan Brown
2019-03-10 21:40:02 +00:00
parent 035a0d8efb 00703fa817
commit 5f2d226f09
27 changed files with 386 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Middleware/Localization.php
View File

@ -51,6 +51,7 @@ class Localization
public function handle($request, Closure $next)
{
$defaultLang = config('app.locale');
config()->set('app.default_locale', $defaultLang);
if (user()->isDefault() && config('app.auto_detect_locale')) {
$locale = $this->autoDetectLocale($request, $defaultLang);
@ -63,8 +64,6 @@ class Localization
config()->set('app.rtl', true);
}
app()->setLocale($locale);
Carbon::setLocale($locale);
$this->setSystemDateLocale($locale);