]> BookStack Code Mirror - bookstack/commitdiff
Removed html dir tag for now, Updated lang format
authorDan Brown <redacted>
Sun, 18 Aug 2019 17:57:35 +0000 (18:57 +0100)
committerDan Brown <redacted>
Sun, 18 Aug 2019 17:57:35 +0000 (18:57 +0100)
app/Http/Middleware/Localization.php
resources/views/base.blade.php
resources/views/books/export.blade.php
resources/views/chapters/export.blade.php
resources/views/pages/export.blade.php
resources/views/vendor/notifications/email.blade.php

index 29a4369548b4af622c9b60ee3f8b376c162b7e49..b5e702781ef53b6d7bd28b76cbe5ca42728a283b 100644 (file)
@@ -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)) {
index 456923c4ed5e221420d22c64e6be99bb0b630f71..bb0a8cdda7f94dbae7c6cf2b4e286bcb924938f5 100644 (file)
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ config('app.lang') }}" dir="{{ config('app.rtl') ? 'rtl' : 'ltr' }}" class="@yield('body-class')">
+<html lang="{{ config('app.lang') }}" class="@yield('body-class')">
 <head>
     <title>{{ isset($pageTitle) ? $pageTitle . ' | ' : '' }}{{ setting('app-name') }}</title>
 
index fd1ba3fd1b0aff3b7d005f794f9dde6c0ad4382e..4a7c45e0b81ce1b1cedcd431e94e269a19d95739 100644 (file)
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="{{ config('app.lang') }}" dir="{{ config('app.rtl') ? 'rtl' : 'ltr' }}">
+<html lang="{{ config('app.lang') }}">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>{{ $book->name }}</title>
index 5fae78269215a3cf719a4820f31f51fad5d6bbb1..580c123ccf6d7901491f80e943ff03a264ae3bb6 100644 (file)
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="{{ config('app.lang') }}" dir="{{ config('app.rtl') ? 'rtl' : 'ltr' }}">
+<html lang="{{ config('app.lang') }}">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>{{ $chapter->name }}</title>
index 970db3c2f2b820c0534876261847bd7a0abd0935..4746a56f37842a5f54dfe13cc1c4a1a4d6586b96 100644 (file)
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="{{ config('app.lang') }}" dir="{{ config('app.rtl') ? 'rtl' : 'ltr' }}">
+<html lang="{{ config('app.lang') }}">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>{{ $page->name }}</title>
index 1b14adb28780a66a51be82f1ac76f2c97181ed10..f73b87b597853ccf5becce9eacbf5c4c7db68048 100644 (file)
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="{{ config('app.lang') }}" dir="{{ config('app.rtl') ? 'rtl' : 'ltr' }}">
+<html lang="{{ config('app.lang') }}">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />