loleaflet/po/templates/loleaflet-ui.pot |    4 +---
 loleaflet/src/control/Permission.js     |    4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 1e9408cf9f7e84264b0d7dca3737320161f9a64a
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Jul 22 17:30:18 2020 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Aug 4 23:24:18 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 24a8c9c37..6f707c8a5 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -824,9 +824,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 b5a19439c..52e64a340 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 });
                }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to