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, 8 insertions(+), 12 deletions(-)
New commits:
commit be7b0919db52c86aa15ffd54989d9a96d1ad86a6
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Jul 21 16:10:38 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jul 21 20:46:19 2020 +0200
Revert "default product name: LibreOffice Online Personal"
This reverts commit 160d3f587e648d6c6782bcc17595a0b89a29a94a.
Reason for revert:
https://blog.documentfoundation.org/blog/2020/07/20/update-on-marketing-and-communication-plans-for-the-libreoffice-7-x-series/
Change-Id: I5a8c017035a3bc9841d302f41769f974361e4ede
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99150
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 8f3c21c51..00cb4ac02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -509,7 +509,7 @@ AC_SUBST(ENABLE_ANDROIDAPP)
AM_CONDITIONAL([ENABLE_ANDROIDAPP], [test "$ENABLE_ANDROIDAPP" = "true"])
AC_SUBST(ANDROID_PACKAGE_NAME)
-APP_NAME="LibreOffice Online Personal"
+APP_NAME="LibreOffice Online"
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 7fb8590b7..7dea1cdd3 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 Personal';
+l10nstrings.strProductName = 'LibreOffice Online';
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 8952571f5..41f3458d8 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -225,7 +225,6 @@ 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 43baf9509..6798c620a 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -220,7 +220,7 @@ L.Map.include({
if (window.ThisIsAMobileApp) {
productName = window.MobileAppName;
} else {
- productName = (typeof brandProductName !==
'undefined') ? brandProductName : 'LibreOffice Online Personal';
+ productName = (typeof brandProductName !==
'undefined') ? brandProductName : 'LibreOffice Online';
}
vex.open({
unsafeContent: data,
@@ -476,7 +476,7 @@ L.Map.include({
if (window.ThisIsAMobileApp) {
productName = window.MobileAppName;
} else {
- productName = (typeof brandProductName !== 'undefined')
? brandProductName : 'LibreOffice Online Personal';
+ productName = (typeof brandProductName !== 'undefined')
? brandProductName : 'LibreOffice Online';
}
var productURL = (typeof brandProductURL !== 'undefined') ?
brandProductURL : 'https://libreoffice.org';
content.find('#product-name').text(productName);
@@ -492,9 +492,6 @@ 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 f6955ec76..9f48d3145 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 Personal')) + 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')) + e + msgHint, cmd: 'socket', kind: 'failed', id: 3});
return;
}
}
@@ -699,7 +699,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 Personal'));
+ brandProductName : 'LibreOffice
Online'));
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 9931a1b26..aeebfe495 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 Personal';
+ var productName = (typeof brandProductName !== 'undefined') ?
brandProductName : 'LibreOffice Online';
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 39f5f6f10..c7b604083 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 Personal';
+ var productName = (typeof brandProductName !== 'undefined') ?
brandProductName : 'LibreOffice Online';
return msg.replace('%productName', productName);
},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
