From ebb71c0e943dd21b8b1237f42035d01d1ebf6320 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 20 Dec 2021 18:47:05 +0300 Subject: [PATCH] Change message when connection is lost --- apps/common/main/lib/component/SynchronizeTip.js | 3 ++- apps/documenteditor/main/app/controller/Statusbar.js | 5 +++-- apps/documenteditor/main/locale/en.json | 2 +- apps/documenteditor/main/locale/ru.json | 1 + apps/presentationeditor/main/app/controller/Statusbar.js | 5 +++-- apps/presentationeditor/main/locale/en.json | 2 +- apps/spreadsheeteditor/main/app/controller/Statusbar.js | 5 +++-- apps/spreadsheeteditor/main/locale/en.json | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js index d30820201..1e1e0eadb 100644 --- a/apps/common/main/lib/component/SynchronizeTip.js +++ b/apps/common/main/lib/component/SynchronizeTip.js @@ -50,7 +50,7 @@ define([ }, template: _.template([ - '
<%= scope.placement %>">', + '
<%= scope.placement %>" style="<%= scope.style %>">', '
', '
', '
', @@ -82,6 +82,7 @@ define([ this.closable = this.options.closable; this.textButton = this.options.textButton || ''; this.position = this.options.position; // show in the position relative to target + this.style = this.options.style || ''; }, render: function() { diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index 784070a57..2418b501d 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -326,7 +326,8 @@ define([ text : this.textDisconnect, placement: 'top', position: this.statusbar.isVisible() ? undefined : {bottom: 0}, - showLink: false + showLink: false, + style: 'max-width: 310px;' }); this.disconnectTip.on({ 'closeclick': function() { @@ -348,6 +349,6 @@ define([ textTrackChanges: 'The document is opened with the Track Changes mode enabled', tipReview : 'Review', textSetTrackChanges: 'You are in Track Changes mode', - textDisconnect: 'Connection is lost
Please check connection settings.' + textDisconnect: 'Connection is lost
Trying to connect. Please check connection settings.' }, DE.Controllers.Statusbar || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 362a058ca..852b600e1 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -887,7 +887,7 @@ "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", - "DE.Controllers.Statusbar.textDisconnect": "Connection is lost
Please check connection settings.", + "DE.Controllers.Statusbar.textDisconnect": "Connection is lost
Trying to connect. Please check connection settings.", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", "DE.Controllers.Statusbar.textSetTrackChanges": "You are in Track Changes mode", "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index fbe678533..38e18f8c9 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -884,6 +884,7 @@ "DE.Controllers.Statusbar.textTrackChanges": "Документ открыт при включенном режиме отслеживания изменений", "DE.Controllers.Statusbar.tipReview": "Отслеживать изменения", "DE.Controllers.Statusbar.zoomText": "Масштаб {0}%", + "DE.Controllers.Statusbar.textDisconnect": "Соединение потеряно
Пытаемся восстановить соединение. Проверьте параметры подключения.", "DE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы хотите сохранить, недоступен на этом устройстве.
Стиль текста будет отображаться с помощью одного из системных шрифтов. Сохраненный шрифт будет использоваться, когда он станет доступен.
Вы хотите продолжить?", "DE.Controllers.Toolbar.dataUrl": "Вставьте URL-адрес данных", "DE.Controllers.Toolbar.notcriticalErrorTitle": "Внимание", diff --git a/apps/presentationeditor/main/app/controller/Statusbar.js b/apps/presentationeditor/main/app/controller/Statusbar.js index 377dc978a..12281714c 100644 --- a/apps/presentationeditor/main/app/controller/Statusbar.js +++ b/apps/presentationeditor/main/app/controller/Statusbar.js @@ -246,7 +246,8 @@ define([ text : this.textDisconnect, placement: 'top', position: this.statusbar.isVisible() ? undefined : {bottom: 0}, - showLink: false + showLink: false, + style: 'max-width: 310px;' }); this.disconnectTip.on({ 'closeclick': function() { @@ -264,7 +265,7 @@ define([ }, zoomText : 'Zoom {0}%', - textDisconnect: 'Connection is lost
Please check connection settings.' + textDisconnect: 'Connection is lost
Trying to connect. Please check connection settings.' }, PE.Controllers.Statusbar || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 30035918f..393ce0b3f 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -947,7 +947,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.Statusbar.textDisconnect": "Connection is lost
Please check connection settings.", + "PE.Controllers.Statusbar.textDisconnect": "Connection is lost
Trying to connect. Please check connection settings.", "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/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 29cd68c68..398db2c65 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -824,7 +824,8 @@ define([ text : this.textDisconnect, placement: 'top', position: this.statusbar.isVisible() ? undefined : {bottom: 0}, - showLink: false + showLink: false, + style: 'max-width: 310px;' }); this.disconnectTip.on({ 'closeclick': function() { @@ -848,6 +849,6 @@ define([ strSheet : 'Sheet', textSheetViewTip: 'You are in Sheet View mode. Filters and sorting are visible only to you and those who are still in this view.', textSheetViewTipFilters: 'You are in Sheet View mode. Filters are visible only to you and those who are still in this view.', - textDisconnect: 'Connection is lost
Please check connection settings.' + textDisconnect: 'Connection is lost
Trying to connect. Please check connection settings.' }, SSE.Controllers.Statusbar || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 6f58254a6..dc154bc1e 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1072,7 +1072,7 @@ "SSE.Controllers.Statusbar.errorLastSheet": "Workbook must have at least one visible worksheet.", "SSE.Controllers.Statusbar.errorRemoveSheet": "Cannot delete the worksheet.", "SSE.Controllers.Statusbar.strSheet": "Sheet", - "SSE.Controllers.Statusbar.textDisconnect": "Connection is lost
Please check connection settings.", + "SSE.Controllers.Statusbar.textDisconnect": "Connection is lost
Trying to connect. Please check connection settings.", "SSE.Controllers.Statusbar.textSheetViewTip": "You are in Sheet View mode. Filters and sorting are visible only to you and those who are still in this view.", "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?",