From 5926e9d110d7eb2bb8e0cb98aa24d8fed2c93ecb Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 9 Aug 2021 16:28:53 +0200
Subject: [PATCH] Navigation menu: Add current user's login to the tooltip

---
 dictionaries/cs.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/da.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/de.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/en.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/es_cr.dictionary.itop.ui.php                     | 4 ++--
 dictionaries/fr.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/hu.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/it.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/ja.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/nl.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/pl.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/pt_br.dictionary.itop.ui.php                     | 4 ++--
 dictionaries/ru.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/sk.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/tr.dictionary.itop.ui.php                        | 4 ++--
 dictionaries/zh_cn.dictionary.itop.ui.php                     | 4 ++--
 .../UI/Base/Layout/NavigationMenu/NavigationMenu.php          | 2 +-
 17 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/dictionaries/cs.dictionary.itop.ui.php b/dictionaries/cs.dictionary.itop.ui.php
index a19a84922..098bccac2 100755
--- a/dictionaries/cs.dictionary.itop.ui.php
+++ b/dictionaries/cs.dictionary.itop.ui.php
@@ -372,8 +372,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Incidenty přidělené mně',
 	'UI:AllOrganizations' => ' Všechny organizace ',
 	'UI:YourSearch' => 'hledat',
-	'UI:LoggedAsMessage' => 'Přihlášen - %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Přihlášen - %1$s (Administrátor)',
+	'UI:LoggedAsMessage' => 'Přihlášen - %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Přihlášen - %1$s (%2$s, Administrátor)~~',
 	'UI:Button:Logoff' => 'Odhlásit',
 	'UI:Button:GlobalSearch' => 'Hledat',
 	'UI:Button:Search' => ' Hledat ',
diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php
index 3adb7683c..e2f196675 100644
--- a/dictionaries/da.dictionary.itop.ui.php
+++ b/dictionaries/da.dictionary.itop.ui.php
@@ -361,8 +361,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Incidents tildelt mig',
 	'UI:AllOrganizations' => ' Alle Organisationer',
 	'UI:YourSearch' => 'Din Søgning',
-	'UI:LoggedAsMessage' => 'Logget ind som %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Logget ind som %1$s (Administrator)',
+	'UI:LoggedAsMessage' => 'Logget ind som %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Logget ind som %1$s (%2$s, Administrator)~~',
 	'UI:Button:Logoff' => 'Log ud',
 	'UI:Button:GlobalSearch' => 'Søg',
 	'UI:Button:Search' => ' Søg ',
diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php
index b4dc37c82..b17309af6 100644
--- a/dictionaries/de.dictionary.itop.ui.php
+++ b/dictionaries/de.dictionary.itop.ui.php
@@ -361,8 +361,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:WelcomeMenu:MyIncidents' => 'An mich zugewiesene Incidents',
 	'UI:AllOrganizations' => ' Alle Organisationen ',
 	'UI:YourSearch' => 'Ihre Suche',
-	'UI:LoggedAsMessage' => 'Angemeldet als %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Angemeldet als %1$s (Administrator)',
+	'UI:LoggedAsMessage' => 'Angemeldet als %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Angemeldet als %1$s (%2$s, Administrator)~~',
 	'UI:Button:Logoff' => 'Abmelden',
 	'UI:Button:GlobalSearch' => 'Suche',
 	'UI:Button:Search' => 'Suche ',
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index f1c34856c..b3849a614 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -388,8 +388,8 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
 	'UI:WelcomeMenu:MyIncidents' => 'Incidents assigned to me',
 	'UI:AllOrganizations' => ' All Organizations ',
 	'UI:YourSearch' => 'Your Search',
-	'UI:LoggedAsMessage' => 'Logged in as %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Logged in as %1$s (Administrator)',
+	'UI:LoggedAsMessage' => 'Logged in as %1$s (%2$s)',
+	'UI:LoggedAsMessage+Admin' => 'Logged in as %1$s (%2$s, Administrator)',
 	'UI:Button:Logoff' => 'Log off',
 	'UI:Button:GlobalSearch' => 'Search',
 	'UI:Button:Search' => ' Search ',
diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php
index d81068ded..efaa23666 100644
--- a/dictionaries/es_cr.dictionary.itop.ui.php
+++ b/dictionaries/es_cr.dictionary.itop.ui.php
@@ -372,8 +372,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Incidentes Asignados a Mí',
 	'UI:AllOrganizations' => ' Todas las Organizaciones',
 	'UI:YourSearch' => 'Su búsqueda',
-	'UI:LoggedAsMessage' => 'Conectado como %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Conectado como %1$s (Administrator)',
+	'UI:LoggedAsMessage' => 'Conectado como %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Conectado como %1$s (%2$s, Administrator)~~',
 	'UI:Button:Logoff' => 'Cerrar Sesión',
 	'UI:Button:GlobalSearch' => 'Buscar',
 	'UI:Button:Search' => 'Buscar',
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 284e2f3a2..1f03dba6a 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -372,8 +372,8 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
 	'UI:WelcomeMenu:MyIncidents' => 'Mes Incidents',
 	'UI:AllOrganizations' => ' Toutes les Organisations ',
 	'UI:YourSearch' => 'Votre recherche',
-	'UI:LoggedAsMessage' => 'Connecté comme: %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Connecté comme: %1$s (Administrateur)',
+	'UI:LoggedAsMessage' => 'Connecté comme: %1$s (%2$s)',
+	'UI:LoggedAsMessage+Admin' => 'Connecté comme: %1$s (%2$s, Administrateur)',
 	'UI:Button:Logoff' => 'Déconnexion',
 	'UI:Button:GlobalSearch' => 'Rechercher',
 	'UI:Button:Search' => 'Rechercher',
diff --git a/dictionaries/hu.dictionary.itop.ui.php b/dictionaries/hu.dictionary.itop.ui.php
index d9acdb8a4..253a23896 100755
--- a/dictionaries/hu.dictionary.itop.ui.php
+++ b/dictionaries/hu.dictionary.itop.ui.php
@@ -361,8 +361,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Hozzám rendelt incidensek',
 	'UI:AllOrganizations' => 'Összes szervezeti egység',
 	'UI:YourSearch' => 'Saját keresések',
-	'UI:LoggedAsMessage' => 'Bejelentkezve %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Bejelentkezve %1$s (Administrator)',
+	'UI:LoggedAsMessage' => 'Bejelentkezve %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Bejelentkezve %1$s (%2$s, Administrator)~~',
 	'UI:Button:Logoff' => 'Kijelentkezés',
 	'UI:Button:GlobalSearch' => 'Keresés',
 	'UI:Button:Search' => ' Keresés',
diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php
index 234c21d44..ce9c61dd2 100644
--- a/dictionaries/it.dictionary.itop.ui.php
+++ b/dictionaries/it.dictionary.itop.ui.php
@@ -372,8 +372,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Incidenti assegnati a me',
 	'UI:AllOrganizations' => ' Tutte le Organizzazioni ',
 	'UI:YourSearch' => 'La tua Cerca',
-	'UI:LoggedAsMessage' => 'Logged come %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Logged come %1$s (Amministratore)',
+	'UI:LoggedAsMessage' => 'Logged come %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Logged come %1$s (%2$s, Amministratore)~~',
 	'UI:Button:Logoff' => 'Log off',
 	'UI:Button:GlobalSearch' => 'Cerca',
 	'UI:Button:Search' => ' Cerca',
diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php
index a5f7228b6..3d75d6381 100644
--- a/dictionaries/ja.dictionary.itop.ui.php
+++ b/dictionaries/ja.dictionary.itop.ui.php
@@ -361,8 +361,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:WelcomeMenu:MyIncidents' => '担当中のインシデント',
 	'UI:AllOrganizations' => '全ての組織',
 	'UI:YourSearch' => '検索',
