configure.ac | 2 +-
loleaflet/admin/admin.strings.js | 2 +-
loleaflet/html/loleaflet.html.m4 | 1 +
loleaflet/src/control/Toolbar.js | 7 +++++--
loleaflet/src/core/Socket.js | 4 ++--
loleaflet/src/layer/marker/ProgressOverlay.js | 2 +-
loleaflet/src/map/Clipboard.js | 2 +-
7 files changed, 12 insertions(+), 8 deletions(-)
New commits:
commit bab4380e6db2fcce5c8da8279a2cfdcdb4597fde
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri Jul 3 12:53:55 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 5 13:29:38 2020 +0200
default product name: LibreOffice Online Personal
Can be changed:
* configure --with-app-name
* brandProductName in loleaflet/dist/branding.js
When there is no brandProductName defined, this message will
appear in About box:
"The Personal edition is supported by volunteers and
intended for individual use."
Change-Id: Iec5aa2df7e734bdbc1dd8037656334f0016a7a82
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97837
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 2fd403c52..7d2f0a4f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -595,7 +595,7 @@ AC_SUBST(ENABLE_ANDROIDAPP)
AM_CONDITIONAL([ENABLE_ANDROIDAPP], [test "$ENABLE_ANDROIDAPP" = "true"])
AC_SUBST(ANDROID_PACKAGE_NAME)
-APP_NAME="LibreOffice Online"
+APP_NAME="LibreOffice Online Personal"
if test -n "$with_app_name"; then
APP_NAME="$with_app_name"
fi
diff --git a/loleaflet/admin/admin.strings.js b/loleaflet/admin/admin.strings.js
index 492245421..2490a82ae 100644
--- a/loleaflet/admin/admin.strings.js
+++ b/loleaflet/admin/admin.strings.js
@@ -2,7 +2,7 @@
/* Stringtable for Admin Console User Interface */
var l10nstrings = {};
-l10nstrings.strProductName = 'LibreOffice Online';
+l10nstrings.strProductName = 'LibreOffice Online Personal';
l10nstrings.strAdminConsole = _('Admin console');
l10nstrings.strSettings = _('Settings');
l10nstrings.strOverview = _('Overview');
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index a596ca476..79c4ce2e7 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -225,6 +225,7 @@ m4_ifelse(MOBILEAPP,[true],
<div id="lokit-version"></div>
m4_ifelse(MOBILEAPP,[],[<div id="os-info"
style="text-align:center"></div>])
<div id="slow-proxy"></div>
+ <div id="personal"></div>
<p>Copyright © _YEAR_, VENDOR.</p>
</div>
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 354175074..640fe00dc 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -225,7 +225,7 @@ L.Map.include({
if (window.ThisIsAMobileApp) {
productName = window.MobileAppName;
} else {
- productName = (typeof brandProductName !==
'undefined') ? brandProductName : 'LibreOffice Online';
+ productName = (typeof brandProductName !==
'undefined') ? brandProductName : 'LibreOffice Online Personal';
}
vex.open({
unsafeContent: data,
@@ -489,7 +489,7 @@ L.Map.include({
if (window.ThisIsAMobileApp) {
productName = window.MobileAppName;
} else {
- productName = (typeof brandProductName !== 'undefined')
? brandProductName : 'LibreOffice Online';
+ productName = (typeof brandProductName !== 'undefined')
? brandProductName : 'LibreOffice Online Personal';
}
var productURL = (typeof brandProductURL !== 'undefined') ?
brandProductURL : 'https://libreoffice.org';
content.find('#product-name').text(productName);
@@ -505,6 +505,9 @@ L.Map.include({
if (window.socketProxy)
content.find('#slow-proxy').text(_('"Slow Proxy"'));
+ if (typeof brandProductName === 'undefined')
+ content.find('#personal').text(_('The Personal edition
is supported by volunteers and intended for individual use.'));
+
var w;
var iw = window.innerWidth;
if (iw < 768) {
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index c3798a774..35c7ceb15 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -58,7 +58,7 @@ L.Socket = L.Class.extend({
if (isIE11)
msgHint = _('IE11 has reached its
maximum number of connections. Please see this document to increase this limit
if needed:
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections');
- this._map.fire('error', {msg: _('Oops, there is
a problem connecting to LibreOffice Online : ').replace('LibreOffice Online',
(typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice
Online')) + e + msgHint, 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 Personal')) + e + msgHint, cmd: 'socket', kind: 'failed', id: 3});
return;
}
}
@@ -701,7 +701,7 @@ L.Socket = L.Class.extend({
textMsg = textMsg.replace(/{docs}/g,
command.params[0]);
textMsg = textMsg.replace(/{connections}/g,
command.params[1]);
textMsg = textMsg.replace(/{productname}/g,
(typeof brandProductName !== 'undefined' ?
- brandProductName : 'LibreOffice
Online'));
+ brandProductName : 'LibreOffice
Online Personal'));
var brandFAQURL = (typeof brandProductFAQURL
!== 'undefined') ?
brandProductFAQURL :
'https://hub.libreoffice.org/professional-online-support';
this._map.fire('infobar',
diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js
b/loleaflet/src/layer/marker/ProgressOverlay.js
index aeebfe495..9931a1b26 100644
--- a/loleaflet/src/layer/marker/ProgressOverlay.js
+++ b/loleaflet/src/layer/marker/ProgressOverlay.js
@@ -53,7 +53,7 @@ L.ProgressOverlay = L.Layer.extend({
this._spinner = L.DomUtil.create('div',
'leaflet-progress-spinner', this._container);
this._spinnerCanvas = L.DomUtil.create('canvas',
'leaflet-progress-spinner-canvas', this._spinner);
- var productName = (typeof brandProductName !== 'undefined') ?
brandProductName : 'LibreOffice Online';
+ var productName = (typeof brandProductName !== 'undefined') ?
brandProductName : 'LibreOffice Online Personal';
this._brandLabel = L.DomUtil.create('div',
'leaflet-progress-label', this._container);
this._brandLabel.innerHTML = productName;
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index c7b604083..39f5f6f10 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -807,7 +807,7 @@ L.Clipboard = L.Class.extend({
},
_substProductName: function (msg) {
- var productName = (typeof brandProductName !== 'undefined') ?
brandProductName : 'LibreOffice Online';
+ var productName = (typeof brandProductName !== 'undefined') ?
brandProductName : 'LibreOffice Online Personal';
return msg.replace('%productName', productName);
},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
