From e939e0dd05e8fb0d776eacf3e0581dc9d3c02318 Mon Sep 17 00:00:00 2001 From: Apcallover <1503963513@qq.com> Date: Tue, 20 Feb 2024 17:27:57 +0800 Subject: [PATCH] =?UTF-8?q?flat:=20avue=20=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- src/lang/index.js | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a2e4f2..9ec9ec3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10475,7 +10475,7 @@ "version": "0.3.20", "resolved": "http://r.cnpmjs.org/sockjs/download/sockjs-0.3.20.tgz", "integrity": "sha1-smooPsVi74smh7RAM6Tuzqx12FU=", - "dev": false, + "dev": true, "requires": { "faye-websocket": "^0.10.0", "uuid": "^3.4.0", @@ -10486,7 +10486,7 @@ "version": "1.4.0", "resolved": "http://r.cnpmjs.org/sockjs-client/download/sockjs-client-1.4.0.tgz", "integrity": "sha1-yfJWjhnI/YFztJl+o0IOC7MGx9U=", - "dev": false, + "dev": true, "requires": { "debug": "^3.2.5", "eventsource": "^1.0.7", diff --git a/src/lang/index.js b/src/lang/index.js index bfb3555..6e3cd16 100644 --- a/src/lang/index.js +++ b/src/lang/index.js @@ -2,6 +2,8 @@ import Vue from 'vue' import VueI18n from 'vue-i18n' import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'// element-ui lang +import avueZhLocale from "@smallwei/avue/lib/locale/lang/zh"; +import avueEnLocale from "@smallwei/avue/lib/locale/lang/en"; import enLocale from './en' import zhLocale from './zh' import { getStore } from '@/util/store' @@ -12,17 +14,17 @@ const messages = { ...enLocale, ...elementEnLocale, ...Avue.locale.en, + ...avueEnLocale }, zh: { ...zhLocale, ...elementZhLocale, ...Avue.locale.zh, + ...avueZhLocale, } } - const i18n = new VueI18n({ locale: getStore({ name: 'language' }) || 'zh', messages }) - -export default i18n \ No newline at end of file +export default i18n