From c691d8ef72465eb04cbcf64cd5d4281f259c4ebf Mon Sep 17 00:00:00 2001
From: Stanyslas Bres <stanyslas.bres@gmail.com>
Date: Wed, 6 Nov 2019 22:44:30 +0100
Subject: [PATCH 01/11] chore(feat): localize 404 page (fix #1987)

---
 .../core/lib/node/ClientComputedMixin.js      |  2 +-
 .../fixtures/docs-i18n/.vuepress/config.js    | 16 +++++++-
 .../@vuepress/test-utils/client/siteData.js   | 18 ++++++++-
 .../@vuepress/theme-default/layouts/404.vue   | 37 ++++++++++++++-----
 packages/docs/docs/.vuepress/config.js        | 14 +++++++
 packages/docs/docs/guide/i18n.md              |  5 +++
 .../docs/docs/theme/default-theme-config.md   |  8 +++-
 packages/docs/docs/zh/guide/i18n.md           |  6 +++
 .../docs/zh/theme/default-theme-config.md     |  6 ++-
 9 files changed, 97 insertions(+), 15 deletions(-)

diff --git a/packages/@vuepress/core/lib/node/ClientComputedMixin.js b/packages/@vuepress/core/lib/node/ClientComputedMixin.js
index dbe8a3f7a5..a3166805bd 100644
--- a/packages/@vuepress/core/lib/node/ClientComputedMixin.js
+++ b/packages/@vuepress/core/lib/node/ClientComputedMixin.js
@@ -54,7 +54,7 @@ module.exports = siteData => {
       for (const path in locales) {
         if (path === '/') {
           defaultLang = locales[path]
-        } else if (this.$page.path.indexOf(path) === 0) {
+        } else if (this.$page.path.indexOf(path) === 0 || (!this.$page.path && this.$route.path.indexOf(path) === 0)) {
           targetLang = locales[path]
         }
       }
diff --git a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
index 1fbdc1cec1..0fd0bd11d5 100644
--- a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
+++ b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
@@ -21,13 +21,27 @@ module.exports = {
         label: 'English',
         selectText: 'Languages',
         editLinkText: 'Edit this page on GitHub',
-        lastUpdated: 'Last Updated'
+        lastUpdated: 'Last Updated',
+        notFoundLinkText: 'Take me home.',
+        notFoundMessages: [
+          `There's nothing here.`,
+          `How did we get here?`,
+          `That's a Four-Oh-Four.`,
+          `Looks like we've got some broken links.`
+        ]
       },
       '/zh/': {
         label: '简体中文',
         selectText: '选择语言',
         editLinkText: '在 GitHub 上编辑此页',
         lastUpdated: '上次更新',
+        notFoundLinkText: 'Take me home.',
+        notFoundMessages: [
+          `There's nothing here.`,
+          `How did we get here?`,
+          `That's a Four-Oh-Four.`,
+          `Looks like we've got some broken links.`
+        ]
       }
     }
   }
diff --git a/packages/@vuepress/test-utils/client/siteData.js b/packages/@vuepress/test-utils/client/siteData.js
index 5e3ea16429..cdeb191d95 100644
--- a/packages/@vuepress/test-utils/client/siteData.js
+++ b/packages/@vuepress/test-utils/client/siteData.js
@@ -29,13 +29,27 @@ export default {
         "label": "English",
         "selectText": "Languages",
         "editLinkText": "Edit this page on GitHub",
-        "lastUpdated": "Last Updated"
+        "lastUpdated": "Last Updated",
+        "notFoundLinkText": "Take me home.",
+        "notFoundMessages": [
+          "There's nothing here.",
+          "How did we get here?",
+          "That's a Four-Oh-Four.",
+          "Looks like we've got some broken links."
+        ]
       },
       "/zh/": {
         "label": "简体中文",
         "selectText": "选择语言",
         "editLinkText": "在 GitHub 上编辑此页",
-        "lastUpdated": "上次更新"
+        "lastUpdated": "上次更新",
+        "notFoundLinkText": "Take me home.",
+        "notFoundMessages": [
+          "There's nothing here.",
+          "How did we get here?",
+          "That's a Four-Oh-Four.",
+          "Looks like we've got some broken links."
+        ]
       }
     }
   },
diff --git a/packages/@vuepress/theme-default/layouts/404.vue b/packages/@vuepress/theme-default/layouts/404.vue
index 3dc84dcfae..d0b77b0800 100644
--- a/packages/@vuepress/theme-default/layouts/404.vue
+++ b/packages/@vuepress/theme-default/layouts/404.vue
@@ -3,23 +3,42 @@
     <div class="theme-default-content">
       <h1>404</h1>
       <blockquote>{{ getMsg() }}</blockquote>
-      <router-link to="/">Take me home.</router-link>
+      <router-link :to="localePath">{{ notFoundLinkText }}</router-link>
     </div>
   </div>
 </template>
 
 <script>
