From 928458b19fd148251ad47c3b86833f541a344feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com> Date: Tue, 13 Feb 2018 23:20:06 +0800 Subject: [PATCH] no message Former-commit-id: 80518778b863c8743fb14a507e17035b224a1a63 Former-commit-id: 3915babc34ee944dab0c118d9aebc15de29aeba8 Former-commit-id: 42da8e03b50f7bd20ea69ae59ea172e81f561238 --- src/i18n/index.js | 8 ++++---- src/i18n/lang/cn/index.js | 2 +- src/i18n/lang/en/index.js | 2 +- src/i18n/lang/ja/index.js | 2 +- src/pages/demo/plugins/vue-i18n/components/DemoI18n.vue | 2 +- .../demo/plugins/vue-i18n/components/DemoI18nControl.vue | 8 ++++---- src/pages/demo/plugins/vue-i18n/demo-1.vue | 2 +- src/pages/demo/plugins/vue-i18n/demo-2.vue | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/i18n/index.js b/src/i18n/index.js index 9f705600..c6a93a8e 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -4,10 +4,10 @@ import VueI18n from 'vue-i18n' Vue.use(VueI18n) export default new VueI18n({ - locale: 'CN', + locale: 'cn', messages: { - 'CN': require('./lang/cn/'), - 'JA': require('./lang/ja/'), - 'EN': require('./lang/en/') + 'cn': require('./lang/cn/').default, + 'ja': require('./lang/ja/').default, + 'en': require('./lang/en/').default } }) diff --git a/src/i18n/lang/cn/index.js b/src/i18n/lang/cn/index.js index 4c197768..c38fff12 100644 --- a/src/i18n/lang/cn/index.js +++ b/src/i18n/lang/cn/index.js @@ -1,4 +1,4 @@ -export const lang = { +export default { pub: { pageHeader: { demo: '示例' diff --git a/src/i18n/lang/en/index.js b/src/i18n/lang/en/index.js index bcead0c5..17400a47 100644 --- a/src/i18n/lang/en/index.js +++ b/src/i18n/lang/en/index.js @@ -1,4 +1,4 @@ -export const lang = { +export default { pub: { pageHeader: { demo: 'Demo' diff --git a/src/i18n/lang/ja/index.js b/src/i18n/lang/ja/index.js index 663cf3de..e7e4daab 100644 --- a/src/i18n/lang/ja/index.js +++ b/src/i18n/lang/ja/index.js @@ -1,4 +1,4 @@ -export const lang = { +export default { pub: { pageHeader: { demo: 'サンプル' diff --git a/src/pages/demo/plugins/vue-i18n/components/DemoI18n.vue b/src/pages/demo/plugins/vue-i18n/components/DemoI18n.vue index 11fea2ac..e8558316 100644 --- a/src/pages/demo/plugins/vue-i18n/components/DemoI18n.vue +++ b/src/pages/demo/plugins/vue-i18n/components/DemoI18n.vue @@ -1,3 +1,3 @@ diff --git a/src/pages/demo/plugins/vue-i18n/components/DemoI18nControl.vue b/src/pages/demo/plugins/vue-i18n/components/DemoI18nControl.vue index 76d11275..9f1f756a 100644 --- a/src/pages/demo/plugins/vue-i18n/components/DemoI18nControl.vue +++ b/src/pages/demo/plugins/vue-i18n/components/DemoI18nControl.vue @@ -1,9 +1,9 @@ @@ -12,7 +12,7 @@ export default { data () { return { - lang: 'CN' + lang: 'cn' } }, methods: { diff --git a/src/pages/demo/plugins/vue-i18n/demo-1.vue b/src/pages/demo/plugins/vue-i18n/demo-1.vue index 333b0963..663657fc 100644 --- a/src/pages/demo/plugins/vue-i18n/demo-1.vue +++ b/src/pages/demo/plugins/vue-i18n/demo-1.vue @@ -2,7 +2,7 @@ diff --git a/src/pages/demo/plugins/vue-i18n/demo-2.vue b/src/pages/demo/plugins/vue-i18n/demo-2.vue index c51a9bc7..f7395b8f 100644 --- a/src/pages/demo/plugins/vue-i18n/demo-2.vue +++ b/src/pages/demo/plugins/vue-i18n/demo-2.vue @@ -2,7 +2,7 @@