diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index 54582d49..287a2846 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -10,7 +10,8 @@ */ return [ - 'error_required' => 'Please fill out the :name', + 'error_required_name' => 'Please fill in your name', + 'error_required_email' => 'Please enter your email', 'unauthenticated' => 'Please login first', 'success' => 'Success', 'created_success' => 'Created Successfully!', diff --git a/resources/lang/en/shop/account.php b/resources/lang/en/shop/account.php index 483d1868..f0f42231 100644 --- a/resources/lang/en/shop/account.php +++ b/resources/lang/en/shop/account.php @@ -27,6 +27,8 @@ return [ 'state' => 'State', 'amount' => 'Amount', 'check_details' => 'Check Details', + 'all' => 'All', + 'items' => 'Items', 'edit' => [ 'index' => 'Edit', @@ -104,6 +106,7 @@ return [ 'enter_city' => 'Please fill in the city', 'confirm_delete' => 'Are you sure you want to delete the address?', 'hint' => 'Hint', + 'check_form' => 'Please check that the form is filled out correctly', ], 'rma' => [ diff --git a/resources/lang/en/shop/carts.php b/resources/lang/en/shop/carts.php index f921917f..fad75986 100644 --- a/resources/lang/en/shop/carts.php +++ b/resources/lang/en/shop/carts.php @@ -29,4 +29,5 @@ return [ 'mini' => 'Your cart', 'delete' => 'Delete', 'check_cart' => 'Check the shopping cart', + 'subtotal' => 'Subtotal', ]; diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php index 313369c1..13d21f10 100644 --- a/resources/lang/zh_cn/common.php +++ b/resources/lang/zh_cn/common.php @@ -10,7 +10,8 @@ */ return [ 'index' => '123123', - 'error_required' => '请填写 :name', + 'error_required_name' => '请填写姓名', + 'error_required_email' => '请填写邮箱', 'unauthenticated' => '请先登录', 'success' => '成功', 'created_success' => '创建成功!', diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index 4e695f35..4d332d3e 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/resources/lang/zh_cn/shop/account.php @@ -27,6 +27,8 @@ return [ 'state' => '状态', 'amount' => '金额', 'check_details' => '查看详情', + 'all' => '共', + 'items' => '件商品', 'edit' => [ 'index' => '修改个人信息', @@ -104,6 +106,7 @@ return [ 'enter_city' => '请填写城市', 'confirm_delete' => '确定要删除地址吗?', 'hint' => '提示', + 'check_form' => '请检查表单是否填写正确', ], 'rma' => [ diff --git a/resources/lang/zh_cn/shop/carts.php b/resources/lang/zh_cn/shop/carts.php index 66985d60..e104acd1 100644 --- a/resources/lang/zh_cn/shop/carts.php +++ b/resources/lang/zh_cn/shop/carts.php @@ -29,4 +29,5 @@ return [ 'mini' => '您的购物车', 'delete' => '删除', 'check_cart' => '查看购物车', + 'subtotal' => '小计', ]; diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php index ddcab493..b92b6ccf 100644 --- a/themes/default/account/account.blade.php +++ b/themes/default/account/account.blade.php @@ -72,7 +72,7 @@