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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri May 3 14:44:29 UTC 2019


 loleaflet/src/control/Control.AlertDialog.js |    2 +-
 loleaflet/src/errormessages.js               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9f8890fa62d17fb53bfa6ea876812166e0e9a39b
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri May 3 16:39:49 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri May 3 16:44:10 2019 +0200

    Tell the user which link they are about to visit.
    
    Change-Id: Ice177eeda7a11fe20d0188abceee3ef520769bbf
    Reviewed-on: https://gerrit.libreoffice.org/71755
    Reviewed-by: Iván Sánchez Ortega <ivan.sanchez at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/control/Control.AlertDialog.js b/loleaflet/src/control/Control.AlertDialog.js
index 336c14dd7..0c3734eb9 100644
--- a/loleaflet/src/control/Control.AlertDialog.js
+++ b/loleaflet/src/control/Control.AlertDialog.js
@@ -32,9 +32,9 @@ L.Control.AlertDialog = L.Control.extend({
 
 			if (!isLinkValid) {
 				messageText = window.errorMessages.invalidLink;
-				messageText = messageText.replace('%url', url);
 			}
 
+			messageText = messageText.replace('%url', url);
 			var buttonsList = [];
 
 			if (isLinkValid) {
diff --git a/loleaflet/src/errormessages.js b/loleaflet/src/errormessages.js
index 0baa1e626..b4b04838f 100644
--- a/loleaflet/src/errormessages.js
+++ b/loleaflet/src/errormessages.js
@@ -22,7 +22,7 @@ errorMessages.sessionexpiry = _('Your session will expire in %time. Please save
 errorMessages.sessionexpired = _('Your session has been expired. Further changes to document might not be saved. Please refresh the session (or webpage) to continue.');
 errorMessages.faileddocloading = _('Failed to load the document. Please ensure the file type is supported and not corrupted, and try again.');
 errorMessages.invalidLink = _('Invalid link: \'%url\'');
-errorMessages.leaving = _('You are leaving the editor, are you sure you want to proceed?');
+errorMessages.leaving = _('You are leaving the editor, are you sure you want to visit %url?');
 
 errorMessages.storage = {
 	loadfailed: _('Failed to read document from storage. Please contact your storage server (%storageserver) administrator.'),


More information about the Libreoffice-commits mailing list