loleaflet/po/templates/loleaflet-ui.pot | 4 +---
loleaflet/src/control/Permission.js | 10 +++++-----
2 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit d34f7ce6ddd264d4445fa19f64497a568dee9d08
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Jul 22 17:30:18 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jul 22 22:55:48 2020 +0200
nicer formatting of alert message
Change-Id: Id4582b2ac1ad4212eb8f7c63dc6da8b2dea2e1e7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99235
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/po/templates/loleaflet-ui.pot
b/loleaflet/po/templates/loleaflet-ui.pot
index 55a4f192f..4fa244610 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -903,9 +903,7 @@ msgid "The document could not be locked, and is opened in
read-only mode."
msgstr ""
#: src/control/Permission.js:47 src/control/Permission.js:65
-msgid ""
-"\n"
-"Server returned this reason: \""
+msgid "Server returned this reason:"
msgstr ""
#: src/control/Permission.js:63
diff --git a/loleaflet/src/control/Permission.js
b/loleaflet/src/control/Permission.js
index 62b9bb9ad..c4035145c 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -44,7 +44,7 @@ L.Map.include({
var alertMsg = _('The document could not be locked, and
is opened in read-only mode.');
if (reason) {
- alertMsg += _('\nServer returned this reason:
"') + reason + '"';
+ alertMsg += '\n' + _('Server returned this
reason:') + '\n"' + reason + '"';
}
vex.dialog.alert({ message: alertMsg });
@@ -62,7 +62,7 @@ L.Map.include({
// This is a failed response to an attempt to lock
using mobile-edit-button
alertMsg = _('The document could not be locked.');
if (reason) {
- alertMsg += _('\nServer returned this reason:
"') + reason + '"';
+ alertMsg += '\n' + _('Server returned this
reason:') + '\n"' + reason + '"';
}
vex.dialog.alert({ message: alertMsg });
}
@@ -136,15 +136,15 @@ L.Map.include({
getPermission: function () {
return this._permission;
},
-
+
isPermissionEditForComments: function() {
return true;
},
-
+
isPermissionReadOnly: function() {
return this._permission === 'readonly';
},
-
+
isPermissionEdit: function() {
return this._permission === 'edit';
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