-const msgs = [
-  `There's nothing here.`,
-  `How did we get here?`,
-  `That's a Four-Oh-Four.`,
-  `Looks like we've got some broken links.`
-]
-
 export default {
+  computed: {
+    localePath () {
+      return this.$localePath || '/'
+    },
+    notFoundLinkText () {
+      return (
+        this.$themeLocaleConfig.notFoundLinkText
+        || this.$site.themeConfig.notFoundLinkText
+        || `Take me home.`
+      )
+    },
+    notFoundMessages () {
+      const messages = [
+        `There's nothing here.`,
+        `How did we get here?`,
+        `That's a Four-Oh-Four.`,
+        `Looks like we've got some broken links.`
+      ]
+
+      return (
+        this.$themeLocaleConfig.notFoundMessages
+        || this.$site.themeConfig.notFoundMessages
+        || messages
+      )
+    }
+  },
   methods: {
     getMsg () {
-      return msgs[Math.floor(Math.random() * msgs.length)]
+      return this.notFoundMessages[Math.floor(Math.random() * this.notFoundMessages.length)]
     }
   }
 }
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 13f7b3e0d3..2595920c41 100755
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -42,6 +42,13 @@ module.exports = ctx => ({
         selectText: 'Languages',
         ariaLabel: 'Select language',
         editLinkText: 'Edit this page on GitHub',
+        notFoundLinkText: 'Take me home.',
+        notFoundMessages: [
+          `There's nothing here.`,
+          `How did we get here?`,
+          `That's a Four-Oh-Four.`,
+          `Looks like we've got some broken links.`
+        ],
         lastUpdated: 'Last Updated',
         nav: require('./nav/en'),
         sidebar: {
@@ -56,6 +63,13 @@ module.exports = ctx => ({
         selectText: '选择语言',
         ariaLabel: "选择语言",
         editLinkText: '在 GitHub 上编辑此页',
+        notFoundLinkText: 'Take me home.',
+        notFoundMessages: [
+          `There's nothing here.`,
+          `How did we get here?`,
+          `That's a Four-Oh-Four.`,
+          `Looks like we've got some broken links.`
+        ],
         lastUpdated: '上次更新',
         nav: require('./nav/zh'),
         sidebar: {
diff --git a/packages/docs/docs/guide/i18n.md b/packages/docs/docs/guide/i18n.md
index b3eccb7774..e59a2c59b1 100644
--- a/packages/docs/docs/guide/i18n.md
+++ b/packages/docs/docs/guide/i18n.md
@@ -58,6 +58,10 @@ module.exports = {
         ariaLabel: 'Languages'
         // text for the edit-on-github link
         editLinkText: 'Edit this page on GitHub',
+        // text for the 404 page link
+        notFoundLinkText: 'Take me home.',
+        // the list of random messages to show on the 404 page
+        notFoundMessages: [/* ... */],
         // config for Service Worker
         serviceWorker: {
           updatePopup: {
@@ -79,6 +83,7 @@ module.exports = {
         selectText: '选择语言',
         label: '简体中文',
         editLinkText: '在 GitHub 上编辑此页',
+        notFoundLinkText: 'Take me home.',
         serviceWorker: {
           updatePopup: {
             message: "发现新内容可用.",
diff --git a/packages/docs/docs/theme/default-theme-config.md b/packages/docs/docs/theme/default-theme-config.md
index 0e3878f593..c894fc2715 100644
--- a/packages/docs/docs/theme/default-theme-config.md
+++ b/packages/docs/docs/theme/default-theme-config.md
@@ -454,7 +454,13 @@ module.exports = {
     // default value is true. Allows to hide prev page links on all pages
     prevLinks: false,
     // custom text for edit link. Defaults to "Edit this page"
-    editLinkText: 'Help us improve this page!'
+    editLinkText: 'Help us improve this page!',
+
+    // Optional options fot the 404 page
+
+    // custom text for 404 page link. Defaults to "Take me home."
+    notFoundLinkText: 'Take me home.',
+    notFoundMessages: [/* ... */]
   }
 }
 ```
diff --git a/packages/docs/docs/zh/guide/i18n.md b/packages/docs/docs/zh/guide/i18n.md
index 5be0f9817d..d9d045f8d0 100644
--- a/packages/docs/docs/zh/guide/i18n.md
+++ b/packages/docs/docs/zh/guide/i18n.md
@@ -54,6 +54,8 @@ module.exports = {
         label: 'English',
         ariaLabel: 'Languages'
         editLinkText: 'Edit this page on GitHub',
+        notFoundLinkText: 'Take me home.',
+        notFoundMessages: [/* ... */],
         serviceWorker: {
           updatePopup: {
             message: "New content is available.",
@@ -76,6 +78,10 @@ module.exports = {
         label: '简体中文',
         // 编辑链接文字
         editLinkText: '在 GitHub 上编辑此页',
+        // TODO: comment me
+        notFoundLinkText: 'Take me home.',
+        // TODO: comment me
+        notFoundMessages: [/* ... */],
         // Service Worker 的配置
         serviceWorker: {
           updatePopup: {
diff --git a/packages/docs/docs/zh/theme/default-theme-config.md b/packages/docs/docs/zh/theme/default-theme-config.md
index bdba52d45c..5ceac7fd23 100644
--- a/packages/docs/docs/zh/theme/default-theme-config.md
+++ b/packages/docs/docs/zh/theme/default-theme-config.md
@@ -434,7 +434,11 @@ module.exports = {
     // 默认是 false, 设置为 true 来启用
     editLinks: true,
     // 默认为 "Edit this page"
-    editLinkText: '帮助我们改善此页面！'
+    editLinkText: '帮助我们改善此页面！',
+    // TODO: comment me
+    notFoundLinkText: 'Take me home.',
+    // TODO: comment me
+    notFoundMessages: [/* ... */]
   }
 }
 ```

From 91cdec9a6eb138a6f8843b6a4443e60320470dd6 Mon Sep 17 00:00:00 2001
From: Stanyslas Bres <stanyslas.bres@gmail.com>
Date: Wed, 6 Nov 2019 23:06:03 +0100
Subject: [PATCH 02/11] docs(i18n): add missing field

---
 packages/docs/docs/guide/i18n.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/docs/docs/guide/i18n.md b/packages/docs/docs/guide/i18n.md
index e59a2c59b1..48b4fa4bd3 100644
--- a/packages/docs/docs/guide/i18n.md
+++ b/packages/docs/docs/guide/i18n.md
@@ -84,6 +84,7 @@ module.exports = {
         label: '简体中文',
         editLinkText: '在 GitHub 上编辑此页',
         notFoundLinkText: 'Take me home.',
+        notFoundMessages: [/* ... */],
         serviceWorker: {
           updatePopup: {
             message: "发现新内容可用.",

From 114b5da96f1361065fa2c0a909f0817e589a794c Mon Sep 17 00:00:00 2001
From: Stanyslas Bres <stanyslas.bres@gmail.com>
Date: Sun, 10 Nov 2019 11:23:31 +0100
Subject: [PATCH 03/11] style: use simple quotes for notfound messages

---
 .../fixtures/docs-i18n/.vuepress/config.js       | 16 ++++++++--------
 packages/@vuepress/theme-default/layouts/404.vue |  8 ++++----
 packages/docs/docs/.vuepress/config.js           | 16 ++++++++--------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
index 0fd0bd11d5..1f40ddc85c 100644
--- a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
+++ b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
@@ -24,10 +24,10 @@ module.exports = {
         lastUpdated: 'Last Updated',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          `There's nothing here.`,
-          `How did we get here?`,
-          `That's a Four-Oh-Four.`,
-          `Looks like we've got some broken links.`
+          'There\'s nothing here.',
+          'How did we get here?',
+          'That\'s a Four-Oh-Four.',
+          'Looks like we\'ve got some broken links.'
         ]
       },
       '/zh/': {
@@ -37,10 +37,10 @@ module.exports = {
         lastUpdated: '上次更新',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          `There's nothing here.`,
-          `How did we get here?`,
-          `That's a Four-Oh-Four.`,
-          `Looks like we've got some broken links.`
+          'There\'s nothing here.',
+          'How did we get here?',
+          'That\'s a Four-Oh-Four.',
+          'Looks like we\'ve got some broken links.'
         ]
       }
     }
diff --git a/packages/@vuepress/theme-default/layouts/404.vue b/packages/@vuepress/theme-default/layouts/404.vue
index d0b77b0800..c8f4d637b6 100644
--- a/packages/@vuepress/theme-default/layouts/404.vue
+++ b/packages/@vuepress/theme-default/layouts/404.vue
@@ -23,10 +23,10 @@ export default {
     },
     notFoundMessages () {
       const messages = [
-        `There's nothing here.`,
-        `How did we get here?`,
-        `That's a Four-Oh-Four.`,
-        `Looks like we've got some broken links.`
+        'There\'s nothing here.',
+        'How did we get here?',
+        'That\'s a Four-Oh-Four.',
+        'Looks like we\'ve got some broken links.'
       ]
 
       return (
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 2595920c41..3ba543254e 100755
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -44,10 +44,10 @@ module.exports = ctx => ({
         editLinkText: 'Edit this page on GitHub',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          `There's nothing here.`,
-          `How did we get here?`,
-          `That's a Four-Oh-Four.`,
-          `Looks like we've got some broken links.`
+          'There\'s nothing here.',
+          'How did we get here?',
+          'That\'s a Four-Oh-Four.',
+          'Looks like we\'ve got some broken links.'
         ],
         lastUpdated: 'Last Updated',
         nav: require('./nav/en'),
@@ -65,10 +65,10 @@ module.exports = ctx => ({
         editLinkText: '在 GitHub 上编辑此页',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          `There's nothing here.`,
-          `How did we get here?`,
-          `That's a Four-Oh-Four.`,
-          `Looks like we've got some broken links.`
+          'There\'s nothing here.',
+          'How did we get here?',
+          'That\'s a Four-Oh-Four.',
+          'Looks like we\'ve got some broken links.'
         ],
         lastUpdated: '上次更新',
         nav: require('./nav/zh'),

From 893ccdd641655b7a936eb5782fe9b535c2a76985 Mon Sep 17 00:00:00 2001
From: Stanyslas Bres <stanyslas.bres@gmail.com>
Date: Sun, 10 Nov 2019 11:24:09 +0100
Subject: [PATCH 04/11] chore(feat): localize core NotFound component

---
 .../core/lib/client/components/NotFound.vue   | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/packages/@vuepress/core/lib/client/components/NotFound.vue b/packages/@vuepress/core/lib/client/components/NotFound.vue
index 6aefe797c4..442e0edf14 100644
--- a/packages/@vuepress/core/lib/client/components/NotFound.vue
+++ b/packages/@vuepress/core/lib/client/components/NotFound.vue
@@ -9,17 +9,36 @@
 </template>
 
 <script>
-const msgs = [
-  `There's nothing here.`,
-  `How did we get here?`,
-  `That's a Four-Oh-Four.`,
-  `Looks like we've got some broken links.`
-]
-
 export default {
+  computed: {
+    localePath () {
+      return this.$localePath || '/'
+    },
+    notFoundLinkText () {
+      return (
+        this.$themeLocaleConfig.notFoundLinkText
+        || this.$site.themeConfig.notFoundLinkText
+        || `Take me home.`
+      )
+    },
+    notFoundMessages () {
+      const messages = [
+        'There\'s nothing here.',
+        'How did we get here?',
+        'That\'s a Four-Oh-Four.',
+        'Looks like we\'ve got some broken links.'
+      ]
+
+      return (
+        this.$themeLocaleConfig.notFoundMessages
+        || this.$site.themeConfig.notFoundMessages
+        || messages
+      )
+    }
+  },
   methods: {
     getMsg () {
-      return msgs[Math.floor(Math.random() * msgs.length)]
+      return this.notFoundMessages[Math.floor(Math.random() * this.notFoundMessages.length)]
     }
   }
 }

From 6055fda8afd823998d2afa29ae27c2caccfd857c Mon Sep 17 00:00:00 2001
From: Stanyslas Bres <stanyslas.bres@gmail.com>
Date: Sun, 10 Nov 2019 11:28:58 +0100
Subject: [PATCH 05/11] docs: add notfound default messages

---
 packages/docs/docs/guide/i18n.md                   | 14 ++++++++++++--
 packages/docs/docs/theme/default-theme-config.md   |  7 ++++++-
 packages/docs/docs/zh/guide/i18n.md                | 14 ++++++++++++--
 .../docs/docs/zh/theme/default-theme-config.md     |  7 ++++++-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/packages/docs/docs/guide/i18n.md b/packages/docs/docs/guide/i18n.md
index 48b4fa4bd3..323f43b554 100644
--- a/packages/docs/docs/guide/i18n.md
+++ b/packages/docs/docs/guide/i18n.md
@@ -61,7 +61,12 @@ module.exports = {
         // text for the 404 page link
         notFoundLinkText: 'Take me home.',
         // the list of random messages to show on the 404 page
-        notFoundMessages: [/* ... */],
+        notFoundMessages: [
+          'There\'s nothing here.',
+          'How did we get here?',
+          'That\'s a Four-Oh-Four.',
+          'Looks like we\'ve got some broken links.'
+        ],
         // config for Service Worker
         serviceWorker: {
           updatePopup: {
@@ -84,7 +89,12 @@ module.exports = {
         label: '简体中文',
         editLinkText: '在 GitHub 上编辑此页',
         notFoundLinkText: 'Take me home.',
-        notFoundMessages: [/* ... */],
+        notFoundMessages: [
+          'There\'s nothing here.',
+          'How did we get here?',
+          'That\'s a Four-Oh-Four.',
+          'Looks like we\'ve got some broken links.'
+        ],
         serviceWorker: {
           updatePopup: {
             message: "发现新内容可用.",
diff --git a/packages/docs/docs/theme/default-theme-config.md b/packages/docs/docs/theme/default-theme-config.md
index c894fc2715..959f35639b 100644
--- a/packages/docs/docs/theme/default-theme-config.md
+++ b/packages/docs/docs/theme/default-theme-config.md
@@ -460,7 +460,12 @@ module.exports = {
 
     // custom text for 404 page link. Defaults to "Take me home."
     notFoundLinkText: 'Take me home.',
-    notFoundMessages: [/* ... */]
+    notFoundMessages: [
+      'There\'s nothing here.',
+      'How did we get here?',
+      'That\'s a Four-Oh-Four.',
+      'Looks like we\'ve got some broken links.'
+    ]
   }
 }
 ```
diff --git a/packages/docs/docs/zh/guide/i18n.md b/packages/docs/docs/zh/guide/i18n.md
index d9d045f8d0..2f2d43cf8d 100644
--- a/packages/docs/docs/zh/guide/i18n.md
+++ b/packages/docs/docs/zh/guide/i18n.md
@@ -55,7 +55,12 @@ module.exports = {
         ariaLabel: 'Languages'
         editLinkText: 'Edit this page on GitHub',
         notFoundLinkText: 'Take me home.',
-        notFoundMessages: [/* ... */],
+        notFoundMessages: [
+          'There\'s nothing here.',
+          'How did we get here?',
+          'That\'s a Four-Oh-Four.',
+          'Looks like we\'ve got some broken links.'
+        ],
         serviceWorker: {
           updatePopup: {
             message: "New content is available.",
@@ -81,7 +86,12 @@ module.exports = {
         // TODO: comment me
         notFoundLinkText: 'Take me home.',
         // TODO: comment me
-        notFoundMessages: [/* ... */],
+        notFoundMessages: [
+          'There\'s nothing here.',
+          'How did we get here?',
+          'That\'s a Four-Oh-Four.',
+          'Looks like we\'ve got some broken links.'
+        ],
         // Service Worker 的配置
         serviceWorker: {
           updatePopup: {
diff --git a/packages/docs/docs/zh/theme/default-theme-config.md b/packages/docs/docs/zh/theme/default-theme-config.md
index 5ceac7fd23..e33875b3ae 100644
--- a/packages/docs/docs/zh/theme/default-theme-config.md
+++ b/packages/docs/docs/zh/theme/default-theme-config.md
@@ -438,7 +438,12 @@ module.exports = {
     // TODO: comment me
     notFoundLinkText: 'Take me home.',
     // TODO: comment me
-    notFoundMessages: [/* ... */]
+    notFoundMessages: [
+      'There\'s nothing here.',
+      'How did we get here?',
+      'That\'s a Four-Oh-Four.',
+      'Looks like we\'ve got some broken links.'
+    ]
   }
 }
 ```

From 904279b4150899d9371de9546819c163e5050188 Mon Sep 17 00:00:00 2001
From: Stanyslas Bres <stanyslas.bres@gmail.com>
Date: Wed, 13 Nov 2019 15:34:18 +0100
Subject: [PATCH 06/11] style: use double quotes for messages with escaped
 content

---
 .../core/lib/client/components/NotFound.vue      |  6 +++---
 .../fixtures/docs-i18n/.vuepress/config.js       | 16 ++++++++--------
 packages/@vuepress/theme-default/layouts/404.vue |  6 +++---
 packages/docs/docs/.vuepress/config.js           | 16 ++++++++--------
 packages/docs/docs/guide/i18n.md                 | 16 ++++++++--------
 packages/docs/docs/theme/default-theme-config.md |  8 ++++----
 packages/docs/docs/zh/guide/i18n.md              | 16 ++++++++--------
 .../docs/docs/zh/theme/default-theme-config.md   |  8 ++++----
 8 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/packages/@vuepress/core/lib/client/components/NotFound.vue b/packages/@vuepress/core/lib/client/components/NotFound.vue
index 442e0edf14..bc4aedb8f7 100644
--- a/packages/@vuepress/core/lib/client/components/NotFound.vue
+++ b/packages/@vuepress/core/lib/client/components/NotFound.vue
@@ -23,10 +23,10 @@ export default {
     },
     notFoundMessages () {
       const messages = [
-        'There\'s nothing here.',
+        "There's nothing here.",
         'How did we get here?',
-        'That\'s a Four-Oh-Four.',
-        'Looks like we\'ve got some broken links.'
+        "That's a Four-Oh-Four.",
+        "Looks like we've got some broken links."
       ]
 
       return (
diff --git a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
index 1f40ddc85c..7867fdb9f8 100644
--- a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
+++ b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
@@ -24,10 +24,10 @@ module.exports = {
         lastUpdated: 'Last Updated',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          'There\'s nothing here.',
-          'How did we get here?',
-          'That\'s a Four-Oh-Four.',
-          'Looks like we\'ve got some broken links.'
+          "There's nothing here.",
+          "How did we get here?",
+          "That's a Four-Oh-Four.",
+          "Looks like we've got some broken links."
         ]
       },
       '/zh/': {
@@ -37,10 +37,10 @@ module.exports = {
         lastUpdated: '上次更新',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          'There\'s nothing here.',
-          'How did we get here?',
-          'That\'s a Four-Oh-Four.',
-          'Looks like we\'ve got some broken links.'
+          "There's nothing here.",
+          "How did we get here?",
+          "That's a Four-Oh-Four.",
+          "Looks like we've got some broken links."
         ]
       }
     }
diff --git a/packages/@vuepress/theme-default/layouts/404.vue b/packages/@vuepress/theme-default/layouts/404.vue
index c8f4d637b6..26256351f0 100644
--- a/packages/@vuepress/theme-default/layouts/404.vue
+++ b/packages/@vuepress/theme-default/layouts/404.vue
@@ -23,10 +23,10 @@ export default {
     },
     notFoundMessages () {
       const messages = [
-        'There\'s nothing here.',
+        "There's nothing here.",
         'How did we get here?',
-        'That\'s a Four-Oh-Four.',
-        'Looks like we\'ve got some broken links.'
+        "That's a Four-Oh-Four.",
+        "Looks like we've got some broken links."
       ]
 
       return (
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 3ba543254e..13fdca0e4e 100755
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -44,10 +44,10 @@ module.exports = ctx => ({
         editLinkText: 'Edit this page on GitHub',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          'There\'s nothing here.',
-          'How did we get here?',
-          'That\'s a Four-Oh-Four.',
-          'Looks like we\'ve got some broken links.'
+          "There's nothing here.",
+          "How did we get here?",
+          "That's a Four-Oh-Four.",
+          "Looks like we've got some broken links."
         ],
         lastUpdated: 'Last Updated',
         nav: require('./nav/en'),
@@ -65,10 +65,10 @@ module.exports = ctx => ({
         editLinkText: '在 GitHub 上编辑此页',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          'There\'s nothing here.',
-          'How did we get here?',
-          'That\'s a Four-Oh-Four.',
-          'Looks like we\'ve got some broken links.'
+          "There's nothing here.",
+          "How did we get here?",
+          "That's a Four-Oh-Four.",
+          "Looks like we've got some broken links."
         ],
         lastUpdated: '上次更新',
         nav: require('./nav/zh'),
diff --git a/packages/docs/docs/guide/i18n.md b/packages/docs/docs/guide/i18n.md
index 323f43b554..423b048dd8 100644
--- a/packages/docs/docs/guide/i18n.md
+++ b/packages/docs/docs/guide/i18n.md
@@ -62,10 +62,10 @@ module.exports = {
         notFoundLinkText: 'Take me home.',
         // the list of random messages to show on the 404 page
         notFoundMessages: [
-          'There\'s nothing here.',
-          'How did we get here?',
-          'That\'s a Four-Oh-Four.',
-          'Looks like we\'ve got some broken links.'
+          "There's nothing here.",
+          "How did we get here?",
+          "That's a Four-Oh-Four.",
+          "Looks like we've got some broken links."
         ],
         // config for Service Worker
         serviceWorker: {
@@ -90,10 +90,10 @@ module.exports = {
         editLinkText: '在 GitHub 上编辑此页',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          'There\'s nothing here.',
-          'How did we get here?',
-          'That\'s a Four-Oh-Four.',
-          'Looks like we\'ve got some broken links.'
+          "There's nothing here.",
+          "How did we get here?",
+          "That's a Four-Oh-Four.",
+          "Looks like we've got some broken links."
         ],
         serviceWorker: {
           updatePopup: {
diff --git a/packages/docs/docs/theme/default-theme-config.md b/packages/docs/docs/theme/default-theme-config.md
index 959f35639b..7a2879bda9 100644
--- a/packages/docs/docs/theme/default-theme-config.md
+++ b/packages/docs/docs/theme/default-theme-config.md
@@ -461,10 +461,10 @@ module.exports = {
     // custom text for 404 page link. Defaults to "Take me home."
     notFoundLinkText: 'Take me home.',
     notFoundMessages: [
-      'There\'s nothing here.',
-      'How did we get here?',
-      'That\'s a Four-Oh-Four.',
-      'Looks like we\'ve got some broken links.'
+      "There's nothing here.",
+      "How did we get here?",
+      "That's a Four-Oh-Four.",
+      "Looks like we've got some broken links."
     ]
   }
 }
diff --git a/packages/docs/docs/zh/guide/i18n.md b/packages/docs/docs/zh/guide/i18n.md
index 2f2d43cf8d..5b302c9b1e 100644
--- a/packages/docs/docs/zh/guide/i18n.md
+++ b/packages/docs/docs/zh/guide/i18n.md
@@ -56,10 +56,10 @@ module.exports = {
         editLinkText: 'Edit this page on GitHub',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          'There\'s nothing here.',
-          'How did we get here?',
-          'That\'s a Four-Oh-Four.',
-          'Looks like we\'ve got some broken links.'
+          "There's nothing here.",
+          "How did we get here?",
+          "That's a Four-Oh-Four.",
+          "Looks like we've got some broken links."
         ],
         serviceWorker: {
           updatePopup: {
@@ -87,10 +87,10 @@ module.exports = {
         notFoundLinkText: 'Take me home.',
         // TODO: comment me
         notFoundMessages: [
-          'There\'s nothing here.',
-          'How did we get here?',
-          'That\'s a Four-Oh-Four.',
-          'Looks like we\'ve got some broken links.'
+          "There's nothing here.",
+          "How did we get here?",
+          "That's a Four-Oh-Four.",
+          "Looks like we've got some broken links."
         ],
         // Service Worker 的配置
         serviceWorker: {
diff --git a/packages/docs/docs/zh/theme/default-theme-config.md b/packages/docs/docs/zh/theme/default-theme-config.md
index e33875b3ae..706a737d4e 100644
--- a/packages/docs/docs/zh/theme/default-theme-config.md
+++ b/packages/docs/docs/zh/theme/default-theme-config.md
@@ -439,10 +439,10 @@ module.exports = {
     notFoundLinkText: 'Take me home.',
     // TODO: comment me
     notFoundMessages: [
-      'There\'s nothing here.',
-      'How did we get here?',
-      'That\'s a Four-Oh-Four.',
-      'Looks like we\'ve got some broken links.'
+      "There's nothing here.",
+      "How did we get here?",
+      "That's a Four-Oh-Four.",
+      "Looks like we've got some broken links."
     ]
   }
 }

From fe1c9e4657ccab06c9188b39e07c26b810587a28 Mon Sep 17 00:00:00 2001
From: meteorlxy <meteor.lxy@foxmail.com>
Date: Tue, 10 Dec 2019 19:35:01 +0800
Subject: [PATCH 07/11] chore: lint code and add zh translation

---
 .../prepare/fixtures/docs-i18n/.vuepress/config.js   | 12 ++++++------
 packages/@vuepress/theme-default/layouts/404.vue     |  4 +++-
 packages/docs/docs/.vuepress/config.js               | 12 ++++++------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
index 7867fdb9f8..e9d509d50c 100644
--- a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
+++ b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
@@ -25,7 +25,7 @@ module.exports = {
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
           "There's nothing here.",
-          "How did we get here?",
+          'How did we get here?',
           "That's a Four-Oh-Four.",
           "Looks like we've got some broken links."
         ]
@@ -35,12 +35,12 @@ module.exports = {
         selectText: '选择语言',
         editLinkText: '在 GitHub 上编辑此页',
         lastUpdated: '上次更新',
-        notFoundLinkText: 'Take me home.',
+        notFoundLinkText: '返回首页',
         notFoundMessages: [
-          "There's nothing here.",
-          "How did we get here?",
-          "That's a Four-Oh-Four.",
-          "Looks like we've got some broken links."
+          '这里什么都没有。',
+          '你怎么到这来了？',
+          '这是一个 404 页面。',
+          '看起来这是一个错误的链接。'
         ]
       }
     }
diff --git a/packages/@vuepress/theme-default/layouts/404.vue b/packages/@vuepress/theme-default/layouts/404.vue
index 976eef6a3e..d6b6c6177b 100644
--- a/packages/@vuepress/theme-default/layouts/404.vue
+++ b/packages/@vuepress/theme-default/layouts/404.vue
@@ -5,7 +5,9 @@
 
       <blockquote>{{ getMsg() }}</blockquote>
 
-      <RouterLink :to="localePath">{{ notFoundLinkText }}</RouterLink>
+      <RouterLink :to="localePath">
+        {{ notFoundLinkText }}
+      </RouterLink>
     </div>
   </div>
 </template>
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index 978b961b93..e7c2ec1315 100755
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -45,7 +45,7 @@ module.exports = ctx => ({
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
           "There's nothing here.",
-          "How did we get here?",
+          'How did we get here?',
           "That's a Four-Oh-Four.",
           "Looks like we've got some broken links."
         ],
@@ -63,12 +63,12 @@ module.exports = ctx => ({
         selectText: '选择语言',
         ariaLabel: '选择语言',
         editLinkText: '在 GitHub 上编辑此页',
-        notFoundLinkText: 'Take me home.',
+        notFoundLinkText: '返回首页',
         notFoundMessages: [
-          "There's nothing here.",
-          "How did we get here?",
-          "That's a Four-Oh-Four.",
-          "Looks like we've got some broken links."
+          '这里什么都没有。',
+          '你怎么到这来了？',
+          '这是一个 404 页面。',
+          '看起来这是一个错误的链接。'
         ],
         lastUpdated: '上次更新',
         nav: require('./nav/zh'),

From ef1f1fb7a8950524ee8b04ee434c0255334ce09d Mon Sep 17 00:00:00 2001
From: meteorlxy <meteor.lxy@foxmail.com>
Date: Tue, 10 Dec 2019 19:40:53 +0800
Subject: [PATCH 08/11] chore: add zh translation

---
 packages/@vuepress/test-utils/client/siteData.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/@vuepress/test-utils/client/siteData.js b/packages/@vuepress/test-utils/client/siteData.js
index cdeb191d95..52193a3b54 100644
--- a/packages/@vuepress/test-utils/client/siteData.js
+++ b/packages/@vuepress/test-utils/client/siteData.js
@@ -43,12 +43,12 @@ export default {
         "selectText": "选择语言",
         "editLinkText": "在 GitHub 上编辑此页",
         "lastUpdated": "上次更新",
-        "notFoundLinkText": "Take me home.",
+        "notFoundLinkText": "返回首页",
         "notFoundMessages": [
-          "There's nothing here.",
-          "How did we get here?",
-          "That's a Four-Oh-Four.",
-          "Looks like we've got some broken links."
+          "这里什么都没有。",
+          "你怎么到这来了？",
+          "这是一个 404 页面。",
+          "看起来这是一个错误的链接。"
         ]
       }
     }

From be17f347f1f360b2e17c77db1ee7b22c99415a70 Mon Sep 17 00:00:00 2001
From: meteorlxy <meteor.lxy@foxmail.com>
Date: Tue, 10 Dec 2019 19:54:34 +0800
Subject: [PATCH 09/11] chore: tweaks

---
 .../fixtures/docs-i18n/.vuepress/config.js    |  8 +++----
 .../@vuepress/theme-default/layouts/404.vue   |  8 +++----
 packages/docs/docs/.vuepress/config.js        |  8 +++----
 packages/docs/docs/guide/i18n.md              | 18 +++++++--------
 .../docs/docs/theme/default-theme-config.md   | 13 +----------
 packages/docs/docs/zh/guide/i18n.md           | 22 +++++++++----------
 .../docs/zh/theme/default-theme-config.md     | 11 +---------
 7 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
index e9d509d50c..d6dbf26c40 100644
--- a/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
+++ b/packages/@vuepress/core/lib/node/__tests__/prepare/fixtures/docs-i18n/.vuepress/config.js
@@ -24,10 +24,10 @@ module.exports = {
         lastUpdated: 'Last Updated',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          "There's nothing here.",
-          'How did we get here?',
-          "That's a Four-Oh-Four.",
-          "Looks like we've got some broken links."
+          `There's nothing here.`,
+          `How did we get here?`,
+          `That's a Four-Oh-Four.`,
+          `Looks like we've got some broken links.`
         ]
       },
       '/zh/': {
diff --git a/packages/@vuepress/theme-default/layouts/404.vue b/packages/@vuepress/theme-default/layouts/404.vue
index d6b6c6177b..9c23a849c9 100644
--- a/packages/@vuepress/theme-default/layouts/404.vue
+++ b/packages/@vuepress/theme-default/layouts/404.vue
@@ -27,10 +27,10 @@ export default {
     },
     notFoundMessages () {
       const messages = [
-        "There's nothing here.",
-        'How did we get here?',
-        "That's a Four-Oh-Four.",
-        "Looks like we've got some broken links."
+        `There's nothing here.`,
+        `How did we get here?`,
+        `That's a Four-Oh-Four.`,
+        `Looks like we've got some broken links.`
       ]
 
       return (
diff --git a/packages/docs/docs/.vuepress/config.js b/packages/docs/docs/.vuepress/config.js
index e7c2ec1315..82cdd235ef 100755
--- a/packages/docs/docs/.vuepress/config.js
+++ b/packages/docs/docs/.vuepress/config.js
@@ -44,10 +44,10 @@ module.exports = ctx => ({
         editLinkText: 'Edit this page on GitHub',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          "There's nothing here.",
-          'How did we get here?',
-          "That's a Four-Oh-Four.",
-          "Looks like we've got some broken links."
+          `There's nothing here.`,
+          `How did we get here?`,
+          `That's a Four-Oh-Four.`,
+          `Looks like we've got some broken links.`
         ],
         lastUpdated: 'Last Updated',
         nav: require('./nav/en'),
diff --git a/packages/docs/docs/guide/i18n.md b/packages/docs/docs/guide/i18n.md
index 423b048dd8..56847e7e47 100644
--- a/packages/docs/docs/guide/i18n.md
+++ b/packages/docs/docs/guide/i18n.md
@@ -62,10 +62,10 @@ module.exports = {
         notFoundLinkText: 'Take me home.',
         // the list of random messages to show on the 404 page
         notFoundMessages: [
-          "There's nothing here.",
-          "How did we get here?",
-          "That's a Four-Oh-Four.",
-          "Looks like we've got some broken links."
+          `There's nothing here.`,
+          `How did we get here?`,
+          `That's a Four-Oh-Four.`,
+          `Looks like we've got some broken links.`
         ],
         // config for Service Worker
         serviceWorker: {
@@ -88,12 +88,12 @@ module.exports = {
         selectText: '选择语言',
         label: '简体中文',
         editLinkText: '在 GitHub 上编辑此页',
-        notFoundLinkText: 'Take me home.',
+        notFoundLinkText: '返回首页',
         notFoundMessages: [
-          "There's nothing here.",
-          "How did we get here?",
-          "That's a Four-Oh-Four.",
-          "Looks like we've got some broken links."
+          '这里什么都没有。',
+          '你怎么到这来了？',
+          '这是一个 404 页面。',
+          '看起来这是一个错误的链接。'
         ],
         serviceWorker: {
           updatePopup: {
diff --git a/packages/docs/docs/theme/default-theme-config.md b/packages/docs/docs/theme/default-theme-config.md
index 8b4600f881..b998fa503d 100644
--- a/packages/docs/docs/theme/default-theme-config.md
+++ b/packages/docs/docs/theme/default-theme-config.md
@@ -456,18 +456,7 @@ module.exports = {
     // default value is true. Allows to hide prev page links on all pages
     prevLinks: false,
     // custom text for edit link. Defaults to "Edit this page"
-    editLinkText: 'Help us improve this page!',
-
-    // Optional options fot the 404 page
-
-    // custom text for 404 page link. Defaults to "Take me home."
-    notFoundLinkText: 'Take me home.',
-    notFoundMessages: [
-      "There's nothing here.",
-      "How did we get here?",
-      "That's a Four-Oh-Four.",
-      "Looks like we've got some broken links."
-    ]
+    editLinkText: 'Help us improve this page!'
   }
 }
 ```
diff --git a/packages/docs/docs/zh/guide/i18n.md b/packages/docs/docs/zh/guide/i18n.md
index 5b302c9b1e..47176075f8 100644
--- a/packages/docs/docs/zh/guide/i18n.md
+++ b/packages/docs/docs/zh/guide/i18n.md
@@ -56,10 +56,10 @@ module.exports = {
         editLinkText: 'Edit this page on GitHub',
         notFoundLinkText: 'Take me home.',
         notFoundMessages: [
-          "There's nothing here.",
-          "How did we get here?",
-          "That's a Four-Oh-Four.",
-          "Looks like we've got some broken links."
+          `There's nothing here.`,
+          `How did we get here?`,
+          `That's a Four-Oh-Four.`,
+          `Looks like we've got some broken links.`
         ],
         serviceWorker: {
           updatePopup: {
@@ -83,14 +83,14 @@ module.exports = {
         label: '简体中文',
         // 编辑链接文字
         editLinkText: '在 GitHub 上编辑此页',
-        // TODO: comment me
-        notFoundLinkText: 'Take me home.',
-        // TODO: comment me
+        // 404 页面返回首页链接文字
+        notFoundLinkText: '返回首页',
+        // 404 页面提示信息
         notFoundMessages: [
-          "There's nothing here.",
-          "How did we get here?",
-          "That's a Four-Oh-Four.",
-          "Looks like we've got some broken links."
+          '这里什么都没有。',
+          '你怎么到这来了？',
+          '这是一个 404 页面。',
+          '看起来这是一个错误的链接。'
         ],
         // Service Worker 的配置
         serviceWorker: {
diff --git a/packages/docs/docs/zh/theme/default-theme-config.md b/packages/docs/docs/zh/theme/default-theme-config.md
index d187a81ee7..de720a92eb 100644
--- a/packages/docs/docs/zh/theme/default-theme-config.md
+++ b/packages/docs/docs/zh/theme/default-theme-config.md
@@ -436,16 +436,7 @@ module.exports = {
     // 默认是 false, 设置为 true 来启用
     editLinks: true,
     // 默认为 "Edit this page"
-    editLinkText: '帮助我们改善此页面！',
-    // TODO: comment me
-    notFoundLinkText: 'Take me home.',
-    // TODO: comment me
-    notFoundMessages: [
-      "There's nothing here.",
-      "How did we get here?",
-      "That's a Four-Oh-Four.",
-      "Looks like we've got some broken links."
-    ]
+    editLinkText: '帮助我们改善此页面！'
   }
 }
 ```

From 5a394529dea52b69d61bb24fd6e161c4d38097b7 Mon Sep 17 00:00:00 2001
From: meteorlxy <meteor.lxy@foxmail.com>
Date: Tue, 10 Dec 2019 20:09:19 +0800
Subject: [PATCH 10/11] Revert NotFound.vue

---
 .../core/lib/client/components/NotFound.vue   | 35 +++++--------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/packages/@vuepress/core/lib/client/components/NotFound.vue b/packages/@vuepress/core/lib/client/components/NotFound.vue
index ddb73466c3..b6ba265058 100644
--- a/packages/@vuepress/core/lib/client/components/NotFound.vue
+++ b/packages/@vuepress/core/lib/client/components/NotFound.vue
@@ -13,36 +13,17 @@
 </template>
 
 <script>
-export default {
-  computed: {
-    localePath () {
-      return this.$localePath || '/'
-    },
-    notFoundLinkText () {
-      return (
-        this.$themeLocaleConfig.notFoundLinkText
-        || this.$site.themeConfig.notFoundLinkText
-        || `Take me home.`
-      )
-    },
-    notFoundMessages () {
-      const messages = [
-        "There's nothing here.",
-        'How did we get here?',
-        "That's a Four-Oh-Four.",
-        "Looks like we've got some broken links."
-      ]
+const msgs = [
+  `There's nothing here.`,
+  `How did we get here?`,
+  `That's a Four-Oh-Four.`,
+  `Looks like we've got some broken links.`
+]
 
-      return (
-        this.$themeLocaleConfig.notFoundMessages
-        || this.$site.themeConfig.notFoundMessages
-        || messages
-      )
-    }
-  },
+export default {
   methods: {
     getMsg () {
-      return this.notFoundMessages[Math.floor(Math.random() * this.notFoundMessages.length)]
+      return msgs[Math.floor(Math.random() * msgs.length)]
     }
   }
 }

From 15f6febe03273575c3ab2fce21531f9aa1bdb00f Mon Sep 17 00:00:00 2001
From: dzetah <dzetah@pm.me>
Date: Wed, 1 Apr 2020 18:44:25 +0200
Subject: [PATCH 11/11] fix: avoid ssr for 404 page

---
 packages/@vuepress/theme-default/layouts/404.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/@vuepress/theme-default/layouts/404.vue b/packages/@vuepress/theme-default/layouts/404.vue
index 9c23a849c9..2597c78d98 100644
--- a/packages/@vuepress/theme-default/layouts/404.vue
+++ b/packages/@vuepress/theme-default/layouts/404.vue
@@ -1,13 +1,15 @@
 <template>
   <div class="theme-container">
     <div class="theme-default-content">
-      <h1>404</h1>
+      <ClientOnly>
+        <h1>404</h1>
 
-      <blockquote>{{ getMsg() }}</blockquote>
+        <blockquote>{{ getMsg() }}</blockquote>
 
-      <RouterLink :to="localePath">
-        {{ notFoundLinkText }}
-      </RouterLink>
+        <RouterLink :to="localePath">
+          {{ notFoundLinkText }}
+        </RouterLink>
+      </ClientOnly>
     </div>
   </div>
 </template>