From d89c394ba54bc113e29658e5207808f5f38550f7 Mon Sep 17 00:00:00 2001 From: 1Day Date: Wed, 5 Jan 2022 15:19:48 +0100 Subject: [PATCH] localization, fixes, formatting --- app/Http/Middleware/SetLocale.php | 2 +- .../admin/settings/tabs/language.blade.php | 26 +- resources/views/layouts/main.blade.php | 713 +++++++++--------- 3 files changed, 373 insertions(+), 368 deletions(-) diff --git a/app/Http/Middleware/SetLocale.php b/app/Http/Middleware/SetLocale.php index 1af99c01..85fd13e9 100644 --- a/app/Http/Middleware/SetLocale.php +++ b/app/Http/Middleware/SetLocale.php @@ -24,7 +24,7 @@ class SetLocale if (Session::has('locale')) { $locale = Session::get('locale', Settings::getValueByKey("SETTINGS::LOCALE:DEFAULT")); } else { - if (Settings::getValueByKey("SETTINGS::LOCALE:DYNAMIC") == "false") { + if (!Settings::getValueByKey("SETTINGS::LOCALE:DYNAMIC")=="true") { $locale = Settings::getValueByKey("SETTINGS::LOCALE:DEFAULT"); } else { $locale = substr($request->server('HTTP_ACCEPT_LANGUAGE'), 0, 2); diff --git a/resources/views/admin/settings/tabs/language.blade.php b/resources/views/admin/settings/tabs/language.blade.php index 0aa56e65..12c86dc6 100644 --- a/resources/views/admin/settings/tabs/language.blade.php +++ b/resources/views/admin/settings/tabs/language.blade.php @@ -7,16 +7,20 @@
+ + +
- -
+

+ + @@ -65,11 +75,13 @@ class="fas fa-info-circle">
- + + - - + + + diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index 29e1fa9c..5e0ea4e5 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -8,446 +8,439 @@ {{ config('app.name', 'Laravel') }} + href="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('favicon.ico') }}" + type="image/x-icon"> {{-- --}} - + {{-- summernote --}} {{-- datetimepicker --}} + href="{{ asset('plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css') }}"> {{-- select2 --}} + onload="this.onload=null;this.rel='stylesheet'"> -
- - - - -
+ + + + + + + - + -
- @if (!Auth::user()->hasVerifiedEmail()) - @if (Auth::user()->created_at->diffInHours(now(), false) > 1) -
-
{{ __('Warning!') }}
- {{ __('You have not yet verified your email address') }} {{ __('Click here to resend verification email') }} -
- {{ __('Please contact support If you didnt receive your verification email.') }} -
+ + + + + + + + + + + + + + + + + {{-- --}} + + {{-- --}} + + {{-- --}} + + + + + + + + + + + + + @endif + + + + +
+ + + + + +
+ + @if (!Auth::user()->hasVerifiedEmail()) + @if (Auth::user()->created_at->diffInHours(now(), false) > 1) +
+
{{ __('Warning!') }}
+ {{ __('You have not yet verified your email address') }} {{ __('Click here to resend verification email') }} +
+ {{ __('Please contact support If you didnt receive your verification email.') }} +
+ @endif @endif + + @yield('content') + + @include('models.redeem_voucher_modal') +
+ + + + + + + + + + + {{-- --}} + {{-- --}} + {{-- --}} + {{-- --}} + + + + + + + + + + + + + + + + + --}} -{{-- --}} -{{-- --}} -{{-- --}} - - - - - - - - - - - - - - - - - + } + }) + @endif +