From 3dabc5a65cc8dcadeade9064ebe3a3c911e54db6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 14 Dec 2021 00:37:33 +0300 Subject: [PATCH] Show status message when connection is restored --- apps/documenteditor/main/app/controller/Main.js | 2 ++ apps/documenteditor/main/locale/en.json | 2 ++ apps/presentationeditor/main/app/controller/Main.js | 4 +++- apps/presentationeditor/main/locale/en.json | 2 ++ apps/spreadsheeteditor/main/app/controller/Main.js | 4 +++- apps/spreadsheeteditor/main/locale/en.json | 2 ++ 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 4679986c2..0ee85b0a6 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -943,6 +943,7 @@ define([ if ( id == Asc.c_oAscAsyncAction['Disconnect']) { this.disableEditing(false, true); this.getApplication().getController('Statusbar').hideDisconnectTip(); + this.getApplication().getController('Statusbar').setStatusCaption(this.textReconnect); } if ( type == Asc.c_oAscAsyncActionType.BlockInteraction && @@ -3076,6 +3077,7 @@ define([ txtStyle_endnote_text: 'Endnote Text', txtTOCHeading: 'TOC Heading', textDisconnect: 'Connection is lost', + textReconnect: 'Connection is restored', errorLang: 'The interface language is not loaded.
Please contact your Document Server administrator.', errorLoadingFont: 'Fonts are not loaded.
Please contact your Document Server administrator.' } diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index cc4539eeb..618be0bdf 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -884,6 +884,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.textReconnect": "Connection is restored", "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", @@ -891,6 +892,7 @@ "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled", "DE.Controllers.Statusbar.tipReview": "Track changes", "DE.Controllers.Statusbar.zoomText": "Zoom {0}%", + "DE.Controllers.Statusbar.textDisconnect": "Connection is lost
Please check connection settings.", "DE.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?", "DE.Controllers.Toolbar.dataUrl": "Paste a data URL", "DE.Controllers.Toolbar.notcriticalErrorTitle": "Warning", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 9cb14a41f..aa78778e4 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -622,6 +622,7 @@ define([ if ( id == Asc.c_oAscAsyncAction['Disconnect']) { this.disableEditing(false, true); this.getApplication().getController('Statusbar').hideDisconnectTip(); + this.getApplication().getController('Statusbar').setStatusCaption(this.textReconnect); } if (type == Asc.c_oAscAsyncActionType.BlockInteraction && !((id == Asc.c_oAscAsyncAction['LoadDocumentFonts'] || id == Asc.c_oAscAsyncAction['ApplyChanges']) && (this.dontCloseDummyComment || this.inTextareaControl || Common.Utils.ModalWindow.isVisible() || this.inFormControl))) { @@ -2860,7 +2861,8 @@ define([ errorLoadingFont: 'Fonts are not loaded.
Please contact your Document Server administrator.', textConvertEquation: 'This equation was created with an old version of equation editor which is no longer supported. Converting this equation to Office Math ML format will make it editable.
Do you want to convert this equation?', textApplyAll: 'Apply to all equations', - textLearnMore: 'Learn More' + textLearnMore: 'Learn More', + textReconnect: 'Connection is restored' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 2285a5470..84a0f32b5 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -757,7 +757,9 @@ "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.textReconnect": "Connection is restored", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", + "PE.Controllers.Statusbar.textDisconnect": "Connection is lost
Please check connection settings.", "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", "PE.Controllers.Toolbar.textBracket": "Brackets", diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 1ba49f613..cbe889deb 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -708,6 +708,7 @@ define([ if ( id == Asc.c_oAscAsyncAction['Disconnect']) { this.disableEditing(false, true); this.getApplication().getController('Statusbar').hideDisconnectTip(); + this.getApplication().getController('Statusbar').setStatusCaption(this.textReconnect); } }, @@ -3446,7 +3447,8 @@ define([ textFormulaFilledAllRows: 'Formula filled {0} rows have data. Filling other empty rows may take a few minutes.', textFormulaFilledAllRowsWithEmpty: 'Formula filled first {0} rows. Filling other empty rows may take a few minutes.', textFormulaFilledFirstRowsOtherIsEmpty: 'Formula filled only first {0} rows by memory save reason. Other rows in this sheet don\'t have data.', - textFormulaFilledFirstRowsOtherHaveData: 'Formula filled only first {0} rows have data by memory save reason. There are other {1} rows have data in this sheet. You can fill them manually.' + textFormulaFilledFirstRowsOtherHaveData: 'Formula filled only first {0} rows have data by memory save reason. There are other {1} rows have data in this sheet. You can fill them manually.', + textReconnect: 'Connection is restored' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index b287d52cd..9297f6a06 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1056,6 +1056,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.textReconnect": "Connection is restored", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textFirstCol": "First column", "SSE.Controllers.Print.textFirstRow": "First row", @@ -1075,6 +1076,7 @@ "SSE.Controllers.Statusbar.textSheetViewTipFilters": "You are in Sheet View mode. Filters are visible only to you and those who are still in this view.", "SSE.Controllers.Statusbar.warnDeleteSheet": "The selected worksheets might contain data. Are you sure you want to proceed?", "SSE.Controllers.Statusbar.zoomText": "Zoom {0}%", + "SSE.Controllers.Statusbar.textDisconnect": "Connection is lost
Please check connection settings.", "SSE.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?", "SSE.Controllers.Toolbar.errorComboSeries": "To create a combination chart, select at least two series of data.", "SSE.Controllers.Toolbar.errorMaxRows": "ERROR! The maximum number of data series per chart is 255",