From 36388f536038c17fb2383ff651a66356d7043971 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 28 Dec 2021 18:15:04 +0300 Subject: [PATCH 1/9] [SSE mobile] Fix Bug 54703 --- apps/spreadsheeteditor/mobile/src/controller/Main.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index 2f0bd5c32..2116ebef0 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -398,11 +398,18 @@ class MainController extends Component { this.api.asc_registerCallback('asc_onEditCell', (state) => { if (state == Asc.c_oAscCellEditorState.editStart || state == Asc.c_oAscCellEditorState.editEnd) { const isEditCell = state === Asc.c_oAscCellEditorState.editStart; + const isEditEnd = state === Asc.c_oAscCellEditorState.editEnd; + if (storeFocusObjects.isEditCell !== isEditCell) { storeFocusObjects.setEditCell(isEditCell); } + + if(isEditEnd) { + storeFocusObjects.setEditFormulaMode(false); + } } else { const isFormula = state === Asc.c_oAscCellEditorState.editFormula; + if (storeFocusObjects.editFormulaMode !== isFormula) { storeFocusObjects.setEditFormulaMode(isFormula); } From 5d2d58c2ad6026a3416018220ea68f173e2b6779 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 29 Dec 2021 12:05:11 +0300 Subject: [PATCH 2/9] [DE mobile] For Bug 54712 --- apps/documenteditor/mobile/src/view/edit/EditShape.jsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 2a1d7a641..930652b74 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -516,15 +516,18 @@ const EditShape = props => { || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' || shapeType=='straightConnector1'; - let controlProps = api && api.asc_IsContentControl() ? api.asc_GetContentControlProperties() : null, - fixedSize = false; + const inControl = api.asc_IsContentControl(); + const controlProps = (api && inControl) ? api.asc_GetContentControlProperties() : null; + const lockType = controlProps ? controlProps.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; + + let fixedSize = false; if (controlProps) { let spectype = controlProps.get_SpecificType(); fixedSize = (spectype == Asc.c_oAscContentControlSpecificType.CheckBox || spectype == Asc. c_oAscContentControlSpecificType.ComboBox || spectype == Asc.c_oAscContentControlSpecificType.DropDownList || spectype == Asc.c_oAscContentControlSpecificType.None || spectype == Asc.c_oAscContentControlSpecificType.Picture) && controlProps.get_FormPr() && controlProps.get_FormPr().get_Fixed(); } - let disableRemove = !!props.storeFocusObjects.paragraphObject; + let disableRemove = !!props.storeFocusObjects.paragraphObject || (lockType == Asc.c_oAscSdtLockType.SdtContentLocked || lockType == Asc.c_oAscSdtLockType.SdtLocked); return ( From a794193cb36aafe7aea2e7d959eb098c56d7c244 Mon Sep 17 00:00:00 2001 From: SergeyEzhin <41478103+SergeyEzhin@users.noreply.github.com> Date: Wed, 29 Dec 2021 20:22:43 +0300 Subject: [PATCH 3/9] [DE PE SSE mobile] Fix Bug 54632 (#1454) --- apps/documenteditor/mobile/src/controller/Main.jsx | 2 +- apps/presentationeditor/mobile/src/controller/Main.jsx | 2 +- apps/spreadsheeteditor/mobile/src/controller/Main.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index 1a35b24b7..c6c253a30 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -689,7 +689,7 @@ class MainController extends Component { const { t } = this.props; if (found) { - f7.dialog.alert(null, !(found - replaced > 0) ? Common.Utils.String.format(t('Main.textReplaceSuccess'), replaced) : Common.Utils.String.format(t('Main.textReplaceSkipped'), found - replaced)); + f7.dialog.alert(null, !(found - replaced > 0) ? t('Main.textReplaceSuccess').replace(/\{0\}/, `${replaced}`) : t('Main.textReplaceSkipped').replace(/\{0\}/, `${found - replaced}`)); } else { f7.dialog.alert(null, t('Main.textNoTextFound')); } diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx index 2c49ee791..1c2d676f9 100644 --- a/apps/presentationeditor/mobile/src/controller/Main.jsx +++ b/apps/presentationeditor/mobile/src/controller/Main.jsx @@ -422,7 +422,7 @@ class MainController extends Component { const { t } = this.props; if (found) { - f7.dialog.alert(null, !(found - replaced > 0) ? Common.Utils.String.format(t('Controller.Main.textReplaceSuccess'), replaced) : Common.Utils.String.format(t('Controller.Main.textReplaceSkipped'), found - replaced)); + f7.dialog.alert(null, !(found - replaced > 0) ? t('Controller.Main.textReplaceSuccess').replace(/\{0\}/, `${replaced}`) : t('Controller.Main.textReplaceSkipped').replace(/\{0\}/, `${found - replaced}`)); } else { f7.dialog.alert(null, t('Controller.Main.textNoTextFound')); } diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index 2116ebef0..56df7d9c4 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -427,7 +427,7 @@ class MainController extends Component { const { t } = this.props; if (this.api.isReplaceAll) { - f7.dialog.alert(null, (found) ? ((!found - replaced) ? Common.Utils.String.format(t('Controller.Main.textReplaceSuccess'), replaced) : Common.Utils.String.format(t('Controller.Main.textReplaceSkipped'), found - replaced)) : t('Controller.Main.textNoTextFound')); + f7.dialog.alert(null, (found) ? ((!found - replaced) ? t('Controller.Main.textReplaceSuccess').replace(/\{0\}/, `${replaced}`) : t('Controller.Main.textReplaceSkipped').replace(/\{0\}/, `${found - replaced}`)) : t('Controller.Main.textNoTextFound')); } } From b5d131193a3f9d8f3b11be83bc0269775f36237c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 30 Dec 2021 12:00:58 +0300 Subject: [PATCH 4/9] [DE] Fix help (#1455) --- apps/documenteditor/main/resources/help/en/Contents.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/resources/help/en/Contents.json b/apps/documenteditor/main/resources/help/en/Contents.json index 0c2cfe0b4..a371779c2 100644 --- a/apps/documenteditor/main/resources/help/en/Contents.json +++ b/apps/documenteditor/main/resources/help/en/Contents.json @@ -53,7 +53,7 @@ { "src": "UsageInstructions/CreateTableOfContents.htm", "name": "Create table of contents" }, {"src": "UsageInstructions/AddTableofFigures.htm", "name": "Add and Format a Table of Figures" }, { "src": "UsageInstructions/CreateFillableForms.htm", "name": "Create fillable forms", "headername": "Fillable forms" }, - { "src": "UsageInstructions/FillingOutForm.htm", "headername": "Filling Out a Form" }, + { "src": "UsageInstructions/FillingOutForm.htm", "name": "Filling Out a Form" }, {"src": "UsageInstructions/UseMailMerge.htm", "name": "Use mail merge", "headername": "Mail Merge"}, { "src": "UsageInstructions/InsertEquation.htm", "name": "Insert equations", "headername": "Math equations" }, {"src": "HelpfulHints/CollaborativeEditing.htm", "name": "Collaborative document editing", "headername": "Document co-editing"}, From 71c275c0c8272d3671503f5bb84d75f18f2e0fee Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 30 Dec 2021 17:12:21 +0300 Subject: [PATCH 5/9] [SSE] Remove unused code --- .../main/app/controller/Main.js | 1 - .../main/app/controller/Print.js | 5 - .../main/app/controller/ViewTab.js | 1 - .../main/app/view/FileMenuPanels.js | 436 +----------------- 4 files changed, 2 insertions(+), 441 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index cbe889deb..f52ad272d 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -2552,7 +2552,6 @@ define([ this.getApplication().getController('RightMenu').updateMetricUnit(); this.getApplication().getController('Toolbar').getView('Toolbar').updateMetricUnit(); } - //this.getApplication().getController('Print').getView('MainSettingsPrint').updateMetricUnit(); this.getApplication().getController('Print').getView('PrintWithPreview').updateMetricUnit(); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index bfd5be211..9b869fb01 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -62,10 +62,6 @@ define([ this._isPreviewVisible = false; this.addListeners({ - /*'MainSettingsPrint': { - 'show': _.bind(this.onShowMainSettingsPrint, this), - 'render:after': _.bind(this.onAfterRender, this) - },*/ 'PrintWithPreview': { 'show': _.bind(this.onShowMainSettingsPrint, this), 'render:after': _.bind(this.onAfterRender, this), @@ -80,7 +76,6 @@ define([ }, onLaunch: function() { - //this.printSettings = this.createView('MainSettingsPrint'); this.printSettings = this.createView('PrintWithPreview'); }, diff --git a/apps/spreadsheeteditor/main/app/controller/ViewTab.js b/apps/spreadsheeteditor/main/app/controller/ViewTab.js index beaa8ce92..bac0719d4 100644 --- a/apps/spreadsheeteditor/main/app/controller/ViewTab.js +++ b/apps/spreadsheeteditor/main/app/controller/ViewTab.js @@ -271,7 +271,6 @@ define([ }, onApiZoomChange: function(zf, type){ - console.log('zoom'); var value = Math.floor((zf + .005) * 100); this.view.cmbZoom.setValue(value, value + '%'); this._state.zoomValue = value; diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 5dbedde58..32c6b5d06 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -191,7 +191,6 @@ define([ '
', '
', '
', - '
', '
', '
', '' @@ -210,10 +209,6 @@ define([ this.generalSettings.options = {alias:'MainSettingsGeneral'}; this.generalSettings.render($markup.findById('#panel-settings-general')); - //this.printSettings = SSE.getController('Print').getView('MainSettingsPrint'); - //this.printSettings.menu = this.menu; - //this.printSettings.render($markup.findById('#panel-settings-print')); - this.spellcheckSettings = new SSE.Views.FileMenuPanels.MainSpellCheckSettings({menu: this.menu}); this.spellcheckSettings.render($markup.findById('#panel-settings-spellcheck')); @@ -221,7 +216,6 @@ define([ el: $markup.findById('#id-settings-menu'), store: new Common.UI.DataViewStore([ {name: this.txtGeneral, panel: this.generalSettings, iconCls:'toolbar__icon btn-settings', contentTarget: 'panel-settings-general', selected: true}, - //{name: this.txtPageSettings, panel: this.printSettings, iconCls:'toolbar__icon btn-print', contentTarget: 'panel-settings-print'}, {name: this.txtSpellChecking, panel: this.spellcheckSettings, iconCls:'toolbar__icon btn-ic-docspell', contentTarget: 'panel-settings-spellcheck'} ]), itemTemplate: _.template([ @@ -253,15 +247,10 @@ define([ setMode: function(mode) { this.mode = mode; - if (!this.mode.canPrint) { - $(this.viewSettingsPicker.dataViewItems[1].el).hide(); - if (this.printSettings && this.printSettings.$el && this.printSettings.$el.hasClass('active')) - this.viewSettingsPicker.selectByIndex(0); - } this.generalSettings && this.generalSettings.setMode(this.mode); this.spellcheckSettings && this.spellcheckSettings.setMode(this.mode); if (!this.mode.isEdit) { - $(this.viewSettingsPicker.dataViewItems[2].el).hide(); + $(this.viewSettingsPicker.dataViewItems[1].el).hide(); if (this.spellcheckSettings && this.spellcheckSettings.$el && this.spellcheckSettings.$el.hasClass('active')) this.viewSettingsPicker.selectByIndex(0); } @@ -275,14 +264,10 @@ define([ SetDisabled: function(disabled) { if ( disabled ) { $(this.viewSettingsPicker.dataViewItems[1].el).hide(); - $(this.viewSettingsPicker.dataViewItems[2].el).hide(); this.viewSettingsPicker.selectByIndex(0, true); } else { - if ( this.mode.canPrint ) - $(this.viewSettingsPicker.dataViewItems[1].el).show(); - if ( this.mode.isEdit ) { - $(this.viewSettingsPicker.dataViewItems[2].el).show(); + $(this.viewSettingsPicker.dataViewItems[1].el).show(); } } }, @@ -292,423 +277,6 @@ define([ txtSpellChecking: 'Spell checking' }, SSE.Views.FileMenuPanels.Settings || {})); - SSE.Views.MainSettingsPrint = Common.UI.BaseView.extend(_.extend({ - menu: undefined, - - template: _.template([ - '
', - '
', - '', - '', - '', - '', - '','','', - '', - '', - '', - '','', - '', - '', - '', - '','', - '', - '', - '', - '','', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '','', - '
', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '
', - '
', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '', - '', - '', - '', - '', - '
', - '
', - '
' - ].join('')), - - initialize: function(options) { - Common.UI.BaseView.prototype.initialize.call(this,arguments); - - this.menu = options.menu; - this.spinners = []; - this._initSettings = true; - }, - - render: function(parentEl) { - var $markup = $(this.template({scope: this})); - - this.cmbSheet = new Common.UI.ComboBox({ - el : $markup.findById('#advsettings-print-combo-sheets'), - style : 'width: 242px;', - menuStyle : 'min-width: 242px;max-height: 280px;', - editable : false, - cls : 'input-group-nr', - data : [], - dataHint : '3', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - - this.cmbPaperSize = new Common.UI.ComboBox({ - el : $markup.findById('#advsettings-print-combo-pages'), - style : 'width: 242px;', - menuStyle : 'max-height: 280px; min-width: 242px;', - editable : false, - cls : 'input-group-nr', - data : [ - {value:'215.9|279.4', displayValue:'US Letter (21,59cm x 27,94cm)', caption: 'US Letter'}, - {value:'215.9|355.6', displayValue:'US Legal (21,59cm x 35,56cm)', caption: 'US Legal'}, - {value:'210|297', displayValue:'A4 (21cm x 29,7cm)', caption: 'A4'}, - {value:'148|210', displayValue:'A5 (14,8cm x 21cm)', caption: 'A5'}, - {value:'176|250', displayValue:'B5 (17,6cm x 25cm)', caption: 'B5'}, - {value:'104.8|241.3', displayValue:'Envelope #10 (10,48cm x 24,13cm)', caption: 'Envelope #10'}, - {value:'110|220', displayValue:'Envelope DL (11cm x 22cm)', caption: 'Envelope DL'}, - {value:'279.4|431.8', displayValue:'Tabloid (27,94cm x 43,178m)', caption: 'Tabloid'}, - {value:'297|420', displayValue:'A3 (29,7cm x 42cm)', caption: 'A3'}, - {value:'304.8|457.1', displayValue:'Tabloid Oversize (30,48cm x 45,71cm)', caption: 'Tabloid Oversize'}, - {value:'196.8|273', displayValue:'ROC 16K (19,68cm x 27,3cm)', caption: 'ROC 16K'}, - {value:'119.9|234.9', displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)', caption: 'Envelope Choukei 3'}, - {value:'330.2|482.5', displayValue:'Super B/A3 (33,02cm x 48,25cm)', caption: 'Super B/A3'} - ], - dataHint : '3', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - - this.cmbPaperOrientation = new Common.UI.ComboBox({ - el : $markup.findById('#advsettings-print-combo-orient'), - style : 'width: 132px;', - menuStyle : 'min-width: 132px;', - editable : false, - cls : 'input-group-nr', - data : [ - { value: Asc.c_oAscPageOrientation.PagePortrait, displayValue: this.strPortrait }, - { value: Asc.c_oAscPageOrientation.PageLandscape, displayValue: this.strLandscape } - ], - dataHint : '3', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - - var itemsTemplate = - _.template([ - '<% _.each(items, function(item) { %>', - '
  • class="border-top" style="margin-top: 5px;padding-top: 5px;" <% } %> >', - '<%= scope.getDisplayValue(item) %>', - '
    • ', - '<% }); %>' - ].join('')); - this.cmbLayout = new Common.UI.ComboBox({ - el : $markup.findById('#advsettings-print-combo-layout'), - style : 'width: 242px;', - menuStyle : 'min-width: 242px;', - editable : false, - cls : 'input-group-nr', - data : [ - { value: 0, displayValue: this.textActualSize }, - { value: 1, displayValue: this.textFitPage }, - { value: 2, displayValue: this.textFitCols }, - { value: 3, displayValue: this.textFitRows }, - { value: 'customoptions', displayValue: this.textCustomOptions } - ], - itemsTemplate: itemsTemplate, - dataHint : '3', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - - this.chPrintGrid = new Common.UI.CheckBox({ - el: $markup.findById('#advsettings-print-chb-grid'), - labelText: this.textPrintGrid, - dataHint: '3', - dataHintDirection: 'left', - dataHintOffset: 'small' - }); - - this.chPrintRows = new Common.UI.CheckBox({ - el: $markup.findById('#advsettings-print-chb-rows'), - labelText: this.textPrintHeadings, - dataHint: '3', - dataHintDirection: 'left', - dataHintOffset: 'small' - }); - - this.spnMarginTop = new Common.UI.MetricSpinner({ - el: $markup.findById('#advsettings-spin-margin-top'), - step: .1, - width: 110, - defaultUnit : "cm", - value: '0 cm', - maxValue: 48.25, - minValue: 0, - dataHint: '3', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - this.spinners.push(this.spnMarginTop); - - this.spnMarginBottom = new Common.UI.MetricSpinner({ - el: $markup.findById('#advsettings-spin-margin-bottom'), - step: .1, - width: 110, - defaultUnit : "cm", - value: '0 cm', - maxValue: 48.25, - minValue: 0, - dataHint: '3', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - this.spinners.push(this.spnMarginBottom); - - this.spnMarginLeft = new Common.UI.MetricSpinner({ - el: $markup.findById('#advsettings-spin-margin-left'), - step: .1, - width: 110, - defaultUnit : "cm", - value: '0.19 cm', - maxValue: 48.25, - minValue: 0, - dataHint: '3', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - this.spinners.push(this.spnMarginLeft); - - this.spnMarginRight = new Common.UI.MetricSpinner({ - el: $markup.findById('#advsettings-spin-margin-right'), - step: .1, - width: 110, - defaultUnit : "cm", - value: '0.19 cm', - maxValue: 48.25, - minValue: 0, - dataHint: '3', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - this.spinners.push(this.spnMarginRight); - - this.txtRangeTop = new Common.UI.InputField({ - el : $markup.findById('#advsettings-txt-top'), - style : 'width: 147px', - allowBlank : true, - validateOnChange: true, - dataHint: '3', - dataHintDirection: 'left', - dataHintOffset: 'small' - }); - - this.btnPresetsTop = new Common.UI.Button({ - parentEl: $markup.findById('#advsettings-presets-top'), - cls: 'btn-text-menu-default', - caption: this.textRepeat, - style: 'width: 85px;', - menu: true, - dataHint: '3', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - - this.txtRangeLeft = new Common.UI.InputField({ - el : $markup.findById('#advsettings-txt-left'), - style : 'width: 147px', - allowBlank : true, - validateOnChange: true, - dataHint: '3', - dataHintDirection: 'left', - dataHintOffset: 'small' - }); - - this.btnPresetsLeft = new Common.UI.Button({ - parentEl: $markup.findById('#advsettings-presets-left'), - cls: 'btn-text-menu-default', - caption: this.textRepeat, - style: 'width: 85px;', - menu: true, - dataHint: '3', - dataHintDirection: 'bottom', - dataHintOffset: 'big' - }); - - this.btnOk = new Common.UI.Button({ - el: $markup.findById('#advsettings-print-button-save') - }); - - this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings'); - - // if (parentEl) - // this.setElement(parentEl, false); - this.$el = $(parentEl).html($markup); - - if (_.isUndefined(this.scroller)) { - this.scroller = new Common.UI.Scroller({ - el: this.pnlSettings, - suppressScrollX: true, - alwaysVisibleY: true - }); - } - - var me = this; - Common.NotificationCenter.on({ - 'window:resize': function() { - me.isVisible() && me.updateScroller(); - } - }); - - this.fireEvent('render:after', this); - return this; - }, - - addCustomScale: function (add) { - if (add) { - this.cmbLayout.setData([ - { value: 0, displayValue: this.textActualSize }, - { value: 1, displayValue: this.textFitPage }, - { value: 2, displayValue: this.textFitCols }, - { value: 3, displayValue: this.textFitRows }, - { value: 4, displayValue: this.textCustom }, - { value: 'customoptions', displayValue: this.textCustomOptions } - ]); - } else { - this.cmbLayout.setData([ - { value: 0, displayValue: this.textActualSize }, - { value: 1, displayValue: this.textFitPage }, - { value: 2, displayValue: this.textFitCols }, - { value: 3, displayValue: this.textFitRows }, - { value: 'customoptions', displayValue: this.textCustomOptions } - ]); - } - }, - - updateMetricUnit: function() { - if (this.spinners) { - for (var i=0; i Date: Thu, 30 Dec 2021 17:24:46 +0300 Subject: [PATCH 6/9] [SSE] Add translation --- apps/spreadsheeteditor/main/locale/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index dc154bc1e..7bf81a28a 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -3156,6 +3156,7 @@ "SSE.Views.Statusbar.textNoColor": "No Color", "SSE.Views.Statusbar.textSum": "Sum", "SSE.Views.Statusbar.tipAddTab": "Add worksheet", + "SSE.Views.Statusbar.tipListOfSheets": "List of Sheets", "SSE.Views.Statusbar.tipFirst": "Scroll to first sheet", "SSE.Views.Statusbar.tipLast": "Scroll to last sheet", "SSE.Views.Statusbar.tipNext": "Scroll sheet list right", From 5cb7f09c67705d6491a62da5448afdf2b7aa89c5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 10 Jan 2022 13:15:44 +0300 Subject: [PATCH 7/9] [PE] Fix animation init --- apps/presentationeditor/main/app/controller/Animation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js index fdd552733..0cf112e03 100644 --- a/apps/presentationeditor/main/app/controller/Animation.js +++ b/apps/presentationeditor/main/app/controller/Animation.js @@ -83,7 +83,6 @@ define([ 'tab:active': _.bind(this.onActiveTab, this) } }); - this.EffectGroups = Common.define.effectData.getEffectGroupData(); }, onLaunch: function () { @@ -92,6 +91,7 @@ define([ setConfig: function (config) { this.appConfig = config.mode; + this.EffectGroups = Common.define.effectData.getEffectGroupData(); this.view = this.createView('PE.Views.Animation', { toolbar : config.toolbar, mode : config.mode From 6803b3250d4440c4e74b093e40c803846462608a Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 10 Jan 2022 14:46:38 +0300 Subject: [PATCH 8/9] [forms] fix bug 54812 --- .../forms/app/controller/ApplicationController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 163d6e0ab..cf56628b1 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -787,7 +787,7 @@ define([ } } else { Common.Gateway.requestClose(); - Common.Controllers.Desktop.requestClose(); + DE.Controllers.Desktop.requestClose(); } me._openDlg = null; } From 429f0ee1f70045498d89214bbdbb32760b0eb895 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 10 Jan 2022 15:03:47 +0300 Subject: [PATCH 9/9] [SSE] Fix Bug 54808 --- apps/spreadsheeteditor/main/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/main/locale/en.json | 1 + apps/spreadsheeteditor/mobile/locale/az.json | 3 ++- apps/spreadsheeteditor/mobile/locale/be.json | 3 ++- apps/spreadsheeteditor/mobile/locale/bg.json | 3 ++- apps/spreadsheeteditor/mobile/locale/ca.json | 3 ++- apps/spreadsheeteditor/mobile/locale/cs.json | 3 ++- apps/spreadsheeteditor/mobile/locale/da.json | 3 ++- apps/spreadsheeteditor/mobile/locale/de.json | 3 ++- apps/spreadsheeteditor/mobile/locale/el.json | 3 ++- apps/spreadsheeteditor/mobile/locale/en.json | 1 + apps/spreadsheeteditor/mobile/locale/es.json | 3 ++- apps/spreadsheeteditor/mobile/locale/fr.json | 3 ++- apps/spreadsheeteditor/mobile/locale/gl.json | 3 ++- apps/spreadsheeteditor/mobile/locale/hu.json | 3 ++- apps/spreadsheeteditor/mobile/locale/it.json | 3 ++- apps/spreadsheeteditor/mobile/locale/ja.json | 3 ++- apps/spreadsheeteditor/mobile/locale/ko.json | 3 ++- apps/spreadsheeteditor/mobile/locale/lo.json | 3 ++- apps/spreadsheeteditor/mobile/locale/lv.json | 3 ++- apps/spreadsheeteditor/mobile/locale/nb.json | 3 ++- apps/spreadsheeteditor/mobile/locale/nl.json | 3 ++- apps/spreadsheeteditor/mobile/locale/pl.json | 3 ++- apps/spreadsheeteditor/mobile/locale/pt.json | 3 ++- apps/spreadsheeteditor/mobile/locale/ro.json | 3 ++- apps/spreadsheeteditor/mobile/locale/ru.json | 3 ++- apps/spreadsheeteditor/mobile/locale/sk.json | 3 ++- apps/spreadsheeteditor/mobile/locale/sl.json | 3 ++- apps/spreadsheeteditor/mobile/locale/tr.json | 3 ++- apps/spreadsheeteditor/mobile/locale/uk.json | 3 ++- apps/spreadsheeteditor/mobile/locale/vi.json | 3 ++- apps/spreadsheeteditor/mobile/locale/zh.json | 3 ++- apps/spreadsheeteditor/mobile/src/controller/Error.jsx | 4 ++++ 33 files changed, 70 insertions(+), 30 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index f52ad272d..48e5cf103 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1894,6 +1894,10 @@ define([ config.maxwidth = 400; break; + case Asc.c_oAscError.ID.CannotUseCommandProtectedSheet: + config.msg = this.errorCannotUseCommandProtectedSheet; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -3447,7 +3451,8 @@ define([ 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.', - textReconnect: 'Connection is restored' + textReconnect: 'Connection is restored', + errorCannotUseCommandProtectedSheet: 'You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 7bf81a28a..d0dbcab7f 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -650,6 +650,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "The operation cannot be performed because the area contains filtered cells.
    Please unhide the filtered elements and try again.", "SSE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", "SSE.Controllers.Main.errorCannotUngroup": "Cannot ungroup. To start an outline, select the detail rows or columns and group them.", + "SSE.Controllers.Main.errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password.", "SSE.Controllers.Main.errorChangeArray": "You cannot change part of an array.", "SSE.Controllers.Main.errorChangeFilteredRange": "This will change a filtered range on your worksheet.
    To complete this task, please remove AutoFilters.", "SSE.Controllers.Main.errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet.
    To make a change, unprotect the sheet. You might be requested to enter a password.", diff --git a/apps/spreadsheeteditor/mobile/locale/az.json b/apps/spreadsheeteditor/mobile/locale/az.json index 967564cac..c7b2e7591 100644 --- a/apps/spreadsheeteditor/mobile/locale/az.json +++ b/apps/spreadsheeteditor/mobile/locale/az.json @@ -232,7 +232,8 @@ "unknownErrorText": "Naməlum xəta.", "uploadImageExtMessage": "Naməlum təsvir formatı.", "uploadImageFileCountMessage": "Heç bir təsvir yüklənməyib.", - "uploadImageSizeMessage": "Təsvir çox böyükdür. Maksimum ölçü 25 MB-dır." + "uploadImageSizeMessage": "Təsvir çox böyükdür. Maksimum ölçü 25 MB-dır.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Parol", diff --git a/apps/spreadsheeteditor/mobile/locale/be.json b/apps/spreadsheeteditor/mobile/locale/be.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/be.json +++ b/apps/spreadsheeteditor/mobile/locale/be.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/bg.json b/apps/spreadsheeteditor/mobile/locale/bg.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/bg.json +++ b/apps/spreadsheeteditor/mobile/locale/bg.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/ca.json b/apps/spreadsheeteditor/mobile/locale/ca.json index f1eb11c9e..3f399c424 100644 --- a/apps/spreadsheeteditor/mobile/locale/ca.json +++ b/apps/spreadsheeteditor/mobile/locale/ca.json @@ -232,7 +232,8 @@ "unknownErrorText": "Error desconegut.", "uploadImageExtMessage": "Format d'imatge desconegut.", "uploadImageFileCountMessage": "No s'ha carregat cap imatge.", - "uploadImageSizeMessage": "La imatge és massa gran. La mida màxima és de 25 MB." + "uploadImageSizeMessage": "La imatge és massa gran. La mida màxima és de 25 MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Contrasenya", diff --git a/apps/spreadsheeteditor/mobile/locale/cs.json b/apps/spreadsheeteditor/mobile/locale/cs.json index abd2dd562..884e67571 100644 --- a/apps/spreadsheeteditor/mobile/locale/cs.json +++ b/apps/spreadsheeteditor/mobile/locale/cs.json @@ -232,7 +232,8 @@ "unknownErrorText": "Neznámá chyba.", "uploadImageExtMessage": "Neznámý formát obrázku.", "uploadImageFileCountMessage": "Nenahrány žádné obrázky.", - "uploadImageSizeMessage": "Obrázek je příliš velký. Maximální velikost je 25 MB." + "uploadImageSizeMessage": "Obrázek je příliš velký. Maximální velikost je 25 MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Heslo", diff --git a/apps/spreadsheeteditor/mobile/locale/da.json b/apps/spreadsheeteditor/mobile/locale/da.json index b53f47d1f..baeaa6e6a 100644 --- a/apps/spreadsheeteditor/mobile/locale/da.json +++ b/apps/spreadsheeteditor/mobile/locale/da.json @@ -232,7 +232,8 @@ "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", "unknownErrorText": "Unknown error.", "uploadImageExtMessage": "Unknown image format.", - "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB." + "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Kodeord", diff --git a/apps/spreadsheeteditor/mobile/locale/de.json b/apps/spreadsheeteditor/mobile/locale/de.json index e86f959c0..1dede951e 100644 --- a/apps/spreadsheeteditor/mobile/locale/de.json +++ b/apps/spreadsheeteditor/mobile/locale/de.json @@ -232,7 +232,8 @@ "unknownErrorText": "Unbekannter Fehler.", "uploadImageExtMessage": "Unbekanntes Bildformat.", "uploadImageFileCountMessage": "Keine Bilder hochgeladen.", - "uploadImageSizeMessage": "Die maximal zulässige Bildgröße von 25 MB ist überschritten." + "uploadImageSizeMessage": "Die maximal zulässige Bildgröße von 25 MB ist überschritten.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Passwort", diff --git a/apps/spreadsheeteditor/mobile/locale/el.json b/apps/spreadsheeteditor/mobile/locale/el.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/el.json +++ b/apps/spreadsheeteditor/mobile/locale/el.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 852248399..c27c7540f 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -174,6 +174,7 @@ "errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.
    Select a uniform data range inside or outside the table and try again.", "errorAutoFilterHiddenRange": "The operation cannot be performed because the area contains filtered cells.
    Please, unhide the filtered elements and try again.", "errorBadImageUrl": "Image URL is incorrect", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password.", "errorChangeArray": "You cannot change part of an array.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", "errorConnectToServer": "Can't save this doc. Check your connection settings or contact your admin.
    When you click the 'OK' button, you will be prompted to download the document.", diff --git a/apps/spreadsheeteditor/mobile/locale/es.json b/apps/spreadsheeteditor/mobile/locale/es.json index e18465f00..2920c1931 100644 --- a/apps/spreadsheeteditor/mobile/locale/es.json +++ b/apps/spreadsheeteditor/mobile/locale/es.json @@ -232,7 +232,8 @@ "unknownErrorText": "Error desconocido.", "uploadImageExtMessage": "Formato de imagen desconocido.", "uploadImageFileCountMessage": "No hay imágenes subidas.", - "uploadImageSizeMessage": "La imagen es demasiado grande. El tamaño máximo es de 25 MB." + "uploadImageSizeMessage": "La imagen es demasiado grande. El tamaño máximo es de 25 MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Contraseña", diff --git a/apps/spreadsheeteditor/mobile/locale/fr.json b/apps/spreadsheeteditor/mobile/locale/fr.json index c9a9ef381..754c633d3 100644 --- a/apps/spreadsheeteditor/mobile/locale/fr.json +++ b/apps/spreadsheeteditor/mobile/locale/fr.json @@ -232,7 +232,8 @@ "unknownErrorText": "Erreur inconnue.", "uploadImageExtMessage": "Format d'image inconnu.", "uploadImageFileCountMessage": "Aucune image chargée.", - "uploadImageSizeMessage": "L'image est trop grande. La taille limite est de 25 Mo." + "uploadImageSizeMessage": "L'image est trop grande. La taille limite est de 25 Mo.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Mot de passe", diff --git a/apps/spreadsheeteditor/mobile/locale/gl.json b/apps/spreadsheeteditor/mobile/locale/gl.json index e011e08f0..42036de3d 100644 --- a/apps/spreadsheeteditor/mobile/locale/gl.json +++ b/apps/spreadsheeteditor/mobile/locale/gl.json @@ -232,7 +232,8 @@ "unknownErrorText": "Erro descoñecido.", "uploadImageExtMessage": "Formato de imaxe descoñecido.", "uploadImageFileCountMessage": "Non hai imaxes subidas.", - "uploadImageSizeMessage": "A imaxe é demasiado grande. O tamaño máximo é de 25 MB." + "uploadImageSizeMessage": "A imaxe é demasiado grande. O tamaño máximo é de 25 MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Contrasinal", diff --git a/apps/spreadsheeteditor/mobile/locale/hu.json b/apps/spreadsheeteditor/mobile/locale/hu.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/hu.json +++ b/apps/spreadsheeteditor/mobile/locale/hu.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/it.json b/apps/spreadsheeteditor/mobile/locale/it.json index 43c1933a8..b976fafe7 100644 --- a/apps/spreadsheeteditor/mobile/locale/it.json +++ b/apps/spreadsheeteditor/mobile/locale/it.json @@ -232,7 +232,8 @@ "unknownErrorText": "Errore sconosciuto.", "uploadImageExtMessage": "Formato d'immagine sconosciuto.", "uploadImageFileCountMessage": "Nessuna immagine caricata.", - "uploadImageSizeMessage": "L'immagine è troppo grande. La dimensione massima è 25 MB." + "uploadImageSizeMessage": "L'immagine è troppo grande. La dimensione massima è 25 MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Password", diff --git a/apps/spreadsheeteditor/mobile/locale/ja.json b/apps/spreadsheeteditor/mobile/locale/ja.json index b0efab131..0bf38ffdb 100644 --- a/apps/spreadsheeteditor/mobile/locale/ja.json +++ b/apps/spreadsheeteditor/mobile/locale/ja.json @@ -232,7 +232,8 @@ "unknownErrorText": "不明なエラー", "uploadImageExtMessage": "不明なイメージ形式", "uploadImageFileCountMessage": "アップロードしたイメージがない", - "uploadImageSizeMessage": "イメージのサイズの上限が超えさせました。サイズの上限が２５MB。" + "uploadImageSizeMessage": "イメージのサイズの上限が超えさせました。サイズの上限が２５MB。", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "パスワード", diff --git a/apps/spreadsheeteditor/mobile/locale/ko.json b/apps/spreadsheeteditor/mobile/locale/ko.json index 8bb5fca90..a36d863d0 100644 --- a/apps/spreadsheeteditor/mobile/locale/ko.json +++ b/apps/spreadsheeteditor/mobile/locale/ko.json @@ -232,7 +232,8 @@ "unknownErrorText": "알 수 없는 오류.", "uploadImageExtMessage": "알수 없는 이미지 형식입니다.", "uploadImageFileCountMessage": "이미지가 업로드되지 않았습니다.", - "uploadImageSizeMessage": "이미지 크기 제한을 초과했습니다." + "uploadImageSizeMessage": "이미지 크기 제한을 초과했습니다.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "암호", diff --git a/apps/spreadsheeteditor/mobile/locale/lo.json b/apps/spreadsheeteditor/mobile/locale/lo.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/lo.json +++ b/apps/spreadsheeteditor/mobile/locale/lo.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/lv.json b/apps/spreadsheeteditor/mobile/locale/lv.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/lv.json +++ b/apps/spreadsheeteditor/mobile/locale/lv.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/nb.json b/apps/spreadsheeteditor/mobile/locale/nb.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/nb.json +++ b/apps/spreadsheeteditor/mobile/locale/nb.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/nl.json b/apps/spreadsheeteditor/mobile/locale/nl.json index 8e2f673ef..fc8bc2aa6 100644 --- a/apps/spreadsheeteditor/mobile/locale/nl.json +++ b/apps/spreadsheeteditor/mobile/locale/nl.json @@ -232,7 +232,8 @@ "unknownErrorText": "Onbekende fout.", "uploadImageExtMessage": "Onbekende afbeeldingsindeling.", "uploadImageFileCountMessage": "Geen afbeeldingen geüpload.", - "uploadImageSizeMessage": "De afbeelding is te groot. De maximale grootte is 25MB." + "uploadImageSizeMessage": "De afbeelding is te groot. De maximale grootte is 25MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Wachtwoord", diff --git a/apps/spreadsheeteditor/mobile/locale/pl.json b/apps/spreadsheeteditor/mobile/locale/pl.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/pl.json +++ b/apps/spreadsheeteditor/mobile/locale/pl.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/pt.json b/apps/spreadsheeteditor/mobile/locale/pt.json index 9577e32c9..6226f4181 100644 --- a/apps/spreadsheeteditor/mobile/locale/pt.json +++ b/apps/spreadsheeteditor/mobile/locale/pt.json @@ -232,7 +232,8 @@ "unknownErrorText": "Erro desconhecido.", "uploadImageExtMessage": "Formato de imagem desconhecido.", "uploadImageFileCountMessage": "Sem imagens carregadas.", - "uploadImageSizeMessage": "Tamanho limite máximo da imagem excedido. O tamanho máximo é de 25 MB." + "uploadImageSizeMessage": "Tamanho limite máximo da imagem excedido. O tamanho máximo é de 25 MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Senha", diff --git a/apps/spreadsheeteditor/mobile/locale/ro.json b/apps/spreadsheeteditor/mobile/locale/ro.json index 426abf40f..4d8d686c0 100644 --- a/apps/spreadsheeteditor/mobile/locale/ro.json +++ b/apps/spreadsheeteditor/mobile/locale/ro.json @@ -232,7 +232,8 @@ "unknownErrorText": "Eroare necunoscută.", "uploadImageExtMessage": "Format de imagine nerecunoscut.", "uploadImageFileCountMessage": "Nicio imagine nu a fost încărcată.", - "uploadImageSizeMessage": "Imaginea este prea mare. Limita de dimensiune este de 25 MB." + "uploadImageSizeMessage": "Imaginea este prea mare. Limita de dimensiune este de 25 MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Parola", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index c58e6bbcc..1761a4970 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -232,7 +232,8 @@ "unknownErrorText": "Неизвестная ошибка.", "uploadImageExtMessage": "Неизвестный формат рисунка.", "uploadImageFileCountMessage": "Ни одного рисунка не загружено.", - "uploadImageSizeMessage": "Слишком большой рисунок. Максимальный размер - 25 MB." + "uploadImageSizeMessage": "Слишком большой рисунок. Максимальный размер - 25 MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Пароль", diff --git a/apps/spreadsheeteditor/mobile/locale/sk.json b/apps/spreadsheeteditor/mobile/locale/sk.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/sk.json +++ b/apps/spreadsheeteditor/mobile/locale/sk.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/sl.json b/apps/spreadsheeteditor/mobile/locale/sl.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/sl.json +++ b/apps/spreadsheeteditor/mobile/locale/sl.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/tr.json b/apps/spreadsheeteditor/mobile/locale/tr.json index 40da7d7ca..4978af5da 100644 --- a/apps/spreadsheeteditor/mobile/locale/tr.json +++ b/apps/spreadsheeteditor/mobile/locale/tr.json @@ -232,7 +232,8 @@ "unknownErrorText": "Bilinmeyen hata.", "uploadImageExtMessage": "Bilinmeyen resim formatı.", "uploadImageFileCountMessage": "Resim yüklenmedi.", - "uploadImageSizeMessage": "Görüntü çok büyük. Maksimum boyut 25 MB'dir." + "uploadImageSizeMessage": "Görüntü çok büyük. Maksimum boyut 25 MB'dir.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "Şifre", diff --git a/apps/spreadsheeteditor/mobile/locale/uk.json b/apps/spreadsheeteditor/mobile/locale/uk.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/uk.json +++ b/apps/spreadsheeteditor/mobile/locale/uk.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/vi.json b/apps/spreadsheeteditor/mobile/locale/vi.json index af4afc7af..2e6976626 100644 --- a/apps/spreadsheeteditor/mobile/locale/vi.json +++ b/apps/spreadsheeteditor/mobile/locale/vi.json @@ -232,7 +232,8 @@ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.", "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", "errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet. To make a change, unprotect the sheet. You might be requested to enter a password.", - "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization." + "textErrorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "applyChangesTextText": "Loading data...", diff --git a/apps/spreadsheeteditor/mobile/locale/zh.json b/apps/spreadsheeteditor/mobile/locale/zh.json index c529d7c52..c34603187 100644 --- a/apps/spreadsheeteditor/mobile/locale/zh.json +++ b/apps/spreadsheeteditor/mobile/locale/zh.json @@ -232,7 +232,8 @@ "unknownErrorText": "未知错误。", "uploadImageExtMessage": "未知图像格式。", "uploadImageFileCountMessage": "没有图片上传", - "uploadImageSizeMessage": "图片太大了。最大允许的大小是 25 MB." + "uploadImageSizeMessage": "图片太大了。最大允许的大小是 25 MB.", + "errorCannotUseCommandProtectedSheet": "You cannot use this command on a protected sheet. To use this command, unprotect the sheet.
    You might be requested to enter a password." }, "LongActions": { "advDRMPassword": "密码", diff --git a/apps/spreadsheeteditor/mobile/src/controller/Error.jsx b/apps/spreadsheeteditor/mobile/src/controller/Error.jsx index e8dafe2f4..9b5c0deee 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Error.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Error.jsx @@ -314,6 +314,10 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu config.msg = t('Error.textErrorPasswordIsNotCorrect'); break; + case Asc.c_oAscError.ID.CannotUseCommandProtectedSheet: + config.msg = t('Error.errorCannotUseCommandProtectedSheet'); + break; + default: config.msg = _t.errorDefaultMessage.replace('%1', id); break;