From 6053e679158bbe0189471cd7908e0a8167c8425b Mon Sep 17 00:00:00 2001
From: sl <2436637291@qq.com>
Date: Fri, 19 Aug 2022 18:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E8=AF=8D=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/lang/zh_cn/common.php                  |  1 +
 resources/lang/zh_cn/shop/account.php            |  4 ++--
 resources/lang/zh_cn/shop/products.php           |  7 +++++++
 themes/default/cart/mini.blade.php               |  2 +-
 .../default/components/account/sidebar.blade.php | 12 ++++++------
 themes/default/product.blade.php                 | 16 ++++++++++------
 themes/default/shared/product.blade.php          |  4 ++--
 themes/default/shared/steps.blade.php            |  8 ++++----
 8 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php
index d47facf0..a65e50f2 100644
--- a/resources/lang/zh_cn/common.php
+++ b/resources/lang/zh_cn/common.php
@@ -26,6 +26,7 @@ return [
     'no' => '否',
     'yes' => '是',
     'delete' => '删除',
+    'sign_out' => '退出登录',
 ];
 
 
diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php
index 00b5647a..7c695835 100644
--- a/resources/lang/zh_cn/shop/account.php
+++ b/resources/lang/zh_cn/shop/account.php
@@ -38,14 +38,14 @@ return [
     ],
 
     'wishlist' => [
-        'index' => '收藏列表',
+        'index' => '我的收藏',
         'product' => '产品',
         'price' => '价格',
         'check_details' => '查看详情',
     ],
 
     'order' => [
-        'index' => '订单列表',
+        'index' => '我的订单',
         'completed' => '已确认收货',
         'order_details' => '订单详情',
         'amount' => '金额',
diff --git a/resources/lang/zh_cn/shop/products.php b/resources/lang/zh_cn/shop/products.php
index f5a60a09..450b53d8 100644
--- a/resources/lang/zh_cn/shop/products.php
+++ b/resources/lang/zh_cn/shop/products.php
@@ -11,4 +11,11 @@
 
 return [
     'search' => '搜索',
+    'add_to_favorites' => '加入收藏夹',
+    'add_to_cart' => '加入购物车',
+    'buy_now' => '立即购买',
+    'product_details' => '商品详情',
+    'in_stock' => '有货',
+    'out_stock' => '缺货',
+    'model' => '型号',
 ];
diff --git a/themes/default/cart/mini.blade.php b/themes/default/cart/mini.blade.php
index 5884d2de..3b96c973 100644
--- a/themes/default/cart/mini.blade.php
+++ b/themes/default/cart/mini.blade.php
@@ -14,7 +14,7 @@
               <div class="price">{{ $cart['price_format'] }} <span class="text-muted">x {{ $cart['quantity'] }}<span>
               </div>
               <span class="offcanvas-products-delete" data-id="{{ $cart['cart_id'] }}"><i class="bi bi-x-lg"></i>
-                {{ __('shop/carts.delete') }}</span>
+                {{ __('common.delete') }}</span>
             </div>
           </div>
         </div>
diff --git a/themes/default/components/account/sidebar.blade.php b/themes/default/components/account/sidebar.blade.php
index 78bbe6b1..34e57f68 100644
--- a/themes/default/components/account/sidebar.blade.php
+++ b/themes/default/components/account/sidebar.blade.php
@@ -12,21 +12,21 @@
         <span>{{ __('shop/account.index') }}</span></a>
       <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.edit.index') ? 'active' : '' }}"
         href="{{ shop_route('account.edit.index') }}">
-        <span>修改个人信息</span></a>
+        <span>{{ __('shop/account.edit.index') }}</span></a>
       <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.order.index') || equal_route('shop.account.order.show') ? 'active' : '' }}"
         href="{{ shop_route('account.order.index') }}">
-        <span>我的订单</span></a>
+        <span>{{ __('shop/account.order.index') }}</span></a>
       <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.addresses.index') ? 'active' : '' }}"
         href="{{ shop_route('account.addresses.index') }}">
-        <span>我的地址</span></a>
+        <span>{{ __('shop/account.addresses.index') }}</span></a>
       <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.wishlist.index') ? 'active' : '' }}"
         href="{{ shop_route('account.wishlist.index') }}">
-        <span>我的收藏</span></a>
+        <span>{{ __('shop/account.wishlist.index') }}</span></a>
       <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.rma.index') || equal_route('shop.account.rma.show') ? 'active' : '' }}"
         href="{{ shop_route('account.rma.index') }}">
-        <span>我的售后</span></a>
+        <span>{{ __('shop/account.rma.index') }}</span></a>
       <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('logout') }}">
-        <span>退出登录</span></a>
+        <span>{{ __('common.sign_out') }}</span></a>
     </nav>
   </div>
 </div>
diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php
index 53ad673b..857d430f 100644
--- a/themes/default/product.blade.php
+++ b/themes/default/product.blade.php
@@ -44,9 +44,13 @@
         <div class="peoduct-info">
           <h1 class="mb-4">{{ $product['name'] }}</h1>
           <div class="stock-and-sku mb-4">
