From 231988fdd71f62363726ed6216393a6a4875d5dc Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 4 Aug 2022 11:54:50 +0800
Subject: [PATCH] fixed header

---
 beike/Admin/View/Components/Header.php | 10 +++++-----
 resources/lang/en/admin/common.php     | 10 ++++++++--
 resources/lang/en/admin/header.php     | 18 ------------------
 resources/lang/zh_cn/admin/common.php  |  8 +++++++-
 resources/lang/zh_cn/admin/header.php  | 18 ------------------
 5 files changed, 20 insertions(+), 44 deletions(-)
 delete mode 100644 resources/lang/en/admin/header.php
 delete mode 100644 resources/lang/zh_cn/admin/header.php

diff --git a/beike/Admin/View/Components/Header.php b/beike/Admin/View/Components/Header.php
index 211ba345..ca40dade 100644
--- a/beike/Admin/View/Components/Header.php
+++ b/beike/Admin/View/Components/Header.php
@@ -42,11 +42,11 @@ class Header extends Component
     private function prepareMenus()
     {
         $menus = [
-            ['name' => trans('admin/header.home'), 'route' => 'home.index'],
-            ['name' => trans('admin/header.order'), 'route' => 'orders.index'],
-            ['name' => trans('admin/header.product'), 'route' => 'products.index'],
-            ['name' => trans('admin/header.customer'), 'route' => 'customers.index'],
-            ['name' => trans('admin/header.setting'), 'route' => 'settings.index'],
+            ['name' => trans('admin/common.home'), 'route' => 'home.index'],
+            ['name' => trans('admin/common.order'), 'route' => 'orders.index'],
+            ['name' => trans('admin/common.product'), 'route' => 'products.index'],
+            ['name' => trans('admin/common.customer'), 'route' => 'customers.index'],
+            ['name' => trans('admin/common.setting'), 'route' => 'settings.index'],
         ];
         return hook_filter('admin.header_menus', $menus);
     }
diff --git a/resources/lang/en/admin/common.php b/resources/lang/en/admin/common.php
index 625694dd..bfbace09 100644
--- a/resources/lang/en/admin/common.php
+++ b/resources/lang/en/admin/common.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * header.php
+ * common.php
  *
  * @copyright  2022 opencart.cn - All Rights Reserved
  * @link       http://www.guangdawangluo.com
@@ -10,5 +10,11 @@
  */
 
 return [
-    'edit' => 'Edit',
+    'edit' => '编辑',
+
+    'home' => 'Home',
+    'order' => 'Orders',
+    'product' => 'Products',
+    'customer' => 'Customers',
+    'setting' => 'Settings',
 ];
diff --git a/resources/lang/en/admin/header.php b/resources/lang/en/admin/header.php
deleted file mode 100644
index 0cfb0ab1..00000000
--- a/resources/lang/en/admin/header.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * header.php
- *
- * @copyright  2022 opencart.cn - All Rights Reserved
- * @link       http://www.guangdawangluo.com
- * @author     Edward Yang <yangjin@opencart.cn>
- * @created    2022-08-02 19:03:19
- * @modified   2022-08-02 19:03:19
- */
-
-return [
-    'home' => 'Home',
-    'order' => 'Orders',
-    'product' => 'Products',
-    'customer' => 'Customers',
-    'setting' => 'Settings',
-];
diff --git a/resources/lang/zh_cn/admin/common.php b/resources/lang/zh_cn/admin/common.php
index 3c38c7ff..e71454cb 100644
--- a/resources/lang/zh_cn/admin/common.php
+++ b/resources/lang/zh_cn/admin/common.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * header.php
+ * common.php
  *
  * @copyright  2022 opencart.cn - All Rights Reserved
  * @link       http://www.guangdawangluo.com
@@ -11,4 +11,10 @@
 
 return [
     'edit' => '编辑',
+
+    'home' => '管理首页',
+    'order' => '订单管理',
+    'product' => '商品管理',
+    'customer' => '会员管理',
+    'setting' => '系统设置',
 ];
diff --git a/resources/lang/zh_cn/admin/header.php b/resources/lang/zh_cn/admin/header.php
deleted file mode 100644
index 80cc8922..00000000
--- a/resources/lang/zh_cn/admin/header.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * header.php
- *
- * @copyright  2022 opencart.cn - All Rights Reserved
- * @link       http://www.guangdawangluo.com
- * @author     Edward Yang <yangjin@opencart.cn>
- * @created    2022-08-02 19:03:19
- * @modified   2022-08-02 19:03:19
- */
-
-return [
-    'home' => '管理首页',
-    'order' => '订单管理',
-    'product' => '商品管理',
-    'customer' => '会员管理',
-    'setting' => '系统设置',
-];