Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: translate api error messages to user lang, closes #10623,

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2022-05-15 21:23:23 -04:00
parent a4784ed357
commit b17a81bfb0
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/client/topic/votes.js
View File

@@ -63,8 +63,7 @@ define('forum/topic/votes', [
delta: delta, delta: delta,
}, function (err) { }, function (err) {
if (err) { if (err) {
// TODO: err.message is currently hardcoded in helpers/api.js if (!app.user.uid) {
if (err.message === 'A valid login session was not found. Please log in and try again.') {
ajaxify.go('login'); ajaxify.go('login');
return; return;
} }

16
src/controllers/helpers.js
View File

@@ -460,7 +460,7 @@ helpers.formatApiResponse = async (statusCode, res, payload) => {
Object.assign(response, { params }); Object.assign(response, { params });
} }
const returnPayload = await helpers.generateError(statusCode, message); const returnPayload = await helpers.generateError(statusCode, message, res);
returnPayload.response = response; returnPayload.response = response;
if (global.env === 'development') { if (global.env === 'development') {
@@ -471,7 +471,7 @@ helpers.formatApiResponse = async (statusCode, res, payload) => {
res.status(statusCode).json(returnPayload); res.status(statusCode).json(returnPayload);
} else if (!payload) { } else if (!payload) {
// Non-2xx statusCode, generate predefined error // Non-2xx statusCode, generate predefined error
const returnPayload = await helpers.generateError(statusCode); const returnPayload = await helpers.generateError(statusCode, null, res);
res.status(statusCode).json(returnPayload); res.status(statusCode).json(returnPayload);
} }
}; };
@@ -495,15 +495,21 @@ async function generateBannedResponse(res) {
return response; return response;
} }
helpers.generateError = async (statusCode, message) => { helpers.generateError = async (statusCode, message, res) => {
async function translateMessage(message) {
const { req } = res;
const settings = req.query.lang ? null : await user.getSettings(req.uid);
const language = String(req.query.lang || settings.userLang || meta.config.defaultLang);
return await translator.translate(message, language);
}
if (message && message.startsWith('[[')) { if (message && message.startsWith('[[')) {
message = await translator.translate(message); message = await translateMessage(message);
} }
const payload = { const payload = {
status: { status: {
code: 'internal-server-error', code: 'internal-server-error',
message: message || await translator.translate(`[[error:api.${statusCode}]]`), message: message || await translateMessage(`[[error:api.${statusCode}]]`),
}, },
response: {}, response: {},
}; };