-            <span :class="product.quantity > 0 ? 'text-success' : 'text-secondary'">@{{ product.quantity > 0 ? 'In Stock' : 'Out Stock' }}</span>
+            <span :class="product.quantity > 0 ? 'text-success' : 'text-secondary'">
+              {{-- @{{ product.quantity > 0 ? 'In Stock' : 'Out Stock' }} --}}
+              <template v-if="product.quantity > 0">{{ __('shop/products.in_stock') }}</template>
+              <template v-else>{{ __('shop/products.out_stock') }}</template>
+            </span>
             <span class="ms-3 text-muted">SKU: @{{ product.sku }}</span>
-            <span class="ms-3 text-muted">MODEL: @{{ product.model }}</span>
+            <span class="ms-3 text-muted">{{ __('shop/products.model') }}: @{{ product.model }}</span>
           </div>
           @if (0)
           <div class="rating-wrap d-flex">
@@ -90,18 +94,18 @@
               class="btn btn-outline-dark ms-3 add-cart"
               :disabled="!product.quantity"
               @click="addCart(false, this)"
-              ><i class="bi bi-cart-fill me-1"></i>加入购物车
+              ><i class="bi bi-cart-fill me-1"></i>{{ __('shop/products.add_to_cart') }}
             </button>
             <button
               class="btn btn-dark ms-3"
               :disabled="!product.quantity"
               @click="addCart(true, this)"
-              ><i class="bi bi-bag-fill me-1"></i>立即购买
+              ><i class="bi bi-bag-fill me-1"></i>{{ __('shop/products.buy_now') }}
             </button>
           </div>
           <div class="add-wishlist">
             <button class="btn btn-link ps-0 text-dark" data-in-wishlist="{{ $product['in_wishlist'] }}" onclick="bk.addWishlist('{{ $product['id'] }}', this)">
-              <i class="bi bi-heart{{ $product['in_wishlist'] ? '-fill' : '' }} me-1"></i> 加入收藏夹
+              <i class="bi bi-heart{{ $product['in_wishlist'] ? '-fill' : '' }} me-1"></i> {{ __('shop/products.add_to_favorites') }}
             </button>
           </div>
         </div>
@@ -111,7 +115,7 @@
     <div class="product-description">
       <div class="nav nav-tabs nav-overflow justify-content-start justify-content-md-center border-bottom">
         <a class="nav-link fw-bold active" data-bs-toggle="tab" href="#product-description">
-          商品详情
+          {{ __('shop/products.product_details') }}
         </a>
       </div>
       <div class="tab-content">
diff --git a/themes/default/shared/product.blade.php b/themes/default/shared/product.blade.php
index b739fa79..77d81237 100644
--- a/themes/default/shared/product.blade.php
+++ b/themes/default/shared/product.blade.php
@@ -13,7 +13,7 @@
         class="btn btn-dark text-light mx-1 rounded-3"
         data-bs-toggle="tooltip"
         data-bs-placement="top"
-        title="加入收藏"
+        title="{{ __('shop/products.add_to_favorites') }}"
         data-in-wishlist="{{ $product['in_wishlist'] }}"
         onclick="bk.addWishlist('{{ $product['id'] }}', this)">
         <i class="bi bi-heart{{ $product['in_wishlist'] ? '-fill' : '' }}"></i>
@@ -22,7 +22,7 @@
         class="btn btn-dark text-light mx-1 rounded-3"
         data-bs-toggle="tooltip"
         data-bs-placement="top"
-        title="加入购物车"
+        title="{{ __('shop/products.add_to_cart') }}"
         onclick="bk.addCart({sku_id: '{{ $product['sku_id'] }}'}, this)">
         <i class="bi bi-cart"></i>
       </button>
diff --git a/themes/default/shared/steps.blade.php b/themes/default/shared/steps.blade.php
index 63b65ad5..ae88ad92 100644
--- a/themes/default/shared/steps.blade.php
+++ b/themes/default/shared/steps.blade.php
@@ -1,18 +1,18 @@
 <div class="steps-wrap">
   <div class="{{ $steps == 1 || $steps == 2 || $steps == 3 || $steps == 4 ? 'active':'' }}">
     <div class="number-wrap"><span class="number">1</span></div>
-    <span class="title">购物车</span>
+    <span class="title">{{ __('shop/steps.cart') }}</span>
   </div>
   <div class="{{ $steps == 2 || $steps == 3 || $steps == 4 ? 'active':'' }}">
     <div class="number-wrap"><span class="number">2</span></div>
-    <span class="title">结账</span>
+    <span class="title">{{ __('shop/steps.checkout') }}</span>
   </div>
   <div class="{{ $steps == 3 || $steps == 4 ? 'active':'' }}">
     <div class="number-wrap"><span class="number">3</span></div>
-    <span class="title">提交成功</span>
+    <span class="title">{{ __('shop/steps.submitted_successfully') }}</span>
   </div>
   <div class="{{ $steps == 4 ? 'active':'' }}">
     <div class="number-wrap"><span class="number">4</span></div>
-    <span class="title">付款</span>
+    <span class="title">{{ __('shop/steps.payment') }}</span>
   </div>
 </div>
\ No newline at end of file