diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md index c9e3dc5d8..84c5b1bdf 100644 --- a/CHANGELOG for v1.x.x.md +++ b/CHANGELOG for v1.x.x.md @@ -30,9 +30,6 @@ * [feature] - Store configuration added for product listing - - - * #343 [fixed] - Translation strings are missing from awful amount of controllers when returning responses with flash. And optimise translation strings for faster static translations. * #824 [fixed] - Framework is not supporting I.E 11 browser. diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php index 048d5fcb5..91e7abc9a 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php @@ -8,6 +8,7 @@
@php $locale = request()->get('locale') ?: app()->getLocale(); + $translation = $content->translations->where('locale', $locale)->first(); @endphp
[{{ $locale }}] - + @{{ errors.first('{!!$locale!!}[title]') }}
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php index 95aaaf2a2..f809714b8 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php @@ -5,8 +5,8 @@ @stop @php - $locale = request()->get('locale') ?: 'en'; - $channel = request()->get('channel') ?: 'default'; + $locale = request()->get('locale') ?: app()->getLocale(); + $channel = request()->get('channel') ?: core()->getCurrentChannelCode(); @endphp @section('content') @@ -128,7 +128,7 @@