From 006750c9bc509064f600a27b9e6d38dd90515c98 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 4 Aug 2022 15:52:29 +0800
Subject: [PATCH] fixed admin language

---
 app/Http/Middleware/ShareViewData.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Middleware/ShareViewData.php b/app/Http/Middleware/ShareViewData.php
index e510086c..d9be7356 100644
--- a/app/Http/Middleware/ShareViewData.php
+++ b/app/Http/Middleware/ShareViewData.php
@@ -33,8 +33,10 @@ class ShareViewData
         View::share('categories', hook_filter('header.categories', CategoryRepo::getTwoLevelCategories()));
 
         if (is_admin()) {
-            View::share('admin_languages', $this->handleAdminLanguages());
-            View::share('admin_language', current_user()->locale ?? 'en');
+            $adminLanguages = $this->handleAdminLanguages();
+            $currentLanguage = current_user()->locale ?? 'en';
+            View::share('admin_languages', $adminLanguages);
+            View::share('admin_language', collect($adminLanguages)->where('code', $currentLanguage)->first());
         }
     }