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

[Jan Holesovsky]

 loleaflet/src/core/Socket.js |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit bf580b14d572482d552e444d2871af0055560202
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Aug 8 16:14:38 2017 +0200

    Better description of the buttons in case of document conflict.
    
    Change-Id: I177e0fdafef218f958f2efae7eb5ca3e099414de
    Reviewed-on: https://gerrit.libreoffice.org/40887
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 2de5cceb..17203586 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -389,7 +389,11 @@ L.Socket = L.Class.extend({
 				}
 
 				vex.dialog.confirm({
-					message: _('Document has been changed in storage. Do you want to refresh the page to load the new document ? Cancelling will continue editing and overwrite.'),
+					message: _('Document has been changed in storage. Do you want to discard your changes, and load the new document?'),
+					buttons: [
+						$.extend({}, vex.dialog.buttons.YES, { text: _('Discard changes') }),
+						$.extend({}, vex.dialog.buttons.NO, { text: _('Overwrite document') })
+					],
 					callback: L.bind(function(value) {
 						if (value) {
 							// They want to refresh the page and load document again for all