Skip to content

Node.js based forum software built for the modern web

fix: closes #14590

Barış Soner Uşaklıce2f54ec9049
diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js
index 95bd9fb860..91e9f9e803 100644
--- a/public/src/modules/helpers.common.js
+++ b/public/src/modules/helpers.common.js
@@ -100,7 +100,10 @@ module.exports = function (utils, Benchpress, tx, relative_path) {
function buildMetaTag(tag) {
const name = tag.name ? `name="${escape(tag.name)}" ` : '';
const property = tag.property ? `property="${escape(tag.property)}" ` : '';
- const content = tag.content ? `content="${escape(tag.content).replace(/\n/g, ' ')}" ` : '';
+ const tagContent = tag.content ?
+ tag.translate ? _tx.call(this, tag.content) : escape(tag.content).replace(/\n/g, ' ') :
+ '';
+ const content = tagContent ? `content="${tagContent}" ` : '';
return '<meta ' + name + property + content + '/>\n\t';
}
diff --git a/src/meta/tags.js b/src/meta/tags.js
index ceaee5c838..eaaf0a487a 100644
--- a/src/meta/tags.js
+++ b/src/meta/tags.js
@@ -3,8 +3,6 @@
const nconf = require('nconf');
const winston = require('winston');
-const translator = require('../translator');
-const user = require('../user');
const plugins = require('../plugins');
const Meta = require('./index');
@@ -81,10 +79,9 @@ Tags.parse = async (req, data, meta, link) => {
addTouchIcons(defaultLinks);
}
- const [{ tags }, { links }, { userLang }] = await Promise.all([
+ const [{ tags }, { links }] = await Promise.all([
plugins.hooks.fire('filter:meta.getMetaTags', { req, data, tags: defaultTags }),
plugins.hooks.fire('filter:meta.getLinkTags', { req, data, links: defaultLinks }),
- user.getSettings(req.uid),
]);
meta = await Promise.all(tags.concat(meta || []).map(async (tag) => {
@@ -92,9 +89,6 @@ Tags.parse = async (req, data, meta, link) => {
winston.warn('Invalid meta tag. ', tag);
return tag;
}
- if (tag.translate) {
- tag.content = await translator.translate(tag.content, userLang);
- }
return tag;
}));
diff --git a/src/middleware/admin.js b/src/middleware/admin.js
index bf68c380c4..93d76bd53f 100644
--- a/src/middleware/admin.js
+++ b/src/middleware/admin.js
@@ -16,6 +16,11 @@ const controllers = {
const middleware = module.exports;
+middleware.isAdminPage = function (req, res, next) {
+ res.locals.isAdminPage = true;
+ next();
+};
+
middleware.buildHeader = helpers.try(async (req, res, next) => {
await doBuildHeader(req, res);
next();
diff --git a/src/middleware/render.js b/src/middleware/render.js
index 7aa0d847bc..ad9e988c1e 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -73,7 +73,7 @@ module.exports = function (middleware) {
options._header = {
tags: await meta.tags.parse(req, renderResult, res.locals.metaTags, res.locals.linkTags),
};
- res.locals._i18n = languages.getFull(getLang(req, res));
+ res.locals._i18n = languages.getFull(await getLang(req, res));
options.widgets = await widgets.render(req.uid, {
template: `${template}.tpl`,
url: options.url,
@@ -280,13 +280,17 @@ module.exports = function (middleware) {
const version = nconf.get('version');
- res.locals.config.userLang = res.locals.config.acpLang || res.locals.config.userLang;
const langDirection = translator.languageDirection(res.locals.config.acpLang);
res.locals.config.isRTL = langDirection === 'rtl';
+ const config = {
+ ...res.locals.config,
+ // override so the config.userLang client side is the acpLang for the admin panel
+ userLang: res.locals.config.acpLang || res.locals.config.userLang,
+ };
const templateValues = {
- config: res.locals.config,
- configJSON: jsesc(translator.escape(JSON.stringify(res.locals.config)), { isScriptContext: true }),
- relative_path: res.locals.config.relative_path,
+ config: config,
+ configJSON: jsesc(translator.escape(JSON.stringify(config)), { isScriptContext: true }),
+ relative_path: config.relative_path,
adminConfigJSON: encodeURIComponent(JSON.stringify(results.configs)),
metaTags: results.tags.meta,
linkTags: results.tags.link,
@@ -317,7 +321,7 @@ module.exports = function (middleware) {
return new Promise((resolve, reject) => {
render.call(res, tpl, options, async (err, str) => {
if (err) reject(err);
- else resolve(await translate(str, getLang(req, res)));
+ else resolve(await translate(str, await getLang(req, res)));
});
});
}
@@ -396,12 +400,10 @@ module.exports = function (middleware) {
return str;
}
- function getLang(req, res) {
- let language = (res.locals.config && res.locals.config.userLang) || 'en-GB';
- if (res.locals.renderHeaderType === 'admin') {
- language = (res.locals.config && res.locals.config.acpLang) || 'en-GB';
- }
- return req.query.lang ? req.query.lang : language;
+ async function getLang(req, res) {
+ if (req.query.lang) return req.query.lang;
+ const config = res.locals.config ?? await user.getSettings(req.uid);
+ return res.locals.isAdminPage ? config.acpLang : config.userLang;
}
async function translate(str, language) {
diff --git a/src/routes/helpers.js b/src/routes/helpers.js
index 079eb36536..32dee23939 100644
--- a/src/routes/helpers.js
+++ b/src/routes/helpers.js
@@ -45,8 +45,12 @@ helpers.setupAdminPageRoute = function (...args) {
if (args.length === 5) {
winston.warn(`[helpers.setupAdminPageRoute(${name})] passing \`middleware\` as the third param is deprecated, it can now be safely removed`);
}
- router.get(name, middleware.autoLocale, middleware.admin.buildHeader, middlewares, helpers.tryRoute(controller));
- router.get(`/api${name}`, middlewares, helpers.tryRoute(controller));
+ const adminMiddlewares = [
+ middleware.admin.isAdminPage,
+ ...middlewares,
+ ];
+ router.get(name, middleware.autoLocale, middleware.admin.buildHeader, adminMiddlewares, helpers.tryRoute(controller));
+ router.get(`/api${name}`, adminMiddlewares, helpers.tryRoute(controller));
};
// router, verb, name, middlewares(optional), controller