Skip to content

Commit b758c9e

Browse files
fix: i18n
1 parent b3d937e commit b758c9e

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

ui/src/request/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ instance.interceptors.request.use(
2525
}
2626
const { user } = useStore()
2727
const token = user.getToken()
28+
const language = user.getLanguage()
29+
config.headers['Accept-Language'] = `${language}`
2830
if (token) {
2931
config.headers['AUTHORIZATION'] = `${token}`
3032
}
@@ -208,7 +210,7 @@ export const postStream: (url: string, data?: unknown) => Promise<Result<any> |
208210
if (token) {
209211
headers['AUTHORIZATION'] = `${token}`
210212
}
211-
headers['Accept-Language'] = `${language}`
213+
headers['Accept-Language'] = `${language}`
212214
return fetch(url, {
213215
method: 'POST',
214216
body: data ? JSON.stringify(data) : undefined,

ui/src/stores/modules/user.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const useUserStore = defineStore({
3535
getLanguage() {
3636
const application = useApplicationStore()
3737
return this.userType === 1
38-
? this.userInfo?.language || localStorage.getItem('language')
38+
? this.userInfo?.language || localStorage.getItem('MaxKB-locale')
3939
: application?.userLanguage
4040
},
4141
showXpack() {
@@ -126,8 +126,7 @@ const useUserStore = defineStore({
126126
async profile() {
127127
return UserApi.profile().then(async (ok) => {
128128
this.userInfo = ok.data
129-
useLocalStorage(localeConfigKey, 'zh-CN').value = ok.data?.language
130-
// localStorage.setItem('language', ok.data?.language)
129+
useLocalStorage(localeConfigKey, 'zh-CN').value = ok.data.language
131130
return this.asyncGetProfile()
132131
})
133132
},
@@ -174,6 +173,7 @@ const useUserStore = defineStore({
174173
return new Promise((resolve, reject) => {
175174
UserApi.postLanguage({ language: lang }, loading)
176175
.then(async (ok) => {
176+
useLocalStorage(localeConfigKey, 'zh-CN').value = lang
177177
window.location.reload()
178178

179179
resolve(ok)

ui/src/views/login/index.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,11 @@ import type { FormInstance, FormRules } from 'element-plus'
106106
import useStore from '@/stores'
107107
import authApi from '@/api/auth-setting'
108108
import { MsgConfirm, MsgSuccess } from '@/utils/message'
109+
109110
import { t } from '@/locales'
110111
import QrCodeTab from '@/views/login/components/QrCodeTab.vue'
112+
import { useI18n } from 'vue-i18n'
113+
const { locale } = useI18n({ useScope: 'global' })
111114
const loading = ref<boolean>(false)
112115
const { user } = useStore()
113116
const router = useRouter()
@@ -212,6 +215,7 @@ const login = () => {
212215
user
213216
.login(loginMode.value, loginForm.value.username, loginForm.value.password)
214217
.then(() => {
218+
locale.value = localStorage.getItem('MaxKB-locale') || 'zh-CN'
215219
router.push({ name: 'home' })
216220
})
217221
.finally(() => (loading.value = false))

0 commit comments

Comments
 (0)