[Libreoffice-commits] online.git: 3 commits - loleaflet/dist loleaflet/src tools/KitClient.cpp

[Pranav Kant]

 loleaflet/dist/errormessages.js  |    5 ++---
 loleaflet/src/control/Toolbar.js |    2 +-
 tools/KitClient.cpp              |    9 +++------
 3 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 00f4b4c0f2831c243439463b0e2378cb8a50d7b7
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Jun 7 10:13:48 2017 +0530

    No need to specify the full path
    
    Moreover, its ideal to use the same URL to get this *-help.html file with
    which loleaflet.html is loaded, and not the one with 'dist' in it.
    
    Change-Id: I2e25f9a2ef41bb1d23fc09878b0726d6b4019cee

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index b5f68749..832abdb0 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -176,7 +176,7 @@ L.Map.include({
 
 	showLOKeyboardHelp: function() {
 		var w = window.innerWidth / 2;
-		$.get('/loleaflet/dist/loleaflet-help.html', function(data) {
+		$.get('loleaflet-help.html', function(data) {
 			vex.open({
 				content: data,
 				showCloseButton: true,
commit ee026723ed17d8b27bc6bf2a63dfb84f575ea517
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Jun 7 09:19:52 2017 +0530

    Bin redundant code
    
    Change-Id: Id691052e343cea73f3dec512ee6f4d4960f9614b

diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index dc9ed7f0..fa6a9997 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -13,6 +13,5 @@ exports.storage = {
 	loadfailed: _('Failed to read document from storage. Please contact your storage server (%storageserver) administrator.'),
 	savediskfull: _('Save failed due to no disk space left on storage server. Document will now be read-only. Please contact the server (%storageserver) administrator to continue editing.'),
 	saveunauthorized: _('Document cannot be saved due to expired or invalid access token.'),
-	savefailed: _('Document cannot be saved. Check your permissions or contact the storage server administrator.'),
-	documentconflict: _('Document has been changed in storage outside WOPI.')
+	savefailed: _('Document cannot be saved. Check your permissions or contact the storage server administrator.')
 };
diff --git a/tools/KitClient.cpp b/tools/KitClient.cpp
index 8aa38e73..dfdb006c 100644
--- a/tools/KitClient.cpp
+++ b/tools/KitClient.cpp
@@ -189,13 +189,10 @@ protected:
                 pngStream.write(png.data(), png.size());
                 pngStream.close();
 
-                if (std::getenv("DISPLAY") != nullptr)
+                if (std::system((std::string("display ") + pngFile.path()).c_str()) == -1)
                 {
-                    if (std::system((std::string("display ") + pngFile.path()).c_str()) == -1)
-                    {
-                        // Not worth it to display a warning, this is just a throwaway test program, and
-                        // the developer running it surely notices if nothing shows up...
-                    }
+                    // Not worth it to display a warning, this is just a throwaway test program, and
+                    // the developer running it surely notices if nothing shows up...
                 }
             }
             else
commit 4711debd9a9c640a6f271f90a7151a6f1ec7de79
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Jun 6 20:23:34 2017 +0530

    Some error strings tweaks
    
    Change-Id: I8ce174dfc6d67f467770c1c9804f2bf830fedaf7

diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index 08cd395b..dc9ed7f0 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -12,7 +12,7 @@ exports.faileddocloading = _('Failed to load the document. Please ensure the fil
 exports.storage = {
 	loadfailed: _('Failed to read document from storage. Please contact your storage server (%storageserver) administrator.'),
 	savediskfull: _('Save failed due to no disk space left on storage server. Document will now be read-only. Please contact the server (%storageserver) administrator to continue editing.'),
-	saveunauthorized: _('Document cannot be saved to storage server (%storageserver) due to expired or invalid access token. Refresh your session to not to lose your work.'),
-	savefailed: _('Document cannot be saved to storage. Check your permissions or contact the storage server (%storageserver) administrator.'),
+	saveunauthorized: _('Document cannot be saved due to expired or invalid access token.'),
+	savefailed: _('Document cannot be saved. Check your permissions or contact the storage server administrator.'),
 	documentconflict: _('Document has been changed in storage outside WOPI.')
 };