loleaflet/src/core/Socket.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit e7af725b7c6be28ac2dbaec7f95a40ef56db4184
Author: Jan Holesovsky <ke...@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/40888
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 0e23d797..8a18968a 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
