strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

nicer formatting of alert message

Browse source 
Change-Id: Id4582b2ac1ad4212eb8f7c63dc6da8b2dea2e1e7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99235
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
Andras Timar 2020-07-22 17:30:18 +02:00
parent 9c6739eee0
commit d34f7ce6dd
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
loleaflet/po/templates/loleaflet-ui.pot
View file

@ -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

10
loleaflet/src/control/Permission.js
View file

@ -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';
}