From e3a7be0382c0d0fa60116700e5a4bad784ebb9df Mon Sep 17 00:00:00 2001
From: Himit_ZH <372347736@qq.com>
Date: Tue, 7 Dec 2021 12:19:05 +0800
Subject: [PATCH] add vxe-table i18n

---
 hoj-vue/src/i18n/index.js                                | 8 +++++---
 hoj-vue/src/main.js                                      | 8 ++++++--
 hoj-vue/src/views/oj/contest/children/ACMContestRank.vue | 4 +++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/hoj-vue/src/i18n/index.js b/hoj-vue/src/i18n/index.js
index de65b5ea..47f92cb1 100644
--- a/hoj-vue/src/i18n/index.js
+++ b/hoj-vue/src/i18n/index.js
@@ -2,12 +2,14 @@ import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 import elenUS from 'element-ui/lib/locale/lang/en'
 import elzhCN from 'element-ui/lib/locale/lang/zh-CN'
+import vxeEnUS from 'vxe-table/lib/locale/lang/en-US'
+import vxeZhCN from 'vxe-table/lib/locale/lang/zh-CN'
 import storage from '@/common/storage'
 Vue.use(VueI18n)
 
 const languages = [
-  {value: 'en-US', label: 'English', el: elenUS},
-  {value: 'zh-CN', label: '简体中文',  el: elzhCN},
+  {value: 'en-US', label: 'English', el: elenUS, vxe: {...vxeEnUS}},
+  {value: 'zh-CN', label: '简体中文',  el: elzhCN, vxe: {...vxeZhCN}},
 ]
 const messages = {}
 
@@ -16,7 +18,7 @@ for (let lang of languages) {
   let locale = lang.value
   let m = require(`./oj/${locale}`).m
   Object.assign(m, require(`./admin/${locale}`).m)
-  let ui = Object.assign({}, lang.el)
+  let ui = Object.assign(lang.vxe, lang.el)
   messages[locale] = Object.assign({m: m}, ui);
 }
 
diff --git a/hoj-vue/src/main.js b/hoj-vue/src/main.js
index c2c685d5..859e6070 100644
--- a/hoj-vue/src/main.js
+++ b/hoj-vue/src/main.js
@@ -14,7 +14,7 @@ import Md_Katex from '@iktakahiro/markdown-it-katex'
 
 // 注释表示使用cdn引入
 // import 'xe-utils' 
-// import VXETable from 'vxe-table'
+import VXETable from 'vxe-table'
 // import 'vxe-table/lib/style.css'
 
 import Katex from '@/common/katex'
@@ -69,7 +69,11 @@ Object.keys(filters).forEach(key => {   // 注册全局过滤器
 })
 Vue.use(VueParticles) // 粒子特效背景
 Vue.use(Katex)  // 数学公式渲染
-// Vue.use(VXETable) // 表格组件
+VXETable.setup({
+  // 对组件内置的提示语进行国际化翻译
+  i18n: (key, value) => i18n.t(key, value)
+})
+Vue.use(VXETable) // 表格组件
 Vue.use(VueClipboard) // 剪贴板
 Vue.use(highlight) // 代码高亮
 Vue.use(Element,{
diff --git a/hoj-vue/src/views/oj/contest/children/ACMContestRank.vue b/hoj-vue/src/views/oj/contest/children/ACMContestRank.vue
index e8d972ca..6494da0b 100644
--- a/hoj-vue/src/views/oj/contest/children/ACMContestRank.vue
+++ b/hoj-vue/src/views/oj/contest/children/ACMContestRank.vue
@@ -231,7 +231,9 @@
                   }}+</template
                 >{{ row.submissionInfo[problem.displayId].tryNum
                 }}{{
-                  row.submissionInfo[problem.displayId].tryNum > 1
+                  row.submissionInfo[problem.displayId].errorNum +
+                    row.submissionInfo[problem.displayId].tryNum >
+                  1
                     ? ' tries'
                     : ' try'
                 }}