Skip to content

Commit

Permalink
fix: i18n
Browse files Browse the repository at this point in the history
  • Loading branch information
xjh22222228 committed Jan 23, 2022
1 parent 8b0dd4b commit a1d8e5c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 5 additions & 3 deletions src/components/FileEncodeRuleDialog.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<el-dialog
title="文件上传方案"
:title="t('uploadFileEncode')"
width="500px"
:model-value="visible"
:before-close="beforeClose"
Expand All @@ -24,8 +24,8 @@

<template #footer>
<span class="dialog-footer">
<el-button @click="beforeClose">取 消</el-button>
<el-button type="primary" @click="handleOk">确 定</el-button>
<el-button @click="beforeClose">{{ t('cancel') }}</el-button>
<el-button type="primary" @click="handleOk">{{ t('ok') }}</el-button>
</span>
</template>
</el-dialog>
Expand All @@ -36,7 +36,9 @@ import { ref, computed } from 'vue'
import { useStore } from 'vuex'
import { FileEncode } from '@/types'
import { getFileEncode } from '@/utils'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
const store = useStore()
const visible = computed(() => store.state.showFileEncode)
Expand Down
4 changes: 1 addition & 3 deletions src/store/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ export default createStore<State>({
el.classList.remove('actived')
})
try {
// Github: Promise.all 不能并行创建/否则会出现409 (暂不处理)
const allRes = await Promise.allSettled(promises)
if (isGiteeProvider()) {
await buildGiteePages()
Expand Down Expand Up @@ -340,12 +341,9 @@ export default createStore<State>({
} else {
ElMessage.error('Failed')
}
} else {
ElMessage.error(res.reason)
}
})


return allRes
} catch (error) {
console.error(error)
Expand Down

1 comment on commit a1d8e5c

@vercel
Copy link

@vercel vercel bot commented on a1d8e5c Jan 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.