feat: Pages + Errors localization

pull/95/head
NGPixel 7 years ago
parent 69c342f80b
commit 3db9cf4efd

@ -31,7 +31,7 @@ router.get('/edit/*', (req, res, next) => {
if (pageData) {
res.render('pages/edit', { pageData })
} else {
throw new Error('Invalid page path.')
throw new Error(lang.t('errors:invalidpath'))
}
return true
}).catch((err) => {
@ -46,7 +46,7 @@ router.put('/edit/*', (req, res, next) => {
if (!res.locals.rights.write) {
return res.json({
ok: false,
error: 'Forbidden'
error: lang.t('errors:forbidden')
})
}
@ -75,7 +75,7 @@ router.get('/create/*', (req, res, next) => {
if (_.some(['create', 'edit', 'account', 'source', 'history', 'mk', 'all'], (e) => { return _.startsWith(req.path, '/create/' + e) })) {
return res.render('error', {
message: 'You cannot create a document with this name as it is reserved by the system.',
message: lang.t('errors:reservedname'),
error: {}
})
}
@ -97,10 +97,10 @@ router.get('/create/*', (req, res, next) => {
return true
}).catch((err) => {
winston.warn(err)
throw new Error('Could not load starter content!')
throw new Error(lang.t('errors:starterfailed'))
})
} else {
throw new Error('This entry already exists!')
throw new Error(lang.t('errors:alreadyexists'))
}
}).catch((err) => {
res.render('error', {
@ -114,7 +114,7 @@ router.put('/create/*', (req, res, next) => {
if (!res.locals.rights.write) {
return res.json({
ok: false,
error: 'Forbidden'
error: lang.t('errors:forbidden')
})
}
@ -168,7 +168,7 @@ router.get('/source/*', (req, res, next) => {
if (pageData) {
res.render('pages/source', { pageData })
} else {
throw new Error('Invalid page path.')
throw new Error(lang.t('errors:invalidpath'))
}
return true
}).catch((err) => {
@ -189,7 +189,7 @@ router.get('/hist/*', (req, res, next) => {
if (pageData) {
res.render('pages/history', { pageData })
} else {
throw new Error('Invalid page path.')
throw new Error(lang.t('errors:invalidpath'))
}
return true
}).catch((err) => {
@ -240,7 +240,7 @@ router.put('/*', (req, res, next) => {
if (!res.locals.rights.write) {
return res.json({
ok: false,
error: 'Forbidden'
error: lang.t('errors:forbidden')
})
}
@ -249,7 +249,7 @@ router.put('/*', (req, res, next) => {
if (_.isEmpty(req.body.move)) {
return res.json({
ok: false,
error: 'Invalid document action call.'
error: lang.t('errors:invalidaction')
})
}

@ -23,7 +23,7 @@ html(data-logic='error')
body(class='is-forbidden')
.container
a(href='/'): img(src='/images/logo.png')
h1 Forbidden
h2 Sorry, you don't have the necessary permissions to access this page.
a.button.is-amber.is-inverted(href='/') Go Home
a.button.is-amber.is-inverted(href='/login') Login as...
h1= t('errors:forbidden')
h2= t('errors:forbiddendetail')
a.button.is-amber.is-inverted(href='/')= t('errors:actions.gohome')
a.button.is-amber.is-inverted(href='/login')= t('errors:actions.loginas')

@ -24,6 +24,6 @@ html(data-logic='error')
.container
a(href='/'): img(src='/images/logo.png')
h1= message
h2 Would you like to create this entry?
a.button.is-amber.is-inverted.is-featured(href='/create/' + newpath) Create
a.button.is-amber.is-inverted(href='/') Go Home
h2= t('errors:notexistdetail')
a.button.is-amber.is-inverted.is-featured(href='/create/' + newpath)= t('errors:actions.create')
a.button.is-amber.is-inverted(href='/')= t('errors:actions.gohome')

@ -24,9 +24,9 @@ html(data-logic='error')
.container
a(href='/'): img(src='/images/logo.png')
h1= message
h2 Oops, something went wrong
a.button.is-amber.is-inverted.is-featured(href='/') Go Home
h2= t('errors:generic')
a.button.is-amber.is-inverted.is-featured(href='/')= t('errors:actions.gohome')
if error.stack
h3 Detailed debug trail:
h3= t('errors:debugmsg')
pre: code #{error.stack}

Loading…
Cancel
Save