From b1fbc1945c4b32980398796970f54f2ca79762c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 20 May 2023 14:35:05 -0400 Subject: [PATCH] refactor: use app.parseAndTranslate --- public/src/client/chats/messages.js | 31 ++++++++++++----------------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.js index ce6f6cb18f..f51b261acf 100644 --- a/public/src/client/chats/messages.js +++ b/public/src/client/chats/messages.js @@ -2,11 +2,10 @@ define('forum/chats/messages', [ - 'components', 'translator', 'benchpress', 'hooks', - 'bootbox', 'alerts', 'messages', 'api', 'forum/topic/images', + 'components', 'hooks', 'bootbox', 'alerts', + 'messages', 'api', 'forum/topic/images', ], function ( - components, translator, Benchpress, hooks, - bootbox, alerts, messagesModule, api, images + components, hooks, bootbox, alerts, messagesModule, api, images ) { const messages = {}; @@ -106,17 +105,15 @@ define('forum/chats/messages', [ }; messages.parseMessage = function (data, callback) { - function done(html) { - translator.translate(html, translated => callback($(translated))); - } const tplData = { messages: data, isAdminOrGlobalMod: app.user.isAdmin || app.user.isGlobalMod, + }; if (Array.isArray(data)) { - Benchpress.render('partials/chats/messages', tplData).then(done); + app.parseAndTranslate('partials/chats/messages', tplData).then(callback); } else { - Benchpress.render('partials/chats/' + (data.system ? 'system-message' : 'message'), tplData).then(done); + app.parseAndTranslate('partials/chats/' + (data.system ? 'system-message' : 'message'), tplData).then(callback); } }; @@ -256,16 +253,14 @@ define('forum/chats/messages', [ } messages.delete = function (messageId, roomId) { - translator.translate('[[modules:chat.delete_message_confirm]]', function (translated) { - bootbox.confirm(translated, function (ok) { - if (!ok) { - return; - } + bootbox.confirm('[[modules:chat.delete_message_confirm]]', function (ok) { + if (!ok) { + return; + } - api.del(`/chats/${roomId}/messages/${messageId}`, {}).then(() => { - components.get('chat/message', messageId).toggleClass('deleted', true); - }).catch(alerts.error); - }); + api.del(`/chats/${roomId}/messages/${messageId}`, {}).then(() => { + components.get('chat/message', messageId).toggleClass('deleted', true); + }).catch(alerts.error); }); };