liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: editor locale redirect + welcome page localization

Browse Source
This commit is contained in:
Nick
2019-07-13 20:27:31 -04:00
parent d546695143
commit 6974811658
7 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/controllers/common.js
View File

@@ -171,6 +171,8 @@ router.get('/*', async (req, res, next) => {
return res.redirect(`/${pageArgs.locale}/${pageArgs.path}`)
}
req.i18n.changeLanguage(pageArgs.locale)
if (!WIKI.auth.checkAccess(req.user, ['read:pages'], pageArgs)) {
_.set(res.locals, 'pageMeta.title', 'Unauthorized')
return res.status(403).render('unauthorized', { action: 'view' })
@@ -206,7 +208,7 @@ router.get('/*', async (req, res, next) => {
}
} else if (pageArgs.path === 'home') {
_.set(res.locals, 'pageMeta.title', 'Welcome')
res.render('welcome')
res.render('welcome', { locale: pageArgs.locale })
} else {
_.set(res.locals, 'pageMeta.title', 'Page Not Found')
if (WIKI.auth.checkAccess(req.user, ['write:pages'], pageArgs)) {