From f3956299ebfb4df49abf90596d631b63f30f018c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Zanghelini?= <An-dz@users.noreply.github.com>
Date: Mon, 17 Sep 2018 17:23:06 -0300
Subject: [PATCH] Add tooltip in taskbar icons (#6693)

* Add tooltip in taskbar icons

* Translate taskbar title when creating taskbar
---
 public/src/modules/chat.js    |  4 +--
 public/src/modules/taskbar.js | 57 ++++++++++++++++++-----------------
 2 files changed, 32 insertions(+), 29 deletions(-)

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 = $('<div></div>').text(data.options.title || 'NodeBB Task').html();
-
-		var	taskbarEl = $('<li />')
-			.addClass(data.options.className)
-			.html('<a href="#">' +
-				(data.options.icon ? '<i class="fa ' + data.options.icon + '"></i> ' : '') +
-				(data.options.image ? '<img src="' + data.options.image + '"/> ' : '') +
-				'<span component="taskbar/title">' + title + '</span>' +
-				'</a>')
-			.attr({
-				'data-module': data.module,
-				'data-uuid': data.uuid,
-			})
-			.addClass(data.options.state !== undefined ? data.options.state : 'active');
-
-		if (!data.options.state || data.options.state === 'active') {
-			minimizeAll();
-		}
-
-		taskbar.tasklist.append(taskbarEl);
-		update();
-
-		data.element = taskbarEl;
-
-		taskbarEl.data(data);
-		$(window).trigger('action:taskbar.pushed', data);
+		translator.translate(data.options.title, function (taskTitle) {
+			var title = $('<div></div>').text(taskTitle || 'NodeBB Task').html();
+
+			var	taskbarEl = $('<li />')
+				.addClass(data.options.className)
+				.html('<a href="#">' +
+					(data.options.icon ? '<i class="fa ' + data.options.icon + '"></i> ' : '') +
+					(data.options.image ? '<img src="' + data.options.image + '"/> ' : '') +
+					'<span component="taskbar/title">' + title + '</span>' +
+					'</a>')
+				.attr({
+					title: title,
+					'data-module': data.module,
+					'data-uuid': data.uuid,
+				})
+				.addClass(data.options.state !== undefined ? data.options.state : 'active');
+
+			if (!data.options.state || data.options.state === 'active') {
+				minimizeAll();
+			}
+
+			taskbar.tasklist.append(taskbarEl);
+			update();
+
+			data.element = taskbarEl;
+
+			taskbarEl.data(data);
+			$(window).trigger('action:taskbar.pushed', data);
+		});
 	}
 
 	taskbar.updateTitle = function (module, uuid, newTitle) {