diff --git a/beike/Admin/Http/Requests/AdminRoleRequest.php b/beike/Admin/Http/Requests/AdminRoleRequest.php index 59885027..f108db4e 100644 --- a/beike/Admin/Http/Requests/AdminRoleRequest.php +++ b/beike/Admin/Http/Requests/AdminRoleRequest.php @@ -36,4 +36,11 @@ class AdminRoleRequest extends FormRequest 'name' => 'required|string|max:10', ]; } + + public function attributes() + { + return [ + 'name' => trans('role.name'), + ]; + } } diff --git a/beike/Admin/Http/Requests/AdminUserRequest.php b/beike/Admin/Http/Requests/AdminUserRequest.php index df49834d..54cb525b 100644 --- a/beike/Admin/Http/Requests/AdminUserRequest.php +++ b/beike/Admin/Http/Requests/AdminUserRequest.php @@ -40,4 +40,11 @@ class AdminUserRequest extends FormRequest return $rules; } + + public function attributes() + { + return [ + 'email' => trans('user.email'), + ]; + } } diff --git a/beike/Admin/Http/Requests/CategoryRequest.php b/beike/Admin/Http/Requests/CategoryRequest.php index f3a4b829..8f427699 100644 --- a/beike/Admin/Http/Requests/CategoryRequest.php +++ b/beike/Admin/Http/Requests/CategoryRequest.php @@ -31,7 +31,7 @@ class CategoryRequest extends FormRequest public function attributes() { return [ - 'descriptions.*.name' => '名称', + 'descriptions.*.name' => trans('category.name'), ]; } } diff --git a/beike/Admin/Http/Requests/CurrencyRequest.php b/beike/Admin/Http/Requests/CurrencyRequest.php index eed7a93e..f67453ee 100644 --- a/beike/Admin/Http/Requests/CurrencyRequest.php +++ b/beike/Admin/Http/Requests/CurrencyRequest.php @@ -36,12 +36,12 @@ class CurrencyRequest extends FormRequest public function attributes() { return [ - 'name' => '名称', - 'code' => '编码', - 'symbol_left' => '左符号', - 'symbol_right' => '右符号', - 'value' => '汇率值', - 'decimal_place' => '小数位数', + 'name' => trans('currency.name'), + 'code' => trans('currency.code'), + 'symbol_left' => trans('currency.symbol_left'), + 'symbol_right' => trans('currency.symbol_right'), + 'value' => trans('currency.value'), + 'decimal_place' => trans('currency.decimal_place'), ]; } } diff --git a/beike/Admin/Http/Requests/CustomerGroupRequest.php b/beike/Admin/Http/Requests/CustomerGroupRequest.php index b3204732..4268f09f 100644 --- a/beike/Admin/Http/Requests/CustomerGroupRequest.php +++ b/beike/Admin/Http/Requests/CustomerGroupRequest.php @@ -41,8 +41,8 @@ class CustomerGroupRequest extends FormRequest public function attributes() { return [ - 'descriptions.*.name' => '名称', - 'level' => '等级', + 'descriptions.*.name' => trans('customer_group.name'), + 'level' => trans('customer_group.level'), ]; } } diff --git a/beike/Admin/Http/Requests/CustomerRequest.php b/beike/Admin/Http/Requests/CustomerRequest.php index d425df88..5afc4ece 100644 --- a/beike/Admin/Http/Requests/CustomerRequest.php +++ b/beike/Admin/Http/Requests/CustomerRequest.php @@ -48,10 +48,10 @@ class CustomerRequest extends FormRequest public function attributes() { return [ - 'name' => '姓名', - 'email' => 'Email', - 'password' => '密码', - 'customer_group_id' => '会员组', + 'name' => trans('customer.name'), + 'email' => trans('customer.email'), + 'password' => trans('customer.password'), + 'customer_group_id' => trans('customer.customer_group_id'), ]; } } diff --git a/beike/Admin/Http/Requests/ForgottenRequest.php b/beike/Admin/Http/Requests/ForgottenRequest.php index d9d87449..cb9c10a2 100644 --- a/beike/Admin/Http/Requests/ForgottenRequest.php +++ b/beike/Admin/Http/Requests/ForgottenRequest.php @@ -31,7 +31,7 @@ class ForgottenRequest extends FormRequest public function attributes() { return [ - 'password' => '密码' + 'password' => trans('customer.password') ]; } } diff --git a/beike/Admin/Http/Requests/PageRequest.php b/beike/Admin/Http/Requests/PageRequest.php index c35b8261..a3259c87 100644 --- a/beike/Admin/Http/Requests/PageRequest.php +++ b/beike/Admin/Http/Requests/PageRequest.php @@ -40,4 +40,12 @@ class PageRequest extends FormRequest return $rules; } + + public function attributes() + { + return [ + 'title' => trans('page.title'), + 'content' => trans('page.content'), + ]; + } } diff --git a/beike/Admin/Http/Requests/RmaRequest.php b/beike/Admin/Http/Requests/RmaRequest.php index 1b7c4049..769d6174 100644 --- a/beike/Admin/Http/Requests/RmaRequest.php +++ b/beike/Admin/Http/Requests/RmaRequest.php @@ -47,13 +47,13 @@ class RmaRequest extends FormRequest public function attributes() { return [ - 'order_id' => '订单', - 'order_product_id' => '订单商品', - 'customer_id' => '顾客', - 'quantity' => '数量', - 'opened' => '已拆包装', - 'rma_reason_id' => '退换货原因', - 'type' => '售后服务类型', + 'order_id' => trans('rma.order_id'), + 'order_product_id' => trans('rma.order_product_id'), + 'customer_id' => trans('rma.customer_id'), + 'quantity' => trans('rma.quantity'), + 'opened' => trans('rma.opened'), + 'rma_reason_id' => trans('rma.rma_reason_id'), + 'type' => trans('rma.type'), ]; } } diff --git a/resources/lang/en/category.php b/resources/lang/en/category.php new file mode 100644 index 00000000..24900593 --- /dev/null +++ b/resources/lang/en/category.php @@ -0,0 +1,14 @@ + + * @created 2022-08-29 20:43:32 + * @modified 2022-08-29 20:43:32 + */ + +return [ + 'name' => 'Name', +]; diff --git a/resources/lang/en/currency.php b/resources/lang/en/currency.php index 8da2da48..4513ece6 100644 --- a/resources/lang/en/currency.php +++ b/resources/lang/en/currency.php @@ -11,4 +11,10 @@ return [ 'decimal_point' => '.', 'thousand_point' => ',', + 'name' => 'Name', + 'code' => 'Code', + 'symbol_left' => 'Symbol Left', + 'symbol_right' => 'Symbol Right', + 'value' => 'Value', + 'decimal_place' => 'Decimal Place', ]; diff --git a/resources/lang/en/customer.php b/resources/lang/en/customer.php index 90caabba..40ddfcba 100644 --- a/resources/lang/en/customer.php +++ b/resources/lang/en/customer.php @@ -14,4 +14,6 @@ return [ 'email' => 'Email', 'from' => 'From', 'customer_group' => 'Group', + 'password' => 'Password', + 'customer_group_id' => 'Customer Group', ]; diff --git a/resources/lang/en/customer_group.php b/resources/lang/en/customer_group.php new file mode 100644 index 00000000..254943e2 --- /dev/null +++ b/resources/lang/en/customer_group.php @@ -0,0 +1,15 @@ + + * @created 2022-08-26 18:41:07 + * @modified 2022-08-26 18:41:07 + */ + +return [ + 'level' => 'Level', + 'name' => 'Customer Group Name', +]; diff --git a/resources/lang/en/page.php b/resources/lang/en/page.php new file mode 100644 index 00000000..1cd19a95 --- /dev/null +++ b/resources/lang/en/page.php @@ -0,0 +1,14 @@ + + * @created 2022-07-28 20:59:38 + * @modified 2022-07-28 20:59:38 + */ +return [ + 'title' => 'Title', + 'content' => 'Content', +]; diff --git a/resources/lang/en/rma.php b/resources/lang/en/rma.php index 46cc5dbf..d462dbca 100644 --- a/resources/lang/en/rma.php +++ b/resources/lang/en/rma.php @@ -10,7 +10,9 @@ */ return [ - 'order_product_id' => 'Order Product ID', + 'order_id' => 'Order', + 'order_product_id' => 'Order Product', + 'customer_id' => 'Customer', 'quantity' => 'Quantity', 'opened' => 'Opened', 'rma_reason_id' => 'Reason ID', diff --git a/resources/lang/en/role.php b/resources/lang/en/role.php new file mode 100644 index 00000000..a837d7e5 --- /dev/null +++ b/resources/lang/en/role.php @@ -0,0 +1,14 @@ + + * @created 2022-08-29 20:33:32 + * @modified 2022-08-29 20:33:32 + */ + +return [ + 'name' => 'Name', +]; diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php new file mode 100644 index 00000000..13c867f9 --- /dev/null +++ b/resources/lang/en/user.php @@ -0,0 +1,14 @@ + + * @created 2022-08-29 20:33:32 + * @modified 2022-08-29 20:33:32 + */ + +return [ + 'email' => 'Email', +]; diff --git a/resources/lang/zh_cn/category.php b/resources/lang/zh_cn/category.php new file mode 100644 index 00000000..02f64ffa --- /dev/null +++ b/resources/lang/zh_cn/category.php @@ -0,0 +1,14 @@ + + * @created 2022-08-29 20:43:32 + * @modified 2022-08-29 20:43:32 + */ + +return [ + 'name' => '分类名称', +]; diff --git a/resources/lang/zh_cn/currency.php b/resources/lang/zh_cn/currency.php index 8da2da48..2fc5578f 100644 --- a/resources/lang/zh_cn/currency.php +++ b/resources/lang/zh_cn/currency.php @@ -5,10 +5,17 @@ * @copyright 2022 opencart.cn - All Rights Reserved * @link http://www.guangdawangluo.com * @author TL - * @created 2022-07-28 17:21:38 - * @modified 2022-07-28 17:21:38 + * @created 2022-08-29 20:28:59 + * @modified 2022-08-29 20:28:59 */ + return [ 'decimal_point' => '.', 'thousand_point' => ',', + 'name' => '名称', + 'code' => '编码', + 'symbol_left' => '左符号', + 'symbol_right' => '右符号', + 'value' => '汇率值', + 'decimal_place' => '小数位数', ]; diff --git a/resources/lang/zh_cn/customer_group.php b/resources/lang/zh_cn/customer_group.php new file mode 100644 index 00000000..b7868890 --- /dev/null +++ b/resources/lang/zh_cn/customer_group.php @@ -0,0 +1,15 @@ + + * @created 2022-08-26 18:41:07 + * @modified 2022-08-26 18:41:07 + */ + +return [ + 'level' => '等级', + 'name' => '客户组名称', +]; diff --git a/resources/lang/zh_cn/page.php b/resources/lang/zh_cn/page.php new file mode 100644 index 00000000..7336162b --- /dev/null +++ b/resources/lang/zh_cn/page.php @@ -0,0 +1,14 @@ + + * @created 2022-07-28 20:59:38 + * @modified 2022-07-28 20:59:38 + */ +return [ + 'title' => '标题', + 'content' => '内容', +]; diff --git a/resources/lang/zh_cn/rma.php b/resources/lang/zh_cn/rma.php index b4e7bcf9..a05b8550 100644 --- a/resources/lang/zh_cn/rma.php +++ b/resources/lang/zh_cn/rma.php @@ -10,7 +10,9 @@ */ return [ + 'order_id' => '订单', 'order_product_id' => '订单商品', + 'customer_id' => '顾客', 'quantity' => '数量', 'opened' => '已拆包装', 'rma_reason_id' => '退换货原因', diff --git a/resources/lang/zh_cn/role.php b/resources/lang/zh_cn/role.php new file mode 100644 index 00000000..c7bb9f9d --- /dev/null +++ b/resources/lang/zh_cn/role.php @@ -0,0 +1,14 @@ + + * @created 2022-08-29 20:33:32 + * @modified 2022-08-29 20:33:32 + */ + +return [ + 'name' => '角色名', +]; diff --git a/resources/lang/zh_cn/user.php b/resources/lang/zh_cn/user.php new file mode 100644 index 00000000..13c867f9 --- /dev/null +++ b/resources/lang/zh_cn/user.php @@ -0,0 +1,14 @@ + + * @created 2022-08-29 20:33:32 + * @modified 2022-08-29 20:33:32 + */ + +return [ + 'email' => 'Email', +];