!68 修复升级依赖带来的问题
* Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
This commit is contained in:
@ -4,6 +4,7 @@ import { createI18n } from 'vue-i18n';
|
||||
// 本地语言包
|
||||
import enUSLocale from './en_US';
|
||||
import zhCNLocale from './zh_CN';
|
||||
import { LanguageEnum } from '@/enums/LanguageEnum';
|
||||
|
||||
const messages = {
|
||||
zh_CN: {
|
||||
@ -18,12 +19,12 @@ const messages = {
|
||||
* 获取当前语言
|
||||
* @returns zh-cn|en ...
|
||||
*/
|
||||
export const getLanguage = () => {
|
||||
const language = useStorage('language', 'zh_CN');
|
||||
export const getLanguage = (): LanguageEnum => {
|
||||
const language = useStorage<LanguageEnum>('language', LanguageEnum.zh_CN);
|
||||
if (language.value) {
|
||||
return language.value;
|
||||
}
|
||||
return 'zh_CN';
|
||||
return LanguageEnum.zh_CN;
|
||||
};
|
||||
|
||||
const i18n = createI18n({
|
||||
|
Reference in New Issue
Block a user