Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev
This commit is contained in:
commit
c141e127f0
|
@ -5,19 +5,23 @@ import enLocale from "element-ui/lib/locale/lang/en";
|
||||||
import zh_CNLocale from "element-ui/lib/locale/lang/zh-CN";
|
import zh_CNLocale from "element-ui/lib/locale/lang/zh-CN";
|
||||||
import zh_TWLocale from "element-ui/lib/locale/lang/zh-TW";
|
import zh_TWLocale from "element-ui/lib/locale/lang/zh-TW";
|
||||||
import zh_CN from "./zh-CN";
|
import zh_CN from "./zh-CN";
|
||||||
|
import en_US from "./en-US";
|
||||||
|
import zh_TW from "./zh-TW";
|
||||||
|
|
||||||
Vue.use(VueI18n);
|
Vue.use(VueI18n);
|
||||||
|
|
||||||
const messages = {
|
const messages = {
|
||||||
'en_US': {
|
'en_US': {
|
||||||
...enLocale
|
...enLocale,
|
||||||
|
...en_US
|
||||||
},
|
},
|
||||||
'zh_CN': {
|
'zh_CN': {
|
||||||
...zh_CNLocale,
|
...zh_CNLocale,
|
||||||
...zh_CN
|
...zh_CN
|
||||||
},
|
},
|
||||||
'zh_TW': {
|
'zh_TW': {
|
||||||
...zh_TWLocale
|
...zh_TWLocale,
|
||||||
|
...zh_TW
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -26,7 +30,7 @@ const i18n = new VueI18n({
|
||||||
messages,
|
messages,
|
||||||
});
|
});
|
||||||
|
|
||||||
const loadedLanguages = ['zh_CN'];
|
const loadedLanguages = ['en_US', 'zh_CN', 'zh_TW'];
|
||||||
|
|
||||||
function setI18nLanguage(lang) {
|
function setI18nLanguage(lang) {
|
||||||
i18n.locale = lang;
|
i18n.locale = lang;
|
||||||
|
|
Loading…
Reference in New Issue