[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.ContextMenu.js |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 735a1d177aba8d5cb311c2715cd966f1ad46a3e6
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Aug 3 13:09:16 2018 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Aug 16 20:57:20 2018 +0200

    loleaflet: fix l10n of context menus
    
    Change-Id: I96ea9d572288796587bc2be194c94c83a9b53f8d
    Reviewed-on: https://gerrit.libreoffice.org/58559
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index f49e924e4..f0633bdf7 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -152,8 +152,8 @@ L.Control.ContextMenu = L.Control.extend({
 
 				isLastItemText = true;
 			} else if (item.type === 'menu') {
-				itemName = item.text.replace('~', '');
-				if (itemName === 'Paste Special') {
+				itemName = item.text;
+				if (itemName.replace('~', '') === 'Paste Special') {
 					itemName = _('Internal Paste Special');
 				}
 				var submenu = this._createContextMenuStructure(item);
@@ -163,7 +163,7 @@ L.Control.ContextMenu = L.Control.extend({
 				}
 
 				contextMenu[item.command] = {
-					name: _(itemName),
+					name: _(itemName).replace(/\(~[A-Za-z]\)/, '').replace('~', ''),
 					items: submenu
 				};
 				isLastItemText = true;