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

[Libreoffice Gerrit user]

 loleaflet/html/signing-identities.html  |    8 +++----
 loleaflet/po/templates/loleaflet-ui.pot |   36 +++++++++++++++++++++-----------
 loleaflet/src/control/Signing.js        |    5 +++-
 3 files changed, 32 insertions(+), 17 deletions(-)

New commits:
commit 37425878ea181f755233357d2dce834039c1f468
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Dec 10 10:10:20 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Dec 10 10:20:06 2018 +0100

    signing: update end point URL suffix to work again
    
    Server-side code was changed.
    
    Change-Id: Icf784a261de66e519f1c6975b70820ef0b6888a0
    (cherry picked from commit 0648d462ff81a6fa4aeea58636810f565a01d4cc)

diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index d4113cc67..183d5ed88 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -421,7 +421,7 @@ L.Map.include({
 					}
 				}
 			},
-			vereignURL + '/api/js/iframe'
+			vereignURL + '/vcl/js/iframe'
 		).then(function(lib) {
 			library = lib;
 			adjustUIState();
commit 937e548850f52daa5dc20522bdc3360d37aef15a
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Dec 9 21:53:49 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Dec 10 10:19:52 2018 +0100

    loleaflet: enable l10n of Signing Identities dialog
    
    Change-Id: I4b6f5c998c649c6bfe89fc6af1e1f32f39053cbe
    (cherry picked from commit 9539c212ef6770a9a0d30fe2fba894e256fdc6bd)

diff --git a/loleaflet/html/signing-identities.html b/loleaflet/html/signing-identities.html
index c40b5f8cc..e6ba57416 100644
--- a/loleaflet/html/signing-identities.html
+++ b/loleaflet/html/signing-identities.html
@@ -14,7 +14,7 @@
 }
 </style>
 
-<p>Select identity:</p>
-<p><div id="identites"></div></p>
-<p><a href="#" id="login-qr">Login from mobile</a></p>
-<p><a href="#" id="recover-from-email">Recover from email</a></p>
+<p id="select-identity"></p>
+<div id="identites"></div>
+<p><a href="#" id="login-qr"></a></p>
+<p><a href="#" id="recover-from-email"></a></p>
diff --git a/loleaflet/po/templates/loleaflet-ui.pot b/loleaflet/po/templates/loleaflet-ui.pot
index 82bb656ab..5760c1f9b 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-09 17:36+0100\n"
+"POT-Creation-Date: 2018-12-09 21:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -666,47 +666,59 @@ msgstr ""
 msgid "Document uploaded."
 msgstr ""
 
-#: src/control/Signing.js:464
-msgid "Not Signed"
+#: src/control/Signing.js:362
+msgid "Select identity:"
+msgstr ""
+
+#: src/control/Signing.js:363
+msgid "Login from mobile"
+msgstr ""
+
+#: src/control/Signing.js:364
+msgid "Recover from email"
 msgstr ""
 
 #: src/control/Signing.js:467
+msgid "Not Signed"
+msgstr ""
+
+#: src/control/Signing.js:470
 msgid "Document signed and validated."
 msgstr ""
 
-#: src/control/Signing.js:468
+#: src/control/Signing.js:471
 msgid "Signed and validated"
 msgstr ""
 
-#: src/control/Signing.js:471
+#: src/control/Signing.js:474
 msgid "Document signed but signature is broken."
 msgstr ""
 
-#: src/control/Signing.js:472
+#: src/control/Signing.js:475
 msgid "Signature broken"
 msgstr ""
 
-#: src/control/Signing.js:475
+#: src/control/Signing.js:478
 msgid "Document signed but the document is already modified."
 msgstr ""
 
-#: src/control/Signing.js:476
+#: src/control/Signing.js:479
 msgid "Signed but document modified"
 msgstr ""
 
-#: src/control/Signing.js:479
+#: src/control/Signing.js:482
 msgid "Document signed but can not be validated."
 msgstr ""
 
-#: src/control/Signing.js:480
+#: src/control/Signing.js:483
 msgid "Signed but not validated"
 msgstr ""
 
-#: src/control/Signing.js:483
+#: src/control/Signing.js:486
 msgid "Document signed but not all files are signed."
 msgstr ""
 
-#: src/control/Signing.js:484
+#: src/control/Signing.js:487
 msgid "Signed but not all files are signed"
 msgstr ""
 
diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index fa1e796ff..d4113cc67 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -359,6 +359,9 @@ L.Map.include({
 				contentCSS: { width: w + 'px' },
 				buttons: {},
 				afterOpen: function($vexContent) {
+					$('#select-identity').text(_('Select identity:'));
+					$('#login-qr').text(_('Login from mobile'));
+					$('#recover-from-email').text(_('Recover from email'));
 					library.listIdentities().then(function(response) {
 						var identities = response.data;
 						var identitiesDiv = $vexContent.find('#identites');