[Libreoffice-commits] online.git: loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.ContextToolbar.js |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 4249722b12da8470634d1685afef36b97b557e7f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri May 31 20:46:27 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri May 31 20:47:35 2019 +0300

    tdf#122572: Use the _UNO() function instead of duplicating what it does
    
    Change-Id: I54f7f49c2b4b82c3b8450b4475c2ea1267125df5

diff --git a/loleaflet/src/control/Control.ContextToolbar.js b/loleaflet/src/control/Control.ContextToolbar.js
index 139636de8..60dec30dc 100644
--- a/loleaflet/src/control/Control.ContextToolbar.js
+++ b/loleaflet/src/control/Control.ContextToolbar.js
@@ -2,7 +2,7 @@
 /*
  * L.Control.ContextToolbar.
  */
-/* global _ */
+/* global _UNO */
 
 L.Control.ContextToolbar = L.Control.extend({
 	options: {
@@ -55,15 +55,11 @@ L.Control.ContextToolbar = L.Control.extend({
 		if (window.ThisIsTheiOSApp) {
 			this._leftroundedend = L.DomUtil.create(tagTd, 'loleaflet-ios-context-button loleaflet-ios-context-left', tr);
 			this._cut = L.DomUtil.create(tagTd, 'loleaflet-ios-context-button loleaflet-ios-context-first-and-middle-entry loleaflet-ios-context-cut', tr);
-			// We have at the moment no translations for the bare words "Cut", "Copy",
-			// and "Paste". Only for the menu entries that start with a tilde. So let's
-			// do a horrible hack: Look up those and remove the tilde from the
-			// translation.
-			this._cut.innerHTML = _('~Cut').replace(/~/, '');
+			this._cut.innerHTML = _UNO('.uno:Cut');
 			this._copy = L.DomUtil.create(tagTd, 'loleaflet-ios-context-button loleaflet-ios-context-first-and-middle-entry loleaflet-ios-context-copy', tr);
-			this._copy.innerHTML = _('~Copy').replace(/~/, '');
+			this._copy.innerHTML = _UNO('.uno:Copy');
 			this._paste = L.DomUtil.create(tagTd, 'loleaflet-ios-context-button loleaflet-ios-context-last-entry loleaflet-ios-context-paste', tr);
-			this._paste.innerHTML = _('~Paste').replace(/~/, '');
+			this._paste.innerHTML = _UNO('.uno:Paste');
 			this._rightroundedend = L.DomUtil.create(tagTd, 'loleaflet-ios-context-button loleaflet-ios-context-right', tr);
 		}
 		else {