Node.js based forum software built for the modern web
refactor: translate chat system messages on the backend
Barış Soner Uşaklı6d702226bf4f
diff --git a/src/messaging/data.js b/src/messaging/data.jsindex 893606eefd..d767b1e7ea 100644--- a/src/messaging/data.js+++ b/src/messaging/data.js@@ -7,6 +7,7 @@ const user = require('../user');const posts = require('../posts');const utils = require('../utils');const plugins = require('../plugins');+const tx = require('../translator');const intFields = ['mid', 'timestamp', 'edited', 'fromuid', 'roomId', 'deleted', 'system'];@@ -135,8 +136,11 @@ module.exports = function (Messaging) {const canView = await Messaging.canViewMessage(parentMids, roomId, uid);parentMids = parentMids.filter((mid, idx) => canView[idx]);- const parentMessages = await Messaging.getMessagesFields(parentMids, [- 'mid', 'fromuid', 'content', 'timestamp', 'deleted',+ const [parentMessages, { userLang }] = await Promise.all([+ Messaging.getMessagesFields(parentMids, [+ 'mid', 'fromuid', 'content', 'timestamp', 'deleted',+ ]),+ user.getSettings(uid),]);const parentUids = _.uniq(parentMessages.map(msg => msg && msg.fromuid));const usersMap = _.zipObject(@@ -155,7 +159,7 @@ module.exports = function (Messaging) {parentMsg.content = foundMsg.content;return;}- parentMsg.content = await parseMessage(parentMsg, uid, roomId, false);+ parentMsg.content = await parseMessage(parentMsg, uid, roomId, false, userLang);}));const parents = {};@@ -175,18 +179,19 @@ module.exports = function (Messaging) {}async function parseMessages(messages, uid, roomId, isNew) {+ const { userLang } = await user.getSettings(uid);await Promise.all(messages.map(async (msg) => {if (msg.deleted && !msg.isOwner) {msg.content = `[[modules:chat.message-deleted]]`;msg.txContent = true;return;}- msg.content = await parseMessage(msg, uid, roomId, isNew);+ msg.content = await parseMessage(msg, uid, roomId, isNew, userLang);}));}- async function parseMessage(message, uid, roomId, isNew) {+ async function parseMessage(message, uid, roomId, isNew, userLang) {if (message.system) {- return message.content;+ return await tx.translate(message.content, userLang);} else if (!utils.isNumber(message.mid)) {return posts.sanitize(message.content);}diff --git a/src/views/partials/chats/system-message.tpl b/src/views/partials/chats/system-message.tplindex 45c6b7514b..a0f7c2185d 100644--- a/src/views/partials/chats/system-message.tpl+++ b/src/views/partials/chats/system-message.tpl@@ -1,7 +1,7 @@<li component="chat/system-message" class="system-message text-muted small py-4 py-md-2 gap-3 d-flex align-items-center justify-content-center" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-index="{messages.index}" data-self="{messages.self}" data-break="0" data-timestamp="{messages.timestamp}"><hr class="d-none d-md-inline-block my-1" style="width: 10%;"/><div>- {{tx(messages.content)}}+ {{messages.content}}</div><hr class="d-none d-md-inline-block my-1" style="width: 10%;"/></li>\ No newline at end of file