From 081b0d81a06dfed4fef82a02c7dbc6aaa1ae8b50 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Fri, 26 Aug 2022 18:16:52 +0800
Subject: [PATCH] =?UTF-8?q?branch=20=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/views/pages/brands/index.blade.php  | 22 +++++++++----------
 resources/lang/en/common.php                  |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/beike/admin/views/pages/brands/index.blade.php b/resources/beike/admin/views/pages/brands/index.blade.php
index d76f9bf5..4823a7cc 100644
--- a/resources/beike/admin/views/pages/brands/index.blade.php
+++ b/resources/beike/admin/views/pages/brands/index.blade.php
@@ -42,33 +42,33 @@
         :total="brands.total"></el-pagination>
     </div>
 
-    <el-dialog title="品牌" :visible.sync="dialog.show" width="600px"
+    <el-dialog title="{{ __('admin/common.brand') }}" :visible.sync="dialog.show" width="600px"
       @close="closeDialog('form')" :close-on-click-modal="false">
 
       <el-form ref="form" :rules="rules" :model="dialog.form" label-width="100px">
-        <el-form-item label="名称" prop="name">
-          <el-input class="mb-0" v-model="dialog.form.name" placeholder="名称"></el-input>
+        <el-form-item label="{{ __('brand.name') }}" prop="name">
+          <el-input class="mb-0" v-model="dialog.form.name" placeholder="{{ __('brand.name') }}"></el-input>
         </el-form-item>
 
-        <el-form-item label="图标" prop="logo" required>
+        <el-form-item label="{{ __('brand.icon') }}" prop="logo" required>
           <vue-image v-model="dialog.form.logo"></vue-image>
         </el-form-item>
 
-        <el-form-item label="首字母" prop="first">
-          <el-input class="mb-0" :maxlength="1" v-model="dialog.form.first" placeholder="首字母"></el-input>
+        <el-form-item label="{{ __('brand.first_letter') }}" prop="first">
+          <el-input class="mb-0" :maxlength="1" v-model="dialog.form.first" placeholder="{{ __('brand.first_letter') }}"></el-input>
         </el-form-item>
 
-        <el-form-item label="排序">
-          <el-input class="mb-0" type="number" v-model="dialog.form.sort_order" placeholder="排序"></el-input>
+        <el-form-item label="{{ __('common.sort_order') }}">
+          <el-input class="mb-0" type="number" v-model="dialog.form.sort_order" placeholder="{{ __('common.sort_order') }}"></el-input>
         </el-form-item>
 
-        <el-form-item label="状态">
+        <el-form-item label="{{ __('common.status') }}">
           <el-switch v-model="dialog.form.status" :active-value="1" :inactive-value="0"></el-switch>
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" @click="submit('form')">保存</el-button>
-          <el-button @click="dialog.show = false">取消</el-button>
+          <el-button type="primary" @click="submit('form')">{{ __('common.save') }}</el-button>
+          <el-button @click="dialog.show = false">{{ __('common.cancel') }}</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index e8f06841..780de3d6 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -47,7 +47,7 @@ return [
     'id' => 'ID',
     'created_at' => 'Created At',
     'updated_at' => 'Updated At',
-    'sort_order' => 'Sort By',
+    'sort_order' => 'Sort Order',
 
     'order' => [
         'unpaid' => 'Unpaid',