[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/src

Andras Timar andras.timar at collabora.com
Thu Jan 18 12:55:03 UTC 2018


 loleaflet/src/core/Socket.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd33967ab3f8bae8edfaf70dda6109735fea7987
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Jan 17 17:05:30 2018 +0100

    fix l10n of this Oops message and use branding, if available
    
    Change-Id: Iaaa3c93d7b025617059e2c8a55195eb67e23f399
    Reviewed-on: https://gerrit.libreoffice.org/48065
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 8e2ec804..33330d1b 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -34,7 +34,7 @@ L.Socket = L.Class.extend({
 		try {
 			this.socket = new WebSocket(map.options.server + '/lool/' + encodeURIComponent(map.options.doc + '?' + $.param(map.options.docParams)) + '/ws' + wopiSrc);
 		} catch (e) {
-			this._map.fire('error', {msg: _('Oops, there is a problem connecting to LibreOffice Online : ' + e), cmd: 'socket', kind: 'failed', id: 3});
+			this._map.fire('error', {msg: _('Oops, there is a problem connecting to LibreOffice Online : ').replace('LibreOffice Online', (typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice Online')) + e, cmd: 'socket', kind: 'failed', id: 3});
 			return;
 		}
 


More information about the Libreoffice-commits mailing list