Merge pull request krayin#1669 from suraj-webkul/issue#1667

[FIX] RTL View -> Admin Profile Dropdown is having UI and Translation issue.
Contenda-Team · Oct 9, 2024 · 70920da · 70920da
2 parents b0a91fc + f0f3fb5
commit 70920da
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -1911,7 +1911,7 @@
     ],
 
     'layouts' => [
-        'app-version'          => 'الإصدار : :version',
+        'app-version'          => 'الإصدار: :version',
         'dashboard'            => 'لوحة القيادة',
         'leads'                => 'العملاء المحتملين',
         'quotes'               => 'العروض',

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1911,7 +1911,7 @@
     ],
 
     'layouts' => [
-        'app-version'          => 'Version : :version',
+        'app-version'          => 'Version: :version',
         'dashboard'            => 'Dashboard',
         'leads'                => 'Leads',
         'quotes'               => 'Quotes',

diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php
@@ -1911,7 +1911,7 @@
     ],
 
     'layouts' => [
-        'app-version'          => 'Versión : :version',
+        'app-version'          => 'Versión: :version',
         'dashboard'            => 'Tablero',
         'leads'                => 'Leads',
         'quotes'               => 'Cotizaciones',

diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -1911,7 +1911,7 @@
     ],
 
     'layouts' => [
-        'app-version'          => 'نسخه : :version',
+        'app-version'          => 'نسخه: :version',
         'dashboard'            => 'داشبورد',
         'leads'                => 'لیدها',
         'quotes'               => 'نقل قول‌ها',

diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -1911,7 +1911,7 @@
     ],
 
     'layouts' => [
-        'app-version'          => 'Sürüm : :version',
+        'app-version'          => 'Sürüm: :version',
         'dashboard'            => 'Gösterge Paneli',
         'leads'                => 'Leadler',
         'quotes'               => 'Teklifler',

diff --git a/packages/Webkul/Admin/src/Resources/views/components/layouts/header/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/layouts/header/index.blade.php
@@ -186,7 +186,7 @@ class="{{ request()->cookie('dark_mode') ? 'icon-light' : 'icon-dark' }} p-1.5 r
         </v-dark>
 
         <!-- Admin profile -->
-        <x-admin::dropdown position="bottom-right">
+        <x-admin::dropdown position="bottom-{{ in_array(app()->getLocale(), ['fa', 'ar']) ? 'left' : 'right' }}">
             <x-slot:toggle>
                 @if (auth()->guard('user')->user()->image)
                     <button class="flex h-9 w-9 cursor-pointer overflow-hidden rounded-full hover:opacity-80 focus:opacity-80">
@@ -213,7 +213,7 @@ class="w-full"
 
                     <!-- Version -->
                     <p class="text-gray-400">
-                        Version: v{{ core()->version() }}
+                        @lang('admin::app.layouts.app-version', ['version' => core()->version()])
                     </p>
                 </div>
 
@@ -222,7 +222,7 @@ class="w-full"
                         class="cursor-pointer px-5 py-2 text-base text-gray-800 hover:bg-gray-100 dark:text-white dark:hover:bg-gray-950"
                         href="{{ route('admin.user.account.edit') }}"
                     >
-                        My Account
+                        @lang('admin::app.layouts.my-account')
                     </a>
 
                     <!--Admin logout-->
@@ -238,7 +238,7 @@ class="cursor-pointer px-5 py-2 text-base text-gray-800 hover:bg-gray-100 dark:t
                         href="{{ route('admin.session.destroy') }}"
                         onclick="event.preventDefault(); document.getElementById('adminLogout').submit();"
                     >
-                        Logout
+                        @lang('admin::app.layouts.sign-out')
                     </a>
                 </div>
             </x-slot>