From a29ab8842852c5f9025c05a154cb73adca5a8ec0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 19 Aug 2021 20:58:59 +0300 Subject: [PATCH] For Bug 50233 --- apps/documenteditor/main/app/controller/Main.js | 7 ++++++- apps/documenteditor/main/locale/en.json | 1 + apps/presentationeditor/main/app/controller/Main.js | 9 +++++++-- apps/presentationeditor/main/locale/en.json | 1 + apps/spreadsheeteditor/main/app/controller/Main.js | 9 +++++++-- apps/spreadsheeteditor/main/locale/en.json | 1 + 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 2652d4d7d..9003abc89 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1734,6 +1734,10 @@ define([ config.msg = this.errorSubmit; break; + case Asc.c_oAscError.ID.LoadingFontError: + config.msg = this.errorLoadingFont; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2938,7 +2942,8 @@ define([ txtTableOfFigures: 'Table of figures', txtStyle_endnote_text: 'Endnote Text', txtTOCHeading: 'TOC Heading', - errorLang: 'The interface language is not loaded.
Please contact your Document Server administrator.' + errorLang: 'The interface language is not loaded.
Please contact your Document Server administrator.', + errorLoadingFont: 'Fonts are not loaded.
Please contact your Document Server administrator.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 1d65805c3..1d6153624 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -862,6 +862,7 @@ "DE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.", "DE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "DE.Controllers.Main.errorLoadingFont": "Fonts are not loaded.
Please contact your Document Server administrator.", "DE.Controllers.Navigation.txtBeginning": "Beginning of document", "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 081ca2880..e38599726 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1404,7 +1404,11 @@ define([ case Asc.c_oAscError.ID.Password: config.msg = this.errorSetPassword; break; - + + case Asc.c_oAscError.ID.LoadingFontError: + config.msg = this.errorLoadingFont; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2727,7 +2731,8 @@ define([ txtErrorLoadHistory: 'Loading history failed', leavePageTextOnClose: 'All unsaved changes in this document will be lost.
Click \'Cancel\' then \'Save\' to save them. Click \'OK\' to discard all the unsaved changes.', textTryUndoRedoWarn: 'The Undo/Redo functions are disabled for the Fast co-editing mode.', - txtNone: 'None' + txtNone: 'None', + errorLoadingFont: 'Fonts are not loaded.
Please contact your Document Server administrator.' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index ea8a32bb6..996eab3ff 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -736,6 +736,7 @@ "PE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.", "PE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "PE.Controllers.Main.errorLoadingFont": "Fonts are not loaded.
Please contact your Document Server administrator.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", "PE.Controllers.Toolbar.textAccent": "Accents", diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index e5da80f55..30efb9aa9 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1711,7 +1711,11 @@ define([ case Asc.c_oAscError.ID.UplDocumentFileCount: config.msg = this.uploadDocFileCountMessage; break; - + + case Asc.c_oAscError.ID.LoadingFontError: + config.msg = this.errorLoadingFont; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2990,7 +2994,8 @@ define([ errorLocationOrDataRangeError: 'The reference for the location or data range is not valid.', uploadDocSizeMessage: 'Maximum document size limit exceeded.', uploadDocExtMessage: 'Unknown document format.', - uploadDocFileCountMessage: 'No documents uploaded.' + uploadDocFileCountMessage: 'No documents uploaded.', + errorLoadingFont: 'Fonts are not loaded.
Please contact your Document Server administrator.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 61caf14f9..e0960baf3 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1006,6 +1006,7 @@ "SSE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.", "SSE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.errorLoadingFont": "Fonts are not loaded.
Please contact your Document Server administrator.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textFirstCol": "First column", "SSE.Controllers.Print.textFirstRow": "First row",