diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index aae5456bed..4fa58a7e97 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -75,7 +75,7 @@ define('chat', [ sounds.play('chat-incoming', 'chat.incoming:' + data.message.mid); taskbar.push('chat', modal.attr('data-uuid'), { - title: data.roomName || username, + title: '[[modules:chat.chatting_with]] ' + (data.roomName || username), touid: data.message.fromUser.uid, roomId: data.roomId, }); @@ -251,7 +251,7 @@ define('chat', [ Chats.addIPHandler(chatModal); taskbar.push('chat', chatModal.attr('data-uuid'), { - title: data.roomName || (data.users.length ? data.users[0].username : ''), + title: '[[modules:chat.chatting_with]] ' + (data.roomName || (data.users.length ? data.users[0].username : '')), roomId: data.roomId, icon: 'fa-comment', state: '', diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js index 1e3ea17e10..5a1c0d886f 100644 --- a/public/src/modules/taskbar.js +++ b/public/src/modules/taskbar.js @@ -1,7 +1,7 @@ 'use strict'; -define('taskbar', ['benchpress'], function (Benchpress) { +define('taskbar', ['benchpress', 'translator'], function (Benchpress, translator) { var taskbar = {}; taskbar.init = function () { @@ -111,32 +111,35 @@ define('taskbar', ['benchpress'], function (Benchpress) { } function createTaskbar(data) { - var title = $('
').text(data.options.title || 'NodeBB Task').html(); - - var taskbarEl = $('') - .addClass(data.options.className) - .html('' + - (data.options.icon ? ' ' : '') + - (data.options.image ? '