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

fix: UI localization on load + update all namespaced locales

Browse Source
This commit is contained in:
Nick
2019-06-22 12:44:32 -04:00
parent c82b7066bb
commit d0b73c5a9b
6 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/controllers/common.js
View File

@@ -34,6 +34,8 @@ router.get('/healthz', (req, res, next) => {
router.get(['/e', '/e/*'], async (req, res, next) => {
const pageArgs = pageHelper.parsePath(req.path, { stripExt: true })
_.set(res, 'locals.siteConfig.lang', pageArgs.locale)
if (pageHelper.isReservedPath(pageArgs.path)) {
return next(new Error('Cannot create this page because it starts with a system reserved path.'))
}
@@ -95,6 +97,8 @@ router.get(['/p', '/p/*'], (req, res, next) => {
router.get(['/h', '/h/*'], async (req, res, next) => {
const pageArgs = pageHelper.parsePath(req.path, { stripExt: true })
_.set(res, 'locals.siteConfig.lang', pageArgs.locale)
if (!WIKI.auth.checkAccess(req.user, ['read:pages'], pageArgs)) {
_.set(res.locals, 'pageMeta.title', 'Unauthorized')
return res.render('unauthorized', { action: 'history' })
@@ -121,6 +125,8 @@ router.get(['/h', '/h/*'], async (req, res, next) => {
router.get(['/s', '/s/*'], async (req, res, next) => {
const pageArgs = pageHelper.parsePath(req.path, { stripExt: true })
_.set(res, 'locals.siteConfig.lang', pageArgs.locale)
if (!WIKI.auth.checkAccess(req.user, ['read:pages'], pageArgs)) {
return res.render('unauthorized', { action: 'source' })
}
@@ -160,6 +166,9 @@ router.get('/*', async (req, res, next) => {
userId: req.user.id,
isPrivate: false
})
_.set(res, 'locals.siteConfig.lang', pageArgs.locale)
if (page) {
_.set(res.locals, 'pageMeta.title', page.title)
_.set(res.locals, 'pageMeta.description', page.description)