From 728871ef1452753a0c18a0ae9940b3f48d98e4aa Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Tue, 16 Aug 2022 18:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A7=E5=88=B6=E5=99=A8?=
 =?UTF-8?q?=E4=B8=AD=E8=AF=AD=E8=A8=80=E6=8F=90=E5=8F=96=E5=88=B0=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Http/Controllers/ForgottenController.php |  2 +-
 beike/Admin/Http/Controllers/SettingController.php |  8 ++++----
 resources/lang/en/admin/forgotten.php              | 14 ++++++++++++++
 resources/lang/en/admin/setting.php                |  5 +++++
 resources/lang/zh_cn/admin/forgotten.php           | 14 ++++++++++++++
 resources/lang/zh_cn/admin/setting.php             |  5 +++++
 6 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 resources/lang/en/admin/forgotten.php
 create mode 100644 resources/lang/zh_cn/admin/forgotten.php

diff --git a/beike/Admin/Http/Controllers/ForgottenController.php b/beike/Admin/Http/Controllers/ForgottenController.php
index c213dd49..32a3d39d 100644
--- a/beike/Admin/Http/Controllers/ForgottenController.php
+++ b/beike/Admin/Http/Controllers/ForgottenController.php
@@ -34,7 +34,7 @@ class ForgottenController
     public function sendVerifyCode(Request $request)
     {
         UserService::sendVerifyCodeForForgotten($request->get('email'));
-        return json_success('验证码已发送，请查看并输入验证码');
+        return json_success(trans('admin/forgotten.verify_code_sent'));
     }
 
     /**
diff --git a/beike/Admin/Http/Controllers/SettingController.php b/beike/Admin/Http/Controllers/SettingController.php
index c3d8af2c..50874411 100644
--- a/beike/Admin/Http/Controllers/SettingController.php
+++ b/beike/Admin/Http/Controllers/SettingController.php
@@ -27,13 +27,13 @@ class SettingController extends Controller
     public function index()
     {
         $themes = [
-            ['value' => 'default', 'label' => '默认主题'],
-            ['value' => 'black', 'label' => '黑色主题']
+            ['value' => 'default', 'label' => trans('admin/setting.theme_default')],
+            ['value' => 'black', 'label' => trans('admin/setting.theme_black')]
         ];
 
         $tax_address = [
-            ['value' => 'shipping', 'label' => '配送地址'],
-            ['value' => 'payment', 'label' => '账单地址']
+            ['value' => 'shipping', 'label' => trans('admin/setting.shipping_address')],
+            ['value' => 'payment', 'label' => trans('admin/setting.payment_address')]
         ];
 
         $data = [
diff --git a/resources/lang/en/admin/forgotten.php b/resources/lang/en/admin/forgotten.php
new file mode 100644
index 00000000..f152ebd9
--- /dev/null
+++ b/resources/lang/en/admin/forgotten.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * forgotten.php
+ *
+ * @copyright  2022 opencart.cn - All Rights Reserved
+ * @link       http://www.guangdawangluo.com
+ * @author     TL <mengwb@opencart.cn>
+ * @created    2022-08-16 17:22:41
+ * @modified   2022-08-16 17:22:41
+ */
+
+return [
+    'verify_code_sent' => 'Verify Code sent successfully',
+];
diff --git a/resources/lang/en/admin/setting.php b/resources/lang/en/admin/setting.php
index a184f095..a994bb5a 100644
--- a/resources/lang/en/admin/setting.php
+++ b/resources/lang/en/admin/setting.php
@@ -15,4 +15,9 @@ return [
     'design_index' => 'Design Builder',
     'design_footer_index' => 'Design Footer',
     'design_menu_index' => 'Design Menu',
+
+    'theme_default' => 'Default Theme',
+    'theme_black' => 'Black Theme',
+    'shipping_address' => 'Shipping Address',
+    'payment_address' => 'Billing Address',
 ];
diff --git a/resources/lang/zh_cn/admin/forgotten.php b/resources/lang/zh_cn/admin/forgotten.php
new file mode 100644
index 00000000..543ca4b7
--- /dev/null
+++ b/resources/lang/zh_cn/admin/forgotten.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * forgotten.php
+ *
+ * @copyright  2022 opencart.cn - All Rights Reserved
+ * @link       http://www.guangdawangluo.com
+ * @author     TL <mengwb@opencart.cn>
+ * @created    2022-08-16 17:22:41
+ * @modified   2022-08-16 17:22:41
+ */
+
+return [
+    'verify_code_sent' => '验证码已发送，请查看并输入验证码',
+];
diff --git a/resources/lang/zh_cn/admin/setting.php b/resources/lang/zh_cn/admin/setting.php
index b897d4af..a8d86b60 100644
--- a/resources/lang/zh_cn/admin/setting.php
+++ b/resources/lang/zh_cn/admin/setting.php
@@ -15,4 +15,9 @@ return [
     'design_index' => '首页编辑器',
     'design_footer_index' => '页尾编辑器',
     'design_menu_index' => '导航编辑器',
+
+    'theme_default' => '默认主题',
+    'theme_black' => '黑色主题',
+    'shipping_address' => '发货地址',
+    'payment_address' => '账单地址',
 ];