From 9d89f28878ef2fa25cf6c12ba4fd92be54c3d8c2 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 22:24:37 +0800
Subject: [PATCH] no message

Former-commit-id: aa5d410dddbfc6ef7f3b11ff237920c8f8e53a26
Former-commit-id: 72e841cf407495cbd0aa3f89d4b3eaddf6f91a71
Former-commit-id: 6899f78e5b4bd29026b7ba19c29cdea6625ce9f7
---
 src/i18n/index.js                          | 6 +++---
 src/i18n/lang/cn/_pub.js                   | 5 +++++
 src/i18n/lang/{cn.js => cn/index.js}       | 3 +++
 src/i18n/lang/en/_pub.js                   | 5 +++++
 src/i18n/lang/{en.js => en/index.js}       | 3 +++
 src/i18n/lang/ja/_pub.js                   | 5 +++++
 src/i18n/lang/{ja.js => ja/index.js}       | 3 +++
 src/pages/demo/plugins/vue-i18n/demo-1.vue | 2 +-
 src/pages/demo/plugins/vue-i18n/demo-2.vue | 2 +-
 9 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 src/i18n/lang/cn/_pub.js
 rename src/i18n/lang/{cn.js => cn/index.js} (61%)
 create mode 100644 src/i18n/lang/en/_pub.js
 rename src/i18n/lang/{en.js => en/index.js} (60%)
 create mode 100644 src/i18n/lang/ja/_pub.js
 rename src/i18n/lang/{ja.js => ja/index.js} (65%)

diff --git a/src/i18n/index.js b/src/i18n/index.js
index 0f5693e5..9f705600 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -6,8 +6,8 @@ Vue.use(VueI18n)
 export default new VueI18n({
   locale: 'CN',
   messages: {
-    'CN': require('./lang/cn'),
-    'JA': require('./lang/ja'),
-    'EN': require('./lang/en')
+    'CN': require('./lang/cn/'),
+    'JA': require('./lang/ja/'),
+    'EN': require('./lang/en/')
   }
 })
diff --git a/src/i18n/lang/cn/_pub.js b/src/i18n/lang/cn/_pub.js
new file mode 100644
index 00000000..2dad6f70
--- /dev/null
+++ b/src/i18n/lang/cn/_pub.js
@@ -0,0 +1,5 @@
+export default {
+  pageHeader: {
+    demo: '示例'
+  }
+}
diff --git a/src/i18n/lang/cn.js b/src/i18n/lang/cn/index.js
similarity index 61%
rename from src/i18n/lang/cn.js
rename to src/i18n/lang/cn/index.js
index 7e4357f1..d2e3d39b 100644
--- a/src/i18n/lang/cn.js
+++ b/src/i18n/lang/cn/index.js
@@ -1,3 +1,6 @@
+import pub from './_pub'
+
 export const message = {
+  pub,
   hello: '你好,世界'
 }
diff --git a/src/i18n/lang/en/_pub.js b/src/i18n/lang/en/_pub.js
new file mode 100644
index 00000000..83967a96
--- /dev/null
+++ b/src/i18n/lang/en/_pub.js
@@ -0,0 +1,5 @@
+export default {
+  pageHeader: {
+    demo: 'Demo'
+  }
+}
diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en/index.js
similarity index 60%
rename from src/i18n/lang/en.js
rename to src/i18n/lang/en/index.js
index a58d1a3d..582589e6 100644
--- a/src/i18n/lang/en.js
+++ b/src/i18n/lang/en/index.js
@@ -1,3 +1,6 @@
+import pub from './_pub'
+
 export const message = {
+  pub,
   hello: 'Hello World'
 }
diff --git a/src/i18n/lang/ja/_pub.js b/src/i18n/lang/ja/_pub.js
new file mode 100644
index 00000000..f7940e1d
--- /dev/null
+++ b/src/i18n/lang/ja/_pub.js
@@ -0,0 +1,5 @@
+export default {
+  pageHeader: {
+    demo: 'サンプル'
+  }
+}
diff --git a/src/i18n/lang/ja.js b/src/i18n/lang/ja/index.js
similarity index 65%
rename from src/i18n/lang/ja.js
rename to src/i18n/lang/ja/index.js
index ff41adea..2a2c4817 100644
--- a/src/i18n/lang/ja.js
+++ b/src/i18n/lang/ja/index.js
@@ -1,3 +1,6 @@
+import pub from './_pub'
+
 export const message = {
+  pub,
   hello: 'こんにちは、世界'
 }
diff --git a/src/pages/demo/plugins/vue-i18n/demo-1.vue b/src/pages/demo/plugins/vue-i18n/demo-1.vue
index 261c3be5..923a5028 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 @@
   <Container>
     <PageHeader
       slot="header"
-      title="示例 1"
+      :title="`${$t('message.pub.pageHeader.demo')} 1`"
       url="http://kazupon.github.io/vue-i18n/en/">
     </PageHeader>
     <DemoI18nControl></DemoI18nControl>
diff --git a/src/pages/demo/plugins/vue-i18n/demo-2.vue b/src/pages/demo/plugins/vue-i18n/demo-2.vue
index 10c1db81..85bf442f 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 @@
   <Container>
     <PageHeader
       slot="header"
-      title="示例 2"
+      :title="`${$t('message.pub.pageHeader.demo')} 2`"
       url="http://kazupon.github.io/vue-i18n/en/">
     </PageHeader>
     <DemoI18nControl></DemoI18nControl>