Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

v5.3.2

Browse source
This commit is contained in:
Alexey Golubev 2019-06-21 18:13:38 +03:00
parent b8ecbaf735 d1407d6521
commit 033ee0fce9
31 changed files with 259 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/api/documents/api.js
View file

@ -124,7 +124,8 @@
help: true,
compactHeader: false,
toolbarNoTabs: false,
toolbarHideFileName: false
toolbarHideFileName: false,
reviewDisplay: 'original'
},
plugins: {
autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'],

15
apps/common/main/lib/controller/Chat.js
View file

@ -122,17 +122,7 @@ define([
this._isCoAuthoringStopped = true;
this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('api:disconnect');
/*
setTimeout(_.bind(function(){
Common.UI.alert({
closable: false,
title: this.notcriticalErrorTitle,
msg: this.textUserLimit,
iconCls: 'warn',
buttons: ['ok']
});
}, this), 100);
*/
return;
}
}
@ -225,7 +215,6 @@ define([
}
},
notcriticalErrorTitle: 'Warning',
textUserLimit: 'You are using ONLYOFFICE Editors free version.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Editors Pro version.<br><a href=\"http:\/\/www.onlyoffice.com\" target=\"_blank\">Read more</a>'
notcriticalErrorTitle: 'Warning'
}, Common.Controllers.Chat || {}));
});

