diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id index afb96d0c..c0fb3668 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -37a0bf8c45158e97c62ed1be6466ad1ad977e544 \ No newline at end of file +fed37778e9514dc3dec6b8c767aa01b05250a597 \ No newline at end of file diff --git a/package.json b/package.json index 8f6d090a..5cc8173b 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "v-contextmenu": "^2.8.0", "vue": "^2.6.10", "vue-grid-layout": "^2.3.4", - "vue-i18n": "^8.10.0", "vue-json-tree-view": "^2.1.4", "vue-router": "^3.0.3", "vue-splitpane": "^1.0.4", @@ -53,7 +52,6 @@ "vuex": "^3.0.1" }, "devDependencies": { - "@kazupon/vue-i18n-loader": "^0.3.0", "@vue/cli-plugin-babel": "^3.6.0", "@vue/cli-plugin-eslint": "^3.6.0", "@vue/cli-plugin-unit-jest": "^3.6.0", diff --git a/src/i18n/index.js b/src/i18n/index.js deleted file mode 100644 index d78b5c76..00000000 --- a/src/i18n/index.js +++ /dev/null @@ -1,17 +0,0 @@ -import Vue from 'vue' -import VueI18n from 'vue-i18n' - -import cn from './lang/cn' -import ja from './lang/ja' -import en from './lang/en' - -Vue.use(VueI18n) - -export default new VueI18n({ - locale: 'cn', - messages: { - cn, - ja, - en - } -}) diff --git a/src/i18n/lang/cn/index.js b/src/i18n/lang/cn/index.js deleted file mode 100644 index c38fff12..00000000 --- a/src/i18n/lang/cn/index.js +++ /dev/null @@ -1,7 +0,0 @@ -export default { - pub: { - pageHeader: { - demo: '示例' - } - } -} diff --git a/src/i18n/lang/en/index.js b/src/i18n/lang/en/index.js deleted file mode 100644 index 17400a47..00000000 --- a/src/i18n/lang/en/index.js +++ /dev/null @@ -1,7 +0,0 @@ -export default { - pub: { - pageHeader: { - demo: 'Demo' - } - } -} diff --git a/src/i18n/lang/ja/index.js b/src/i18n/lang/ja/index.js deleted file mode 100644 index e7e4daab..00000000 --- a/src/i18n/lang/ja/index.js +++ /dev/null @@ -1,7 +0,0 @@ -export default { - pub: { - pageHeader: { - demo: 'サンプル' - } - } -} diff --git a/src/main.js b/src/main.js index 36621ee3..ef861c3a 100644 --- a/src/main.js +++ b/src/main.js @@ -5,8 +5,6 @@ import App from './App' import d2Admin from '@/plugin/d2admin' // store import store from '@/store/index' -// 多国语 -import i18n from './i18n' // [ 可选组件 ]D2-Crud import D2Crud from '@d2-projects/d2-crud' @@ -53,7 +51,6 @@ Vue.component('VueUeditorWrap', VueUeditorWrap) new Vue({ router, store, - i18n, render: h => h(App), created () { // 处理路由 得到每一级的路由设置 diff --git a/src/menu/modules/demo-plugins.js b/src/menu/modules/demo-plugins.js index d674975a..7097dcb5 100644 --- a/src/menu/modules/demo-plugins.js +++ b/src/menu/modules/demo-plugins.js @@ -32,15 +32,6 @@ export default { { path: `${pre}export/txt`, title: '文本' } ] }, - { - path: `${pre}i18n`, - title: '多国语', - icon: 'language', - children: [ - { path: `${pre}i18n/demo1`, title: '示例1' }, - { path: `${pre}i18n/demo2`, title: '示例2' } - ] - }, { path: `${pre}better-scroll`, title: '滚动扩展', diff --git a/src/router/modules/plugins.js b/src/router/modules/plugins.js index f27fca75..f63a3b67 100644 --- a/src/router/modules/plugins.js +++ b/src/router/modules/plugins.js @@ -18,8 +18,6 @@ export default { { path: 'day', name: `${pre}day`, component: _import('demo/plugins/day'), meta: { ...meta, title: '日期计算' } }, { path: 'export/table', name: `${pre}export-table`, component: _import('demo/plugins/export/table.vue'), meta: { ...meta, title: '导出表格' } }, { path: 'export/txt', name: `${pre}export-txt`, component: _import('demo/plugins/export/txt.vue'), meta: { ...meta, title: '导出文本' } }, - { path: 'i18n/demo1', name: `${pre}i18n-demo1`, component: _import('demo/plugins/i18n/demo1.vue'), meta: { ...meta, title: '多国语示例 1' } }, - { path: 'i18n/demo2', name: `${pre}i18n-demo2`, component: _import('demo/plugins/i18n/demo2.vue'), meta: { ...meta, title: '多国语示例 2' } }, { path: 'import/csv', name: `${pre}import-csv`, component: _import('demo/plugins/import/csv.vue'), meta: { ...meta, title: '导入 csv' } }, { path: 'import/xlsx', name: `${pre}import-xlsx`, component: _import('demo/plugins/import/xlsx.vue'), meta: { ...meta, title: '导入 xlsx' } }, { path: 'index', name: `${pre}index`, component: _import('demo/plugins/index'), meta: { ...meta, title: '插件首页' } }, diff --git a/src/views/demo/plugins/i18n/components/DemoI18n.vue b/src/views/demo/plugins/i18n/components/DemoI18n.vue deleted file mode 100644 index dca60605..00000000 --- a/src/views/demo/plugins/i18n/components/DemoI18n.vue +++ /dev/null @@ -1,67 +0,0 @@ - -{ - "cn": { - "subtitle": "点击上面的按钮，你可以在两个示例页面之间切换，检查语言变化", - "hello": "你好", - "vue": "Vue (读音 /vjuː/，类似于 view) 是一套用于构建用户界面的渐进式框架。与其它大型框架不同的是，Vue 被设计为可以自底向上逐层应用。Vue 的核心库只关注视图层，不仅易于上手，还便于与第三方库或既有项目整合。另一方面，当与现代化的工具链以及各种支持类库结合使用时，Vue 也完全能够为复杂的单页应用提供驱动。", - "check": { - "title": "请选择", - "label": { - "Beijing": "北京", - "Tokyo": "东京", - "NewYork": "纽约" - } - } - }, - "en": { - "subtitle": "Click the button above, you can switch between two sample pages to check language changes", - "hello": "hello", - "vue": "Vue (pronounced /vjuː/, like view) is a progressive framework for building user interfaces. Unlike other monolithic frameworks, Vue is designed from the ground up to be incrementally adoptable. The core library is focused on the view layer only, and is easy to pick up and integrate with other libraries or existing projects. On the other hand, Vue is also perfectly capable of powering sophisticated Single-Page Applications when used in combination with modern tooling and supporting libraries.", - "check": { - "title": "Please choose", - "label": { - "Beijing": "Beijing", - "Tokyo": "Tokyo", - "NewYork": "NewYork" - } - } - }, - "ja": { - "subtitle": "上のボタンをクリックして，あなたは2つの例のページの間で切り替えて、言語の変化を検査することができます", - "hello": "こんにちは", - "vue": "Vue (発音は /vjuː/、view と同様）はユーザーインターフェイスを構築するためのプログレッシブフレームワークです。他の一枚板(モノリシック: monolithic)なフレームワークとは異なり、Vue は少しずつ適用していけるように設計されています。中核となるライブラリは view 層だけに焦点を当てています。そのため、使い始めるのも、他のライブラリや既存のプロジェクトに統合するのも、とても簡単です。また、モダンなツールやサポートライブラリと併用することで、洗練されたシングルページアプリケーションの開発も可能です。", - "check": { - "title": "選択してください", - "label": { - "Beijing": "北京", - "Tokyo": "東京", - "NewYork": "ニューヨーク" - } - } - } -} - - - - - diff --git a/src/views/demo/plugins/i18n/components/DemoI18nControl.vue b/src/views/demo/plugins/i18n/components/DemoI18nControl.vue deleted file mode 100644 index 59a67b82..00000000 --- a/src/views/demo/plugins/i18n/components/DemoI18nControl.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - diff --git a/src/views/demo/plugins/i18n/demo1.vue b/src/views/demo/plugins/i18n/demo1.vue deleted file mode 100644 index a4a92221..00000000 --- a/src/views/demo/plugins/i18n/demo1.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/src/views/demo/plugins/i18n/demo2.vue b/src/views/demo/plugins/i18n/demo2.vue deleted file mode 100644 index 202f92d4..00000000 --- a/src/views/demo/plugins/i18n/demo2.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/vue.config.js b/vue.config.js index d1e30814..47678766 100644 --- a/vue.config.js +++ b/vue.config.js @@ -75,13 +75,6 @@ module.exports = { .use('text-loader') .loader('text-loader') .end() - // i18n - config.module - .rule('i18n') - .resourceQuery(/blockType=i18n/) - .use('i18n') - .loader('@kazupon/vue-i18n-loader') - .end() // svg const svgRule = config.module.rule('svg') svgRule.uses.clear()