From f636ffc08d7f989c8a01807127435397a277936a Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Wed, 31 Aug 2022 08:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=9B=BD=E5=AE=B6=E7=9C=81?= =?UTF-8?q?=E4=BB=BD=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/country/index.blade.php | 44 ++++++++-------- .../admin/views/pages/zones/index.blade.php | 52 +++++++++---------- resources/lang/en/admin/common.php | 2 + resources/lang/en/admin/country.php | 18 +++++++ resources/lang/en/admin/zone.php | 21 ++++++++ resources/lang/zh_cn/admin/country.php | 3 +- resources/lang/zh_cn/admin/zone.php | 5 ++ 7 files changed, 96 insertions(+), 49 deletions(-) create mode 100644 resources/lang/en/admin/country.php create mode 100644 resources/lang/en/admin/zone.php diff --git a/resources/beike/admin/views/pages/country/index.blade.php b/resources/beike/admin/views/pages/country/index.blade.php index 4aa17798..1d3e1f95 100644 --- a/resources/beike/admin/views/pages/country/index.blade.php +++ b/resources/beike/admin/views/pages/country/index.blade.php @@ -1,6 +1,6 @@ @extends('admin::layouts.master') -@section('title', '国家管理') +@section('title', __('admin/common.country')) @section('content')
@@ -12,13 +12,13 @@ ID - 名称 - 编码 - 创建时间 - 修改时间 - 排序 - 状态 - 操作 + {{ __('common.name') }} + {{ __('currency.code') }} + {{ __('common.created_at') }} + {{ __('common.updated_at') }} + {{ __('common.sort_order') }} + {{ __('common.status') }} + {{ __('common.action') }} @@ -34,8 +34,8 @@ {{ __('common.disable') }} - - + + @@ -45,29 +45,29 @@ :total="country.total">
- - - + + - - + + - - + + - + - 保存 - 取消 + {{ __('common.save') }} + {{ __('common.cancel') }} @@ -99,7 +99,7 @@ }, rules: { - name: [{required: true,message: '请输入国家名称',trigger: 'blur'}, ], + name: [{required: true,message: '{{ __('common.error_required', ['name' => __('admin/country.country_name')]) }}',trigger: 'blur'}, ], } }, @@ -141,7 +141,7 @@ this.$refs[form].validate((valid) => { if (!valid) { - this.$message.error('请检查表单是否填写正确'); + this.$message.error('{{ __('common.error_form') }}'); return; } diff --git a/resources/beike/admin/views/pages/zones/index.blade.php b/resources/beike/admin/views/pages/zones/index.blade.php index 43a51ca3..8be54a04 100644 --- a/resources/beike/admin/views/pages/zones/index.blade.php +++ b/resources/beike/admin/views/pages/zones/index.blade.php @@ -1,6 +1,6 @@ @extends('admin::layouts.master') -@section('title', '省份管理') +@section('title', __('admin/common.zone')) @section('content')
@@ -12,13 +12,13 @@ ID - 名称 - 编码 - 创建时间 - 修改时间 - 排序 - 状态 - 操作 + {{ __('common.name') }} + {{ __('currency.code') }} + {{ __('common.created_at') }} + {{ __('common.updated_at') }} + {{ __('common.sort_order') }} + {{ __('common.status') }} + {{ __('common.action') }} @@ -34,8 +34,8 @@ {{ __('common.disable') }} - - + + @@ -45,20 +45,20 @@ :total="zones.total">
- - - - + + + - - + + - - + + - - + + - + - 保存 - 取消 + {{ __('common.save') }} + {{ __('common.cancel') }} @@ -114,8 +114,8 @@ }, rules: { - name: [{required: true, message: '请输入省份名称', trigger: 'blur'}, ], - country_id: [{required: true, message: '请选择国家', trigger: 'blur'}, ], + name: [{required: true, message: '{{ __('common.error_required', ['name' => __('admin/zone.zone_name')]) }}', trigger: 'blur'}, ], + country_id: [{required: true, message: '{{ __('admin/zone.error_country') }}', trigger: 'blur'}, ], } }, @@ -157,7 +157,7 @@ this.$refs[form].validate((valid) => { if (!valid) { - this.$message.error('请检查表单是否填写正确'); + this.$message.error('{{ __('common.error_form') }}'); return; } diff --git a/resources/lang/en/admin/common.php b/resources/lang/en/admin/common.php index 46b3725a..9ea9e41f 100644 --- a/resources/lang/en/admin/common.php +++ b/resources/lang/en/admin/common.php @@ -37,6 +37,8 @@ return [ 'tax_class' => 'Tax Class', 'currency' => 'Currency', 'language' => 'Language', + 'zone' => 'Zone', + 'country' => 'Country', 'file_manager' => 'File Manager', 'access_frontend' => 'Frontend', diff --git a/resources/lang/en/admin/country.php b/resources/lang/en/admin/country.php new file mode 100644 index 00000000..f5044dcd --- /dev/null +++ b/resources/lang/en/admin/country.php @@ -0,0 +1,18 @@ + + * @created 2022-08-29 17:21:38 + * @modified 2022-08-29 17:21:38 + */ +return [ + 'country_name' => 'Country Name', + + 'countries_index' => 'Country List', + 'countries_create' => 'Create Country', + 'countries_update' => 'Update Country', + 'countries_delete' => 'Delete Country', +]; diff --git a/resources/lang/en/admin/zone.php b/resources/lang/en/admin/zone.php new file mode 100644 index 00000000..f2e4e17f --- /dev/null +++ b/resources/lang/en/admin/zone.php @@ -0,0 +1,21 @@ + + * @created 2022-08-29 17:21:38 + * @modified 2022-08-29 17:21:38 + */ +return [ + 'zone_name' => 'Province Name', + 'country_of_origin' => 'Country Of Origin', + + 'zones_index' => 'Province List', + 'zones_create' => 'Create Province', + 'zones_update' => 'Update Province', + 'zones_delete' => 'Delete Province', + + 'error_country' => 'Please select a country', +]; diff --git a/resources/lang/zh_cn/admin/country.php b/resources/lang/zh_cn/admin/country.php index 9234b15a..f7e90396 100644 --- a/resources/lang/zh_cn/admin/country.php +++ b/resources/lang/zh_cn/admin/country.php @@ -9,8 +9,9 @@ * @modified 2022-08-29 17:21:38 */ return [ + 'country_name' => '国家名称', + 'countries_index' => '国家列表', 'countries_create' => '创建国家', 'countries_update' => '更新国家', - 'countries_delete' => '删除国家', ]; diff --git a/resources/lang/zh_cn/admin/zone.php b/resources/lang/zh_cn/admin/zone.php index 9bcba1d6..96c39c16 100644 --- a/resources/lang/zh_cn/admin/zone.php +++ b/resources/lang/zh_cn/admin/zone.php @@ -9,8 +9,13 @@ * @modified 2022-08-29 17:21:38 */ return [ + 'zone_name' => '省份名称', + 'country_of_origin' => '所属国家', + 'zones_index' => '省份列表', 'zones_create' => '创建省份', 'zones_update' => '更新省份', 'zones_delete' => '删除省份', + + 'error_country' => '请选择国家', ];