8
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -671,7 +671,13 @@ define([
});
} else if (config.canViewReview) {
config.canViewReview = me.api.asc_HaveRevisionsChanges(true); // check revisions from all users
config.canViewReview && me.turnDisplayMode(config.isRestrictedEdit ? 'markup' : Common.localStorage.getItem(me.view.appPrefix + "review-mode") || 'original'); // load display mode only in viewer
if (config.canViewReview) {
var val = Common.localStorage.getItem(me.view.appPrefix + "review-mode");
if (val===null)
val = me.appConfig.customization && /^(original|final|markup)$/i.test(me.appConfig.customization.reviewDisplay) ? me.appConfig.customization.reviewDisplay.toLocaleLowerCase() : 'original';
me.turnDisplayMode(config.isRestrictedEdit ? 'markup' : val); // load display mode only in viewer
me.view.turnDisplayMode(config.isRestrictedEdit ? 'markup' : val);
}
}
if (me.view && me.view.btnChat) {

23
apps/common/main/lib/view/About.js
View file

@ -53,10 +53,6 @@ define([
Common.UI.BaseView.prototype.initialize.call(this,arguments);
this.txtVersionNum = '{{PRODUCT_VERSION}}';
this.txtAscMail = 'support@onlyoffice.com';
this.txtAscTelNum = '+371 660-16425';
this.txtAscUrl = 'www.onlyoffice.com';
this.txtAscName = 'Ascensio System SIA';
this.template = _.template([
'<table id="id-about-licensor-logo" cols="1" style="width: 100%; margin-top: 20px;">',
@ -72,29 +68,29 @@ define([
'</table>',
'<table id="id-about-licensor-info" cols="3" style="width: 100%;" class="margin-bottom">',
'<tr>',
'<td colspan="3" align="center" style="padding: 20px 0 10px 0;"><label class="asc-about-companyname">' + this.txtAscName + '</label></td>',
'<td colspan="3" align="center" style="padding: 20px 0 10px 0;"><label class="asc-about-companyname"><%= publishername %></label></td>',
'</tr>',
'<tr>',
'<td colspan="3" align="center" class="padding-small">',
'<label class="asc-about-desc-name">' + this.txtAddress + '</label>',
'<label class="asc-about-desc">' + "20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050" + '</label>',
'<label class="asc-about-desc"><%= publisheraddr %></label>',
'</td>',
'</tr>',
'<tr>',
'<td colspan="3" align="center" class="padding-small">',
'<label class="asc-about-desc-name">' + this.txtMail + '</label>',
'<a href="mailto:'+ this.txtAscMail +'">' + this.txtAscMail + '</a>',
'<a href="mailto:<%= supportemail %>"><%= supportemail %></a>',
'</td>',
'</tr>',
'<tr>',
'<td colspan="3" align="center" class="padding-small">',
'<label class="asc-about-desc-name">' + this.txtTel + '</label>',
'<label class="asc-about-desc">' + this.txtAscTelNum + '</label>',
'<label class="asc-about-desc"><%= phonenum %></label>',
'</td>',
'</tr>',
'<tr>',
'<td colspan="3" align="center">',
'<a href="http:\/\/'+ this.txtAscUrl +'" target="_blank">' + this.txtAscUrl + '</a>',
'<a href="<%= publisherurl %>" target="_blank"><% print(publisherurl.replace(/https?:\\/{2}/, "").replace(/\\/$/,"")) %></a>',
'</td>',
'</tr>',
'</table>',
@ -143,11 +139,11 @@ define([
'<td style="width:50%;"><div class="separator horizontal short"/></td>',
'</tr>',
'<tr>',
'<td colspan="3" align="center" style="padding: 9px 0 10px;"><label class="asc-about-companyname">' + this.txtAscName + '</label></td>',
'<td colspan="3" align="center" style="padding: 9px 0 10px;"><label class="asc-about-companyname"><%= publishername %></label></td>',
'</tr>',
'<tr>',
'<td colspan="3" align="center">',
'<label class="asc-about-desc">' + this.txtAscUrl + '</label>',
'<label class="asc-about-desc"><% print(publisherurl.replace(/https?:\\/{2}/, "").replace(/\\/$/,"")) %></label>',
'</td>',
'</tr>',
'</table>'
@ -158,6 +154,11 @@ define([
render: function() {
var el = $(this.el);
el.html(this.template({
publishername: '{{PUBLISHER_NAME}}',
publisheraddr: '{{PUBLISHER_ADDRESS}}',
publisherurl: '{{PUBLISHER_URL}}',
supportemail: '{{SUPPORT_EMAIL}}',
phonenum: '{{PUBLISHER_PHONE}}',
scope: this
}));

2
apps/common/main/lib/view/Header.js
View file

@ -215,7 +215,7 @@ define([
if ( me.logo )
me.logo.children(0).on('click', function (e) {
var _url = !!me.branding && !!me.branding.logo && (me.branding.logo.url!==undefined) ?
me.branding.logo.url : 'https://www.onlyoffice.com';
me.branding.logo.url : '{{PUBLISHER_URL}}';
if (_url) {
var newDocumentPage = window.open(_url);
newDocumentPage && newDocumentPage.focus();

74
apps/common/main/lib/view/ReviewChanges.js
View file

@ -209,14 +209,50 @@ define([
caption: this.txtNext
});
if (!this.appConfig.isRestrictedEdit) // hide Display mode option for fillForms and commenting mode
if (!this.appConfig.isRestrictedEdit) {// hide Display mode option for fillForms and commenting mode
var menuTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><div><%= caption %></div>' +
'<% if (options.description !== null) { %><label style="display: block;color: #a5a5a5;cursor: pointer;white-space: normal;"><%= options.description %></label>' +
'<% } %></a>');
this.btnReviewView = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-ic-reviewview',
caption: this.txtView,
menu: true
menu: new Common.UI.Menu({
cls: 'ppm-toolbar',
items: [
{
caption: this.txtMarkupCap,
checkable: true,
toggleGroup: 'menuReviewView',
checked: true,
value: 'markup',
template: menuTemplate,
description: this.txtMarkup
},
{
caption: this.txtFinalCap,
checkable: true,
toggleGroup: 'menuReviewView',
checked: false,
template: menuTemplate,
description: this.txtFinal,
value: 'final'
},
{
caption: this.txtOriginalCap,
checkable: true,
toggleGroup: 'menuReviewView',
checked: false,
template: menuTemplate,
description: this.txtOriginal,
value: 'original'
}
]
})
});
}
}
if (!!this.appConfig.sharingSettingsUrl && this.appConfig.sharingSettingsUrl.length && this._readonlyRights!==true) {
this.btnSharing = new Common.UI.Button({
@ -319,41 +355,7 @@ define([
me.btnPrev.updateHint(me.hintPrev);
me.btnNext.updateHint(me.hintNext);
me.btnReviewView && me.btnReviewView.setMenu(
new Common.UI.Menu({
cls: 'ppm-toolbar',
items: [
{
caption: me.txtMarkupCap,
checkable: true,
toggleGroup: 'menuReviewView',
checked: true,
value: 'markup',
template: menuTemplate,
description: me.txtMarkup
},
{
caption: me.txtFinalCap,
checkable: true,
toggleGroup: 'menuReviewView',
checked: false,
template: menuTemplate,
description: me.txtFinal,
value: 'final'
},
{
caption: me.txtOriginalCap,
checkable: true,
toggleGroup: 'menuReviewView',
checked: false,
template: menuTemplate,
description: me.txtOriginal,
value: 'original'
}
]
}));
me.btnReviewView && me.btnReviewView.updateHint(me.tipReviewView);
!me.appConfig.canReview && me.turnDisplayMode(Common.localStorage.getItem(me.appPrefix + "review-mode") || 'original');
}
me.btnSharing && me.btnSharing.updateHint(me.tipSharing);
me.btnHistory && me.btnHistory.updateHint(me.tipHistory);

2
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -44,7 +44,7 @@ var ApplicationController = new(function(){
// Initialize analytics
// -------------------------
// Common.Analytics.initialize('UA-12442749-13', 'Embedded ONLYOFFICE Document');
// Common.Analytics.initialize('UA-12442749-13', 'Embedded Document Editor');
// Check browser

26
apps/documenteditor/main/app/controller/Main.js
View file

@ -315,6 +315,11 @@ define([
}
});
}
me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}';
me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}');
me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}');
},
loadConfig: function(data) {
@ -1081,9 +1086,9 @@ define([
callback: function(btn) {
Common.localStorage.setItem("de-license-warning", now);
if (btn == 'buynow')
window.open('https://www.onlyoffice.com', "_blank");
window.open('{{PUBLISHER_URL}}', "_blank");
else if (btn == 'contact')
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
});
}
@ -1096,7 +1101,7 @@ define([
primary: 'contact',
callback: function(btn) {
if (btn == 'contact')
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
});
}
@ -1190,10 +1195,6 @@ define([
this.appOptions.canBranding = params.asc_getCustomization();
if (this.appOptions.canBranding)
appHeader.setBranding(this.editorConfig.customization);
else if (typeof this.editorConfig.customization == 'object') {
this.editorConfig.customization.compactHeader = this.editorConfig.customization.toolbarNoTabs =
this.editorConfig.customization.toolbarHideFileName = false;
}
this.appOptions.canRename && appHeader.setCanRename(true);
@ -1438,7 +1439,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer;
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
config.closable = false;
break;
@ -2247,7 +2248,6 @@ define([
},
leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.',
defaultTitleText: 'ONLYOFFICE Document Editor',
criticalErrorTitle: 'Error',
notcriticalErrorTitle: 'Warning',
errorDefaultMessage: 'Error code: %1',
@ -2331,12 +2331,12 @@ define([
sendMergeText: 'Sending Merge...',
txtArt: 'Your text here',
errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>',
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
textStrict: 'Strict mode',
txtErrorLoadHistory: 'Loading history failed',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE connection limitation',
textNoLicenseTitle: '%1 connection limitation',
textContactUs: 'Contact sales',
errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.',
warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
@ -2387,8 +2387,8 @@ define([
txtNoTableOfContents: "No table of contents entries found.",
txtTableOfContents: "Table of Contents",
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnNoLicense: 'This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',

36
apps/documenteditor/main/app/view/FootnoteTip.js
View file

@ -2,24 +2,32 @@
*
* (c) Copyright Ascensio System SIA 2010-2019
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/

2
apps/documenteditor/main/app/view/LeftMenu.js
View file

@ -79,7 +79,7 @@ define([
var config = this.mode.customization;
config && !!config.feedback && !!config.feedback.url ?
window.open(config.feedback.url) :
window.open('http://support.onlyoffice.com');
window.open('{{SUPPORT_URL}}');
}
}
},

12
apps/documenteditor/main/locale/en.json
View file

@ -1,7 +1,7 @@
{
"Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
"Common.Controllers.Chat.textEnterMessage": "Enter your message here",
"Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
"del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
"Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous",
"Common.Controllers.ExternalDiagramEditor.textClose": "Close",
"Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",
@ -334,7 +334,7 @@
"DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"DE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",
"DE.Controllers.Main.criticalErrorTitle": "Error",
"DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
"del_DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
"DE.Controllers.Main.downloadErrorText": "Download failed.",
"DE.Controllers.Main.downloadMergeText": "Downloading...",
"DE.Controllers.Main.downloadMergeTitle": "Downloading",
@ -343,7 +343,7 @@
"DE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
"DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
"DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
"DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>",
"DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
"DE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
"DE.Controllers.Main.errorDataRange": "Incorrect data range.",
@ -410,7 +410,7 @@
"DE.Controllers.Main.textContactUs": "Contact sales",
"DE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
"DE.Controllers.Main.textLoadingDocument": "Loading document",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation",
"DE.Controllers.Main.textNoLicenseTitle": "%1 connection limitation",
"DE.Controllers.Main.textPaidFeature": "Paid feature",
"DE.Controllers.Main.textShape": "Shape",
"DE.Controllers.Main.textStrict": "Strict mode",
@ -662,8 +662,8 @@
"DE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Navigation.txtBeginning": "Beginning of document",
"DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",

2
apps/documenteditor/mobile/app.js
View file

@ -181,7 +181,7 @@ require([
//Store Framework7 initialized instance for easy access
window.uiApp = new Framework7({
// Default title for modals
modalTitle: 'ONLYOFFICE',
modalTitle: '{{MOBILE_MODAL_TITLE}}',
// Enable tap hold events
tapHold: true,

24
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -183,6 +183,11 @@ define([
});
Common.Gateway.internalMessage('listenHardBack');
}
me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}';
me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}');
me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}');
},
loadConfig: function(data) {
@ -613,13 +618,13 @@ define([
text: me.textBuyNow,
bold: true,
onClick: function() {
window.open('https://www.onlyoffice.com', "_blank");
window.open('{{PUBLISHER_URL}}', "_blank");
}
},
{
text: me.textContactUs,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
}];
}
@ -649,7 +654,7 @@ define([
text: me.textContactUs,
bold: true,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
},
{ text: me.textClose }]
@ -788,7 +793,7 @@ define([
if (msg && msg.msg) {
msg.msg = (msg.msg).toString();
uiApp.addNotification({
title: 'ONLYOFFICE',
title: uiApp.params.modalTitle,
message: [msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]
});
@ -908,7 +913,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer;
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
break;
case Asc.c_oAscError.ID.UplImageUrl:
@ -1275,7 +1280,6 @@ define([
},
leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
defaultTitleText: 'ONLYOFFICE Document Editor',
criticalErrorTitle: 'Error',
notcriticalErrorTitle: 'Warning',
errorDefaultMessage: 'Error code: %1',
@ -1343,10 +1347,10 @@ define([
sendMergeTitle: 'Sending Merge',
sendMergeText: 'Sending Merge...',
txtArt: 'Your text here',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
textNoLicenseTitle: '%1 open source version',
textContactUs: 'Contact sales',
errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.',
warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
@ -1388,8 +1392,8 @@ define([
txtHeader: "Header",
txtFooter: "Footer",
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnNoLicense: 'This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',

2
apps/documenteditor/mobile/app/controller/Settings.js
View file

@ -396,7 +396,7 @@ define([
},
onShowHelp: function () {
window.open('http://support.onlyoffice.com/', "_blank");
window.open('{{SUPPORT_URL}}', "_blank");
this.hideModal();
},

10
apps/documenteditor/mobile/locale/en.json
View file

@ -54,7 +54,7 @@
"DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"DE.Controllers.Main.criticalErrorExtText": "Press 'OK' to return to document list.",
"DE.Controllers.Main.criticalErrorTitle": "Error",
"DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
"del_DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
"DE.Controllers.Main.downloadErrorText": "Download failed.",
"DE.Controllers.Main.downloadMergeText": "Downloading...",
"DE.Controllers.Main.downloadMergeTitle": "Downloading",
@ -63,7 +63,7 @@
"DE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
"DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.",
"DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
"DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>",
"DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
"DE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
"DE.Controllers.Main.errorDataRange": "Incorrect data range.",
@ -120,7 +120,7 @@
"DE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
"DE.Controllers.Main.textDone": "Done",
"DE.Controllers.Main.textLoadingDocument": "Loading document",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation",
"DE.Controllers.Main.textNoLicenseTitle": "%1 connection limitation",
"DE.Controllers.Main.textOK": "OK",
"DE.Controllers.Main.textPaidFeature": "Paid feature",
"DE.Controllers.Main.textPassword": "Password",
@ -167,8 +167,8 @@
"DE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicense": "This version of %1 Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Search.textNoTextFound": "Text not Found",
"DE.Controllers.Search.textReplaceAll": "Replace All",

2
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -45,7 +45,7 @@ var ApplicationController = new(function(){
// Initialize analytics
// -------------------------
// Common.Analytics.initialize('UA-12442749-13', 'Embedded ONLYOFFICE Presentation');
// Common.Analytics.initialize('UA-12442749-13', 'Embedded Presentation Editor');
// Check browser

26
apps/presentationeditor/main/app/controller/Main.js
View file

@ -285,6 +285,11 @@ define([
}
});
}
me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}';
me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}');
me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}');
},
loadConfig: function(data) {
@ -825,9 +830,9 @@ define([
callback: function(btn) {
Common.localStorage.setItem("pe-license-warning", now);
if (btn == 'buynow')
window.open('https://www.onlyoffice.com', "_blank");
window.open('{{PUBLISHER_URL}}', "_blank");
else if (btn == 'contact')
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
});
}
@ -840,7 +845,7 @@ define([
primary: 'contact',
callback: function(btn) {
if (btn == 'contact')
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
});
}
@ -911,10 +916,6 @@ define([
this.appOptions.canBranding = params.asc_getCustomization();
if (this.appOptions.canBranding)
appHeader.setBranding(this.editorConfig.customization);
else if (typeof this.editorConfig.customization == 'object') {
this.editorConfig.customization.compactHeader = this.editorConfig.customization.toolbarNoTabs =
this.editorConfig.customization.toolbarHideFileName = false;
}
this.appOptions.canRename && appHeader.setCanRename(true);
@ -1149,7 +1150,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer;
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
config.closable = false;
break;
@ -1962,7 +1963,6 @@ define([
// Translation
leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.',
defaultTitleText: 'ONLYOFFICE Presentation Editor',
criticalErrorTitle: 'Error',
notcriticalErrorTitle: 'Warning',
errorDefaultMessage: 'Error code: %1',
@ -2075,11 +2075,11 @@ define([
txtSeries: 'Seria',
txtArt: 'Your text here',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>',
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
textStrict: 'Strict mode',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
textNoLicenseTitle: '%1 open source version',
textContactUs: 'Contact sales',
errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.',
warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
@ -2125,8 +2125,8 @@ define([
txtTheme_dotted: 'Dotted',
txtTheme_corner: 'Corner',
txtTheme_turtle: 'Turtle',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnNoLicense: 'This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',

2
apps/presentationeditor/main/app/view/LeftMenu.js
View file

@ -76,7 +76,7 @@ define([
var config = this.mode.customization;
config && !!config.feedback && !!config.feedback.url ?
window.open(config.feedback.url) :
window.open('http://support.onlyoffice.com');
window.open('{{SUPPORT_URL}}');
}
}
},

12
apps/presentationeditor/main/locale/en.json
View file

@ -1,7 +1,7 @@
{
"Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
"Common.Controllers.Chat.textEnterMessage": "Enter your message here",
"Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
"del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
"Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous",
"Common.Controllers.ExternalDiagramEditor.textClose": "Close",
"Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",
@ -245,14 +245,14 @@
"PE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"PE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",
"PE.Controllers.Main.criticalErrorTitle": "Error",
"PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
"del_PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
"PE.Controllers.Main.downloadErrorText": "Download failed.",
"PE.Controllers.Main.downloadTextText": "Downloading presentation...",
"PE.Controllers.Main.downloadTitleText": "Downloading Presentation",
"PE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
"PE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
"PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
"PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>",
"PE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
"PE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
"PE.Controllers.Main.errorDataRange": "Incorrect data range.",
@ -315,7 +315,7 @@
"PE.Controllers.Main.textContactUs": "Contact sales",
"PE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
"PE.Controllers.Main.textLoadingDocument": "Loading presentation",
"PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation",
"PE.Controllers.Main.textNoLicenseTitle": "%1 connection limitation",
"PE.Controllers.Main.textPaidFeature": "Paid feature",
"PE.Controllers.Main.textShape": "Shape",
"PE.Controllers.Main.textStrict": "Strict mode",
@ -584,8 +584,8 @@
"PE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"PE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",

2
apps/presentationeditor/mobile/app.js
View file

@ -179,7 +179,7 @@ require([
//Store Framework7 initialized instance for easy access
window.uiApp = new Framework7({
// Default title for modals
modalTitle: 'ONLYOFFICE',
modalTitle: '{{MOBILE_MODAL_TITLE}}',
// If it is webapp, we can enable hash navigation:
// pushState: false,

23
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -184,6 +184,10 @@ define([
}
me.initNames();
me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}';
me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}');
me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}');
},
loadConfig: function(data) {
@ -568,13 +572,13 @@ define([
text: me.textBuyNow,
bold: true,
onClick: function() {
window.open('https://www.onlyoffice.com', "_blank");
window.open('{{PUBLISHER_URL}}', "_blank");
}
},
{
text: me.textContactUs,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
}];
}
@ -604,7 +608,7 @@ define([
text: me.textContactUs,
bold: true,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
},
{ text: me.textClose }]
@ -742,7 +746,7 @@ define([
if (msg && msg.msg) {
msg.msg = (msg.msg).toString();
uiApp.addNotification({
title: 'ONLYOFFICE',
title: uiApp.params.modalTitle,
message: [msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]
});
@ -854,7 +858,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer;
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
break;
case Asc.c_oAscError.ID.UplImageUrl:
@ -1217,7 +1221,6 @@ define([
// Translation
leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
defaultTitleText: 'ONLYOFFICE Presentation Editor',
criticalErrorTitle: 'Error',
notcriticalErrorTitle: 'Warning',
errorDefaultMessage: 'Error code: %1',
@ -1330,10 +1333,10 @@ define([
txtSeries: 'Seria',
txtArt: 'Your text here',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>',
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
textNoLicenseTitle: '%1 open source version',
textContactUs: 'Contact sales',
errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.',
warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
@ -1367,8 +1370,8 @@ define([
txtSlideSubtitle: 'Slide subtitle',
txtSlideTitle: 'Slide title',
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnNoLicense: 'This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',

2
apps/presentationeditor/mobile/app/view/Settings.js
View file

@ -180,7 +180,7 @@ define([
},
showHelp: function () {
window.open('http://support.onlyoffice.com/', "_blank");
window.open('{{SUPPORT_URL}}', "_blank");
PE.getController('Settings').hideModal();
},

2
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -47,7 +47,7 @@ var ApplicationController = new(function(){
// Initialize analytics
// -------------------------
// Common.Analytics.initialize('UA-12442749-13', 'Embedded ONLYOFFICE Spreadsheet');
// Common.Analytics.initialize('UA-12442749-13', 'Embedded Spreadsheet Editor');
// Check browser

26
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -286,6 +286,11 @@ define([
}, this)
}
});
me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}';
me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}');
me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}');
},
loadConfig: function(data) {
@ -852,9 +857,9 @@ define([
callback: function(btn) {
Common.localStorage.setItem("sse-license-warning", now);
if (btn == 'buynow')
window.open('https://www.onlyoffice.com', "_blank");
window.open('{{PUBLISHER_URL}}', "_blank");
else if (btn == 'contact')
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
});
}
@ -867,7 +872,7 @@ define([
primary: 'contact',
callback: function(btn) {
if (btn == 'contact')
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
});
}
@ -926,10 +931,6 @@ define([
this.appOptions.canBranding = params.asc_getCustomization();
if (this.appOptions.canBranding)
this.headerView.setBranding(this.editorConfig.customization);
else if (typeof this.editorConfig.customization == 'object') {
this.editorConfig.customization.compactHeader = this.editorConfig.customization.toolbarNoTabs =
this.editorConfig.customization.toolbarHideFileName = false;
}
this.appOptions.canRename && this.headerView.setCanRename(true);
} else
@ -1300,7 +1301,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer;
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
config.closable = false;
break;
@ -2260,21 +2261,20 @@ define([
textShape: 'Shape',
errorFillRange: 'Could not fill the selected range of cells.<br>All the merged cells need to be the same size.',
errorUpdateVersion: 'The file version has been changed. The page will be reloaded.',
defaultTitleText: 'ONLYOFFICE Spreadsheet Editor',
errorUserDrop: 'The file cannot be accessed right now.',
txtArt: 'Your text here',
errorInvalidRef: 'Enter a correct name for the selection or a valid reference to go to.',
errorCreateDefName: 'The existing named ranges cannot be edited and the new ones cannot be created<br>at the moment as some of them are being edited.',
errorPasteMaxRange: 'The copy and paste area does not match. Please select an area with the same size or click the first cell in a row to paste the copied cells.',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>',
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
errorLockedWorksheetRename: 'The sheet cannot be renamed at the moment as it is being renamed by another user',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
textStrict: 'Strict mode',
errorOpenWarning: 'The length of one of the formulas in the file exceeded<br>the allowed number of characters and it was removed.',
errorFrmlWrongReferences: 'The function refers to a sheet that does not exist.<br>Please check the data and try again.',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
textNoLicenseTitle: '%1 open source version',
textContactUs: 'Contact sales',
confirmPutMergeRange: 'The source data contains merged cells.<br>They will be unmerged before they are pasted into the table.',
errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.',
@ -2317,8 +2317,8 @@ define([
txtStyle_Comma: 'Comma',
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
errorMaxPoints: "The maximum number of points in series per chart is 4096.",
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnNoLicense: 'This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of %1 Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',

2
apps/spreadsheeteditor/main/app/view/LeftMenu.js
View file

@ -67,7 +67,7 @@ define([
var config = this.mode.customization;
config && !!config.feedback && !!config.feedback.url ?
window.open(config.feedback.url) :
window.open('http://support.onlyoffice.com');
window.open('{{SUPPORT_URL}}');
}
}
},

12
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2,7 +2,7 @@
"cancelButtonText": "Cancel",
"Common.Controllers.Chat.notcriticalErrorTitle": "Warning",
"Common.Controllers.Chat.textEnterMessage": "Enter your message here",
"Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
"del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.<br>Only two users can co-edit the document simultaneously.<br>Want more? Consider buying ONLYOFFICE Enterprise Edition.<br><a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">Read more</a>",
"Common.UI.ComboBorderSize.txtNoBorders": "No borders",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles",
@ -392,7 +392,7 @@
"SSE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"SSE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",
"SSE.Controllers.Main.criticalErrorTitle": "Error",
"SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor",
"del_SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor",
"SSE.Controllers.Main.downloadErrorText": "Download failed.",
"SSE.Controllers.Main.downloadTextText": "Downloading spreadsheet...",
"SSE.Controllers.Main.downloadTitleText": "Downloading Spreadsheet",
@ -405,7 +405,7 @@
"SSE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"SSE.Controllers.Main.errorChangeArray": "You cannot change part of an array.",
"SSE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
"SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
"SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>",
"SSE.Controllers.Main.errorCopyMultiselectArea": "This command cannot be used with multiple selections.<br>Select a single range and try again.",
"SSE.Controllers.Main.errorCountArg": "An error in the entered formula.<br>Incorrect number of arguments is used.",
"SSE.Controllers.Main.errorCountArgExceed": "An error in the entered formula.<br>Number of arguments is exceeded.",
@ -489,7 +489,7 @@
"SSE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
"SSE.Controllers.Main.textLoadingDocument": "Loading spreadsheet",
"SSE.Controllers.Main.textNo": "No",
"SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation",
"SSE.Controllers.Main.textNoLicenseTitle": "%1 connection limitation",
"SSE.Controllers.Main.textPaidFeature": "Paid feature",
"SSE.Controllers.Main.textPleaseWait": "The operation might take more time than expected. Please wait...",
"SSE.Controllers.Main.textRecalcFormulas": "Calculating formulas...",
@ -723,8 +723,8 @@
"SSE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"SSE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"SSE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textWarning": "Warning",

2
apps/spreadsheeteditor/mobile/app.js
View file

@ -164,7 +164,7 @@ require([
//Store Framework7 initialized instance for easy access
window.uiApp = new Framework7({
// Default title for modals
modalTitle: 'ONLYOFFICE',
modalTitle: '{{MOBILE_MODAL_TITLE}}',
// Enable tap hold events
tapHold: true,

24
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -188,6 +188,11 @@ define([
});
Common.Gateway.internalMessage('listenHardBack');
}
me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}';
me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}');
me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}');
me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}');
},
loadConfig: function(data) {
@ -582,13 +587,13 @@ define([
text: me.textBuyNow,
bold: true,
onClick: function() {
window.open('https://www.onlyoffice.com', "_blank");
window.open('{{PUBLISHER_URL}}', "_blank");
}
},
{
text: me.textContactUs,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
}];
}
@ -618,7 +623,7 @@ define([
text: me.textContactUs,
bold: true,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
window.open('mailto:{{SALES_EMAIL}}', "_blank");
}
},
{ text: me.textClose }]
@ -747,7 +752,7 @@ define([
if (msg && msg.msg) {
msg.msg = (msg.msg).toString();
uiApp.addNotification({
title: 'ONLYOFFICE',
title: uiApp.params.modalTitle,
message: [msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]
});
@ -950,7 +955,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
config.msg = this.errorConnectToServer;
config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
break;
case Asc.c_oAscError.ID.LockedWorksheetRename:
@ -1390,7 +1395,6 @@ define([
},
leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' to await the autosave of the document. Click \'Leave this Page\' to discard all the unsaved changes.',
defaultTitleText: 'ONLYOFFICE Spreadsheet Editor',
criticalErrorTitle: 'Error',
notcriticalErrorTitle: 'Warning',
errorDefaultMessage: 'Error code: %1',
@ -1470,12 +1474,12 @@ define([
sendMergeText: 'Sending Merge...',
txtArt: 'Your text here',
errorConnectToServer: ' The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the \'OK\' button, you will be prompted to download the document.<br><br>' +
'Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>',
'Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>',
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.',
textStrict: 'Strict mode',
txtErrorLoadHistory: 'Loading history failed',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
textNoLicenseTitle: '%1 open source version',
textContactUs: 'Contact sales',
errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.',
warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
@ -1530,8 +1534,8 @@ define([
txtStyle_Comma: 'Comma',
errorMaxPoints: 'The maximum number of points in series per chart is 4096.',
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnNoLicense: 'This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',

2
apps/spreadsheeteditor/mobile/app/controller/Settings.js
View file

@ -68,7 +68,7 @@ define([
'Settings': {
'page:show' : this.onPageShow
, 'settings:showhelp': function(e) {
window.open('http://support.onlyoffice.com/', "_blank");
window.open('{{SUPPORT_URL}}', "_blank");
this.hideModal();
}
}

10
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -102,7 +102,7 @@
"SSE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"SSE.Controllers.Main.criticalErrorExtText": "Press 'OK' to return to document list.",
"SSE.Controllers.Main.criticalErrorTitle": "Error",
"SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor",
"del_SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor",
"SSE.Controllers.Main.downloadErrorText": "Download failed.",
"SSE.Controllers.Main.downloadMergeText": "Downloading...",
"SSE.Controllers.Main.downloadMergeTitle": "Downloading",
@ -117,7 +117,7 @@
"SSE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"SSE.Controllers.Main.errorChangeArray": "You cannot change part of an array.",
"SSE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
"SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
"SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"%1\" target=\"_blank\">here</a>",
"SSE.Controllers.Main.errorCopyMultiselectArea": "This command cannot be used with multiple selections.<br>Select a single range and try again.",
"SSE.Controllers.Main.errorCountArg": "An error in the entered formula.<br>Incorrect number of arguments is used.",
"SSE.Controllers.Main.errorCountArgExceed": "An error in the entered formula.<br>Number of arguments is exceeded.",
@ -203,7 +203,7 @@
"SSE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
"SSE.Controllers.Main.textDone": "Done",
"SSE.Controllers.Main.textLoadingDocument": "Loading spreadsheet",
"SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation",
"SSE.Controllers.Main.textNoLicenseTitle": "%1 connection limitation",
"SSE.Controllers.Main.textOK": "OK",
"SSE.Controllers.Main.textPaidFeature": "Paid feature",
"SSE.Controllers.Main.textPassword": "Password",
@ -269,8 +269,8 @@
"SSE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"SSE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"SSE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Search.textNoTextFound": "Text not found",
"SSE.Controllers.Search.textReplaceAll": "Replace All",

64
build/Gruntfile.js
View file

@ -12,6 +12,50 @@ module.exports = function(grunt) {
' * Version: <%= pkg.version %> (build:<%= pkg.build %>)\n' +
' */\n';
var jsreplacements = [
{
from: /\{\{SUPPORT_EMAIL\}\}/g,
to: process.env['SUPPORT_EMAIL'] || 'support@onlyoffice.com'
},{
from: /\{\{SUPPORT_URL\}\}/g,
to: process.env['SUPPORT_URL'] || 'https://support.onlyoffice.com'
},{
from: /\{\{SALES_EMAIL\}\}/g,
to: process.env['SALES_EMAIL'] || 'sales@onlyoffice.com'
},{
from: /\{\{PUBLISHER_URL\}\}/g,
to: process.env['PUBLISHER_URL'] || 'https://www.onlyoffice.com'
},{
from: /\{\{PUBLISHER_PHONE\}\}/,
to: process.env['PUBLISHER_PHONE'] || '+371 660-16425'
},{
from: /\{\{PUBLISHER_NAME\}\}/g,
to: process.env['PUBLISHER_NAME'] || 'Ascensio System SIA'
},{
from: /\{\{PUBLISHER_ADDRESS\}\}/,
to: process.env['PUBLISHER_ADDRESS'] || '20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050'
},{
from: /\{\{API_URL_EDITING_CALLBACK\}\}/,
to: process.env['API_URL_EDITING_CALLBACK'] || 'https://api.onlyoffice.com/editors/callback'
},{
from: /\{\{COMPANY_NAME\}\}/g,
to: process.env['COMPANY_NAME'] || 'ONLYOFFICE'
}, {
from: /\{\{APP_TITLE_TEXT\}\}/g,
to: process.env['APP_TITLE_TEXT'] || 'ONLYOFFICE'
}];
var helpreplacements = [
{
from: /\{\{COEDITING_DESKTOP\}\}/g,
to: process.env['COEDITING_DESKTOP'] || 'Подключиться к облаку'
},{
from: /\{\{PLUGIN_LINK\}\}/g,
to: process.env['PLUGIN_LINK'] || 'https://api.onlyoffice.com/plugin/basic'
},{
from: /\{\{PLUGIN_LINK_MACROS\}\}/g,
to: process.env['PLUGIN_LINK_MACROS'] || 'https://api.onlyoffice.com/plugin/macros'
}];
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-copy');
@ -189,16 +233,7 @@ module.exports = function(grunt) {
prepareHelp: {
src: ['<%= pkg.main.copy.help[0].dest %>/ru/**/*.htm*'],
overwrite: true,
replacements: [{
from: /\{\{COEDITING_DESKTOP\}\}/g,
to: 'Подключиться к облаку'
},{
from: /\{\{PLUGIN_LINK\}\}/g,
to: 'https://api.onlyoffice.com/plugin/basic'
},{
from: /\{\{PLUGIN_LINK_MACROS\}\}/g,
to: 'https://api.onlyoffice.com/plugin/macros'
}]
replacements: []
}
},
@ -260,6 +295,11 @@ module.exports = function(grunt) {
}
}
});
var replace = grunt.config.get('replace');
replace.writeVersion.replacements.push(...jsreplacements);
replace.prepareHelp.replacements.push(...helpreplacements);
grunt.config.set('replace', replace);
});
grunt.registerTask('deploy-reporter', function(){
@ -381,6 +421,10 @@ module.exports = function(grunt) {
}
}
});
var replace = grunt.config.get('replace');
replace.writeVersion.replacements.push(...jsreplacements);
grunt.config.set('replace', replace);
});
grunt.registerTask('embed-app-init', function() {