-	'UI:LoggedAsMessage' => '%1$s としてログイン済み',
-	'UI:LoggedAsMessage+Admin' => '%1$s　(管理者)としてログイン済み',
+	'UI:LoggedAsMessage' => '%1$s としてログイン済み (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => '%1$s　(管理者)としてログイン済み (%2$s)~~',
 	'UI:Button:Logoff' => 'ログオフ',
 	'UI:Button:GlobalSearch' => '検索',
 	'UI:Button:Search' => '　検索　',
diff --git a/dictionaries/nl.dictionary.itop.ui.php b/dictionaries/nl.dictionary.itop.ui.php
index 508ecc369..f2edf593b 100644
--- a/dictionaries/nl.dictionary.itop.ui.php
+++ b/dictionaries/nl.dictionary.itop.ui.php
@@ -372,8 +372,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Aan mij toegewezen incidenten',
 	'UI:AllOrganizations' => ' Alle Organisaties ',
 	'UI:YourSearch' => 'Jouw zoekopdracht',
-	'UI:LoggedAsMessage' => 'Ingelogd als %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Ingelogd als %1$s (Beheerder)',
+	'UI:LoggedAsMessage' => 'Ingelogd als %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Ingelogd als %1$s (%2$s, Beheerder)~~',
 	'UI:Button:Logoff' => 'Log uit',
 	'UI:Button:GlobalSearch' => 'Zoek',
 	'UI:Button:Search' => ' Zoek ',
diff --git a/dictionaries/pl.dictionary.itop.ui.php b/dictionaries/pl.dictionary.itop.ui.php
index fb6ccfcf3..753ea43e1 100644
--- a/dictionaries/pl.dictionary.itop.ui.php
+++ b/dictionaries/pl.dictionary.itop.ui.php
@@ -376,8 +376,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Incydenty przydzielone mi',
 	'UI:AllOrganizations' => ' Wszystkie organizacje ',
 	'UI:YourSearch' => 'Twoje wyszukiwania',
-	'UI:LoggedAsMessage' => 'zalogowany jako %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Zalogowany jako %1$s (Administrator)',
+	'UI:LoggedAsMessage' => 'zalogowany jako %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Zalogowany jako %1$s (%2$s, Administrator)~~',
 	'UI:Button:Logoff' => 'Wyloguj',
 	'UI:Button:GlobalSearch' => 'Szukaj',
 	'UI:Button:Search' => ' Szukaj ',
diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php
index 670083b3a..01d1c79a1 100644
--- a/dictionaries/pt_br.dictionary.itop.ui.php
+++ b/dictionaries/pt_br.dictionary.itop.ui.php
@@ -372,8 +372,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Incidentes atribuídos a mim',
 	'UI:AllOrganizations' => ' Todas organizações ',
 	'UI:YourSearch' => 'Sua pesquisa',
-	'UI:LoggedAsMessage' => 'Logado como %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Logado como %1$s (Administrador)',
+	'UI:LoggedAsMessage' => 'Logado como %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Logado como %1$s (%2$s, Administrador)~~',
 	'UI:Button:Logoff' => 'Sair',
 	'UI:Button:GlobalSearch' => 'Pesquisar',
 	'UI:Button:Search' => ' Pesquisar ',
diff --git a/dictionaries/ru.dictionary.itop.ui.php b/dictionaries/ru.dictionary.itop.ui.php
index 6eec27216..5734baffe 100644
--- a/dictionaries/ru.dictionary.itop.ui.php
+++ b/dictionaries/ru.dictionary.itop.ui.php
@@ -373,8 +373,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Инциденты назначенные на меня',
 	'UI:AllOrganizations' => ' Все организации ',
 	'UI:YourSearch' => 'Поиск',
-	'UI:LoggedAsMessage' => 'Вы вошли как %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Вы вошли как %1$s (Администратор)',
+	'UI:LoggedAsMessage' => 'Вы вошли как %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Вы вошли как %1$s (%2$s, Администратор)~~',
 	'UI:Button:Logoff' => 'Выход',
 	'UI:Button:GlobalSearch' => 'Поиск',
 	'UI:Button:Search' => ' Поиск ',
diff --git a/dictionaries/sk.dictionary.itop.ui.php b/dictionaries/sk.dictionary.itop.ui.php
index 5fae9d0df..bd64ebb96 100644
--- a/dictionaries/sk.dictionary.itop.ui.php
+++ b/dictionaries/sk.dictionary.itop.ui.php
@@ -362,8 +362,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Mne priradené incidenty',
 	'UI:AllOrganizations' => ' Všetky organizácie ',
 	'UI:YourSearch' => 'Vaše vyhľadávanie',
-	'UI:LoggedAsMessage' => 'Prihlásený ako %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Prihlásený ako %1$s (Administrátor)',
+	'UI:LoggedAsMessage' => 'Prihlásený ako %1$s (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => 'Prihlásený ako %1$s (%2$s, Administrátor)~~',
 	'UI:Button:Logoff' => 'Odhlásenie',
 	'UI:Button:GlobalSearch' => 'Globálne Vyhľadávanie',
 	'UI:Button:Search' => ' Vyhľadávanie',
diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php
index b806e2943..2b656f45e 100644
--- a/dictionaries/tr.dictionary.itop.ui.php
+++ b/dictionaries/tr.dictionary.itop.ui.php
@@ -372,8 +372,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:WelcomeMenu:MyIncidents' => 'Bana atanan hatalar',
 	'UI:AllOrganizations' => ' Tüm Kurumlar ',
 	'UI:YourSearch' => 'Arama',
-	'UI:LoggedAsMessage' => '%1$s kullanıcısı ile bağlanıldı',
-	'UI:LoggedAsMessage+Admin' => '%1$s (Administrator) kullanıcısı ile bağlanıldı',
+	'UI:LoggedAsMessage' => '%1$s (%2$s) kullanıcısı ile bağlanıldı~~',
+	'UI:LoggedAsMessage+Admin' => '%1$s (%2$s, Administrator) kullanıcısı ile bağlanıldı~~',
 	'UI:Button:Logoff' => 'Çıkış',
 	'UI:Button:GlobalSearch' => 'Arama',
 	'UI:Button:Search' => ' Arama ',
diff --git a/dictionaries/zh_cn.dictionary.itop.ui.php b/dictionaries/zh_cn.dictionary.itop.ui.php
index 5e91e79d2..467edda52 100644
--- a/dictionaries/zh_cn.dictionary.itop.ui.php
+++ b/dictionaries/zh_cn.dictionary.itop.ui.php
@@ -372,8 +372,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:WelcomeMenu:MyIncidents' => '分配给我的事件',
 	'UI:AllOrganizations' => ' 所有组织 ',
 	'UI:YourSearch' => '搜索',
-	'UI:LoggedAsMessage' => '以 %1$s 登录',
-	'UI:LoggedAsMessage+Admin' => '以 %1$s 登录(Administrator)',
+	'UI:LoggedAsMessage' => '以 %1$s 登录 (%2$s)~~',
+	'UI:LoggedAsMessage+Admin' => '以 %1$s 登录(%2$s, Administrator)~~',
 	'UI:Button:Logoff' => '注销',
 	'UI:Button:GlobalSearch' => '搜索',
 	'UI:Button:Search' => '搜索',
diff --git a/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
index 26d203106..288ebcaa2 100644
--- a/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
+++ b/sources/application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
@@ -438,7 +438,7 @@ JS;
 		// Logon message
 		$sLogonMessageDictCode = (UserRights::IsAdministrator()) ? 'UI:LoggedAsMessage+Admin' : 'UI:LoggedAsMessage';
 
-		$aData['sLogonMessage'] = Dict::Format($sLogonMessageDictCode, UserRights::GetContactFriendlyname());
+		$aData['sLogonMessage'] = Dict::Format($sLogonMessageDictCode, UserRights::GetContactFriendlyname(), UserRights::GetUser());
 
 		$this->aUserData = $aData;