From 86c6aabebd1f9fd362d7d59ba93e5e16ee57bcc9 Mon Sep 17 00:00:00 2001
From: Nicolas Giard <github@ngpixel.com>
Date: Sun, 13 Jan 2019 21:54:52 -0500
Subject: [PATCH] fix: missing apollo-fetch module

---
 client/components/setup.vue |  1 +
 package.json                |  2 +-
 server/core/localization.js |  9 --------
 server/locales/default.json | 46 -------------------------------------
 4 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 server/locales/default.json

diff --git a/client/components/setup.vue b/client/components/setup.vue
index 10d7d9da..541bf290 100644
--- a/client/components/setup.vue
+++ b/client/components/setup.vue
@@ -57,6 +57,7 @@
                   color='primary',
                   v-model='conf.upgrade',
                   label='Upgrade from Wiki.js 1.x',
+                  disabled
                   persistent-hint,
                   hint='Check this box if you are upgrading from Wiki.js 1.x and wish to migrate your existing data.'
                 )
diff --git a/package.json b/package.json
index f3e98354..3b99116a 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "node": ">=10.12"
   },
   "dependencies": {
+    "apollo-fetch": "0.7.0",
     "apollo-server": "2.2.2",
     "apollo-server-express": "2.2.2",
     "auto-load": "3.0.4",
@@ -181,7 +182,6 @@
     "animated-number-vue": "0.1.3",
     "apollo-cache-inmemory": "1.3.10",
     "apollo-client": "2.4.6",
-    "apollo-fetch": "0.7.0",
     "apollo-link": "1.2.3",
     "apollo-link-batch-http": "1.2.3",
     "apollo-link-error": "1.1.1",
diff --git a/server/core/localization.js b/server/core/localization.js
index 53525d7b..2dd7d1de 100644
--- a/server/core/localization.js
+++ b/server/core/localization.js
@@ -21,15 +21,6 @@ module.exports = {
       fallbackLng: 'en'
     })
 
-    // Load fallback defaults
-    const enFallback = require('../locales/default.json')
-    if (_.isPlainObject(enFallback)) {
-      _.forOwn(enFallback, (data, ns) => {
-        this.namespaces.push(ns)
-        this.engine.addResourceBundle('en', ns, data)
-      })
-    }
-
     // Load current language + namespaces
     this.refreshNamespaces(true)
 
diff --git a/server/locales/default.json b/server/locales/default.json
deleted file mode 100644
index 7d3d19a0..00000000
--- a/server/locales/default.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "common": {
-    "footer": {
-      "poweredBy": "Powered by"
-    },
-    "welcome": {
-      "title": "Welcome to your wiki!"
-    }
-  },
-  "auth": {
-    "actions": {
-      "login": "Log In"
-    },
-    "errors": {
-      "invalidLogin": "Invalid Login",
-      "invalidLoginMsg": "The email or password is invalid.",
-      "invalidUserEmail": "Invalid User Email",
-      "loginError": "Login error",
-      "notYetAuthorized": "You have not been authorized to login to this site yet.",
-      "tooManyAttempts": "Too many attempts!",
-      "tooManyAttemptsMsg": "You've made too many failed attempts in a short period of time, please try again {{time}}.",
-      "userNotFound": "User not found"
-    },
-    "fields": {
-      "emailUser": "Email / Username",
-      "password": "Password"
-    },
-    "loginRequired": "Login required",
-    "providers": {
-      "azure": "Azure Active Directory",
-      "facebook": "Facebook",
-      "github": "GitHub",
-      "google": "Google ID",
-      "ldap": "LDAP / Active Directory",
-      "local": "Local",
-      "slack": "Slack",
-      "windowslive": "Microsoft Account"
-    },
-    "tfa": {
-      "placeholder": "XXXXXX",
-      "subtitle": "Security code required:",
-      "title": "Two Factor Authentication",
-      "verifyToken": "Verify"
-    }
-  }
-}