From 666213a4d4056d57a50a51719cd89d6039055003 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 18 Aug 2019 18:57:35 +0100 Subject: [PATCH] Removed html dir tag for now, Updated lang format --- app/Http/Middleware/Localization.php | 2 +- resources/views/base.blade.php | 2 +- resources/views/books/export.blade.php | 2 +- resources/views/chapters/export.blade.php | 2 +- resources/views/pages/export.blade.php | 2 +- resources/views/vendor/notifications/email.blade.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Middleware/Localization.php b/app/Http/Middleware/Localization.php index 29a436954..b5e702781 100644 --- a/app/Http/Middleware/Localization.php +++ b/app/Http/Middleware/Localization.php @@ -57,7 +57,7 @@ class Localization $locale = setting()->getUser(user(), 'language', $defaultLang); } - config()->set('app.lang', $this->getLocaleIso($locale)); + config()->set('app.lang', str_replace('_', '-', $this->getLocaleIso($locale))); // Set text direction if (in_array($locale, $this->rtlLocales)) { diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 456923c4e..bb0a8cdda 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -1,5 +1,5 @@ - + {{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }} diff --git a/resources/views/books/export.blade.php b/resources/views/books/export.blade.php index fd1ba3fd1..4a7c45e0b 100644 --- a/resources/views/books/export.blade.php +++ b/resources/views/books/export.blade.php @@ -1,5 +1,5 @@ - + {{ $book->name }} diff --git a/resources/views/chapters/export.blade.php b/resources/views/chapters/export.blade.php index 5fae78269..580c123cc 100644 --- a/resources/views/chapters/export.blade.php +++ b/resources/views/chapters/export.blade.php @@ -1,5 +1,5 @@ - + {{ $chapter->name }} diff --git a/resources/views/pages/export.blade.php b/resources/views/pages/export.blade.php index 970db3c2f..4746a56f3 100644 --- a/resources/views/pages/export.blade.php +++ b/resources/views/pages/export.blade.php @@ -1,5 +1,5 @@ - + {{ $page->name }} diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php index 1b14adb28..f73b87b59 100644 --- a/resources/views/vendor/notifications/email.blade.php +++ b/resources/views/vendor/notifications/email.blade.php @@ -1,5 +1,5 @@ - +