From 78a35c377c216ea6031a9aef9a0a2ca4c35d8dea Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Thu, 16 Feb 2023 17:04:19 -0700 Subject: [PATCH] feat: include query parameters in locale redirect (#6132) * feat: include query parameters in locale redirect * refactor: code cleanup --------- Co-authored-by: Nicolas Giard --- server/controllers/common.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/controllers/common.js b/server/controllers/common.js index 3bcfcd94..55cc4d33 100644 --- a/server/controllers/common.js +++ b/server/controllers/common.js @@ -4,6 +4,7 @@ const pageHelper = require('../helpers/page') const _ = require('lodash') const CleanCSS = require('clean-css') const moment = require('moment') +const qs = require('querystring') /* global WIKI */ @@ -420,7 +421,8 @@ router.get('/*', async (req, res, next) => { if (isPage) { if (WIKI.config.lang.namespacing && !pageArgs.explicitLocale) { - return res.redirect(`/${pageArgs.locale}/${pageArgs.path}`) + const query = !_.isEmpty(req.query) ? `?${qs.stringify(req.query)}` : '' + return res.redirect(`/${pageArgs.locale}/${pageArgs.path}${query}`) } req.i18n.changeLanguage(pageArgs.locale)