fix: missing apollo-fetch module

This commit is contained in:
Nicolas Giard 2019-01-13 21:54:52 -05:00
parent 63c044a09b
commit 86c6aabebd
4 changed files with 2 additions and 56 deletions

View File

@ -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.'
)

View File

@ -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",

View File

@ -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)

View File

@ -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"
}
}
}