Merge pull request #958 from Matataki-io/testing

Chrismas Release
Matataki-io · Dec 24, 2020 · 80a3a28 · 80a3a28
2 parents 2614eee + a65ebbd
commit 80a3a28
Show file tree

Hide file tree

Showing 72 changed files with 24,675 additions and 5,399 deletions.
diff --git a/components/404/index.vue b/components/404/index.vue
@@ -11,7 +11,7 @@
     <div class="info">
       <p>{{ $t('notPage') }}</p>
       <p class="back">
-        三秒后自动返回首页...
+        {{ $t('automatically-return-to-the-homepage-after-three-seconds') }}
       </p>
       <a
         href="/"

diff --git a/components/500/index.vue b/components/500/index.vue
@@ -9,7 +9,7 @@
     <div class="info">
       <p>{{ $t('serverError') }}</p>
       <p class="back">
-        三秒后自动返回首页...
+        {{ $t('automatically-return-to-the-homepage-after-three-seconds') }}
       </p>
       <a
         href="/"

diff --git a/components/NoTokenTip.vue b/components/NoTokenTip.vue
@@ -4,10 +4,10 @@
       <img src="@/assets/img/gray_oops.png" alt="oops" class="oops">
       <img src="@/assets/img/gray_fanpiao.png" alt="Fan票">
     </div>
-    <p class="no-token-tip">尚未发行Fan票</p>
+    <p class="no-token-tip">{{ $t('fan-tickets-not-yet-issued') }}</p>
     <router-link :to="{ name: 'postminetoken' }">
       <el-button type="primary" class="issue-btn">
-        去发行
+        {{ $t('to-issue') }}
       </el-button>
     </router-link>
   </div>

diff --git a/components/article/ArticleFooter.vue b/components/article/ArticleFooter.vue
@@ -6,16 +6,16 @@
         placement="bottom"
       >
         <div slot="content">
-          点击可查看本文的授权许可详情
+          {{ $t('click-to-view-the-license-details-of-this-article') }}
         </div>
-        <span class="cc-license">本文使用
+        <span class="cc-license">{{ $t('this-article-uses') }}
           <a
             :href="license.url"
             class="license-statement"
             rel="noopener"
             target="_blank"
-          >知识共享 {{ license.chinese }} 4.0</a>
-          协议
+          >{{ $t('knowledge-sharing') }} {{ license.chinese }} 4.0</a>
+          {{ $t('protocol') }}
         </span>
       </el-tooltip>
       <template v-if="isOriginal">

diff --git a/components/article/ArticleOrderModal.vue b/components/article/ArticleOrderModal.vue
@@ -16,27 +16,27 @@
           src="@/assets/img/m_logo.png"
           alt="logo"
         >
-        <p>请仔细核对订单信息，如果有误请取消后再次尝试</p>
+        <p>{{ $t('please-check-the-order-information-carefully-if-it-is-wrong-please-cancel-and-try-again') }}</p>
         <table class="order-table">
           <tbody>
             <tr>
               <td class="order-key">
-                交易账号：
+                {{ $t('trading-account') }}：
               </td><td>{{ currentUserInfo.nickname || currentUserInfo.name }}</td>
             </tr>
             <tr>
               <td class="order-key">
-                交易类型：
+                {{ $t('transaction-type') }}：
               </td><td>{{ tradeType }}</td>
             </tr>
             <tr>
               <td class="order-key">
-                创建时间：
+                {{ $t('creation-time') }}：
               </td><td>{{ friendlyTime }}</td>
             </tr>
             <tr>
               <td class="order-key">
-                订单编号：
+                {{ $t('order-number') }}：
               </td><td>{{ tradeNo }}</td>
             </tr>
           </tbody>
@@ -50,19 +50,19 @@
         >
           <el-table-column
             prop="name"
-            label="品名"
+            :label="$t('product-name')"
           />
           <el-table-column
             prop="operating"
-            label="操作"
+            :label="$t('operating')"
           />
           <el-table-column
             prop="amount"
-            label="数量"
+            :label="$t('quantity')"
           />
           <el-table-column
             prop="total"
-            label="小计"
+            :label="$t('subtotal')"
           />
         </el-table>
       </div>
@@ -74,24 +74,24 @@
               effect="light"
             >
               <div slot="content">
-                您的交易可能由于正常的价格波动而失败，<br>
-                预期价格波动区间将有助于您的交易成功。<br>
-                交易成功后，多支付的金额会退回。
+                {{ $t('your-transaction-may-fail-due-to-normal-price-fluctuations') }}<br>
+                {{ $t('the-expected-price-fluctuation-range-will-help-your-trading-success') }}<br>
+                {{ $t('after-the-transaction-is-successful-the-overpayment-amount-will-be-refunded') }}
               </div>
               <i class="el-icon-question" />
             </el-tooltip>
-            预期价格波动：1%
+            {{ $t('expected-price-fluctuations') }}：1%
           </div>
           <div>
             <span class="money-label">
               <el-tooltip
                 placement="bottom"
                 effect="light"
               >
-                <div slot="content">CNY 交易金额精度大于 0.01 时会自动进位支付，<br>多支付的金额会保留在您的CNY账户中。</div>
+                <div slot="content">{{ $t('when-the-accuracy-of-the-transaction-amount-of-cny-is-greater-than-0-01-it-will-be-automatically-carried-and-paid') }}<br>{{ $t('the-overpayment-amount-will-be-kept-in-your-cny-account') }}</div>
                 <i class="el-icon-question" />
               </el-tooltip>
-              合计：
+              {{ $t('total') }}：
             </span>
             <span class="money">{{ cnyAmount.toFixed(2) }} CNY</span>
           </div>
@@ -102,14 +102,14 @@
               v-model="useBalance"
               @change="useBalanceChange"
             >
-              使用余额（{{ balance }} CNY）
+              {{ $t('use-balance') }}（{{ balance }} CNY）
             </el-checkbox>
           </div>
-          <div><span class="money-label">抵扣：</span><span class="money">{{ deduction.toFixed(2) }} CNY</span></div>
+          <div><span class="money-label">{{ $t('deduction') }}：</span><span class="money">{{ deduction.toFixed(2) }} CNY</span></div>
         </div>
         <div class="flexBox padding20">
           <div />
-          <div><span class="money-label">应付：</span><span class="money">{{ needPay.toFixed(2) }} CNY</span></div>
+          <div><span class="money-label">{{ $t('handle') }}：</span><span class="money">{{ needPay.toFixed(2) }} CNY</span></div>
         </div>
       </div>
       <!-- <div class="payBtnBox">
@@ -137,7 +137,7 @@
           type="primary"
           @click="onSubmit"
         >
-          确认使用余额支付
+          {{ $t('confirm-payment-with-balance') }}
         </el-button>
       </div>
     </div>
@@ -202,18 +202,18 @@ export default {
     ...mapGetters(['currentUserInfo']),
     tradeType() {
       const typeOptions = {
-        add: '添加流动性',
+        add: this.$t('add-liquidity'),
         buy_token_input: this.$t('home.buyFanTickets'),
         buy_token_output: this.$t('home.buyFanTickets'),
-        sale_token: '出售Fan票',
+        sale_token: this.$t('sell-fan-tickets'),
       };
       if (this.articleId) {
-        return `购买文章${this.articleId}`
+        return `${this.$t('buy-article')}${this.articleId}`
       } else {
         const type = this.order.items ? this.order.items.orderTokenItem.type : null
         return typeOptions[type] || this.$t('not')
       }
-      return `购买文章${this.articleId}`
+      return `${this.$t('buy-article')}${this.articleId}`
     },
     friendlyTime() {
       return this.moment(this.order.create_time).format(

diff --git a/components/article/RewardFooter.vue b/components/article/RewardFooter.vue
@@ -3,16 +3,16 @@
     <button
       class="reward-btn"
       :disabled="isMe(userData.id)"
-      :title="isMe(userData.id) && '不能给自己赞赏~'"
+      :title="isMe(userData.id) && $t('cant-praise-myself')"
       @click="reward"
     >
       <svg-icon
         icon-class="shang"
         class="reward-icon"
       />
     </button>
-    <p class="reward-tip">喜欢就打赏Fan票吧～</p>
-    <p v-if="rewardCount > 0" class="reward-list-tip">- {{ rewardCount }}位瞬Matataki用户已打赏 -</p>
+    <p class="reward-tip">{{ $t('if-you-like-get-a-fan-ticket') }}</p>
+    <p v-if="rewardCount > 0" class="reward-list-tip">- {{ $t('number-instant-matataki-users-have-rewarded', [ rewardCount ]) }} -</p>
     <div v-if="rewardCount > 0" class="recommended-designer-avatar-wrap js-recommended-avatar">
       <div v-for="(item, i) of list" :key="i" class="avatar-container-30">
         <c-user-popover :user-id="Number(item.from_uid)">
@@ -37,7 +37,7 @@
       </div>
       <div v-if="showAll" class="avatar-container-30">
         <button class="left-count" @click="showAll = false">
-          收起
+          {{ $t('put-away') }}
         </button>
       </div>
     </div>

diff --git a/components/article_comment/index.vue b/components/article_comment/index.vue
@@ -30,7 +30,7 @@
       </div> -->
     </div>
     <button type="submit" class="comment-submit" @click="postComment">
-      发表评论
+      {{ $t('post-a-comment') }}
     </button>
   </div>
 </template>

diff --git a/components/asset/giftDialog.vue b/components/asset/giftDialog.vue
@@ -2,7 +2,7 @@
   <m-dialog
     v-model="giftDialog"
     width="600px"
-    title="转账"
+    :title="$t('transferMoney')"
   >
     <el-form
       ref="form"
@@ -12,10 +12,10 @@
       label-width="70px"
       class="gift-form"
     >
-      <el-form-item label="接受对象">
+      <el-form-item :label="$t('accepted-object')">
         <el-input
           v-model="form.username"
-          placeholder="请输入转账的对象"
+          :placeholder="$t('please-enter-the-transfer-destination')"
           size="small"
           style="z-index: 2;"
         />
@@ -86,14 +86,14 @@
         </el-form-item>
       </transition>
       <el-form-item
-        label="发送数量"
+        :label="$t('quantity-sent')"
         prop="amount"
       >
         <el-input
           v-model="form.amount"
           :max="form.max"
           :min="form.min"
-          placeholder="请输入数量"
+          :placeholder="$t('please-enter-the-quantity')"
           size="small"
           clearable
         />
@@ -102,7 +102,7 @@
         v-if="balance"
         class="balance"
       >
-        余额&nbsp;{{ balance }}&nbsp;
+        {{ $t('balance') }}&nbsp;{{ balance }}&nbsp;
         <a
           href="javascript:;"
           @click="form.amount = balance"

diff --git a/components/header/index.vue b/components/header/index.vue
@@ -30,7 +30,7 @@
 
       <div class="pc head-flex">
         <div class="qq-tips">
-          请加我们官方QQ群：766605671
+          {{ $t('header-tips') }}
         </div>
         <div class="search">
           <input
@@ -67,7 +67,7 @@
           v-if="isLogined"
           class="item"
           effect="dark"
-          content="消息中心"
+          :content="$t('message-center')"
           placement="bottom"
         >
           <n-link
@@ -149,7 +149,7 @@
               class="link"
             >
               <el-dropdown-item>
-                Dashboard
+                {{ $t('menu-dashboard') }}
               </el-dropdown-item>
             </n-link>
 
@@ -243,7 +243,7 @@
             </li>
             <li class="menu-ul-item">
               <n-link :to="{name: 'dashboard'}" class="link">
-                <svg-icon icon-class="menu_account" class="icon" />Dashboard
+                <svg-icon icon-class="menu_account" class="icon" />{{ $t('menu-dashboard') }}
               </n-link>
             </li>
             <li class="menu-ul-item" @click="btnsignOut">
@@ -259,7 +259,7 @@
           </li>
           <li class="menu-ul-item">
             <n-link to="/notification">
-              <svg-icon icon-class="menu_notice" class="icon" />消息中心
+              <svg-icon icon-class="menu_notice" class="icon" />{{ $t('message-center') }}
               <span v-if="numMessagesLabel" class="news">
                 {{ numMessagesLabel }}
               </span>