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

[SSE][SSE mobile] Add ConfirmReplaceFormulaInTable error

Browse source
This commit is contained in:
Julia Radzhabova 2021-05-27 16:59:39 +03:00
parent 31fbcb86cf
commit 805452abc9
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2007,10 +2007,10 @@ define([
onConfirmAction: function(id, apiCallback) {
var me = this;
if (id == Asc.c_oAscConfirm.ConfirmReplaceRange) {
if (id == Asc.c_oAscConfirm.ConfirmReplaceRange || id == Asc.c_oAscConfirm.ConfirmReplaceFormulaInTable) {
Common.UI.warning({
title: this.notcriticalErrorTitle,
msg: this.confirmMoveCellRange,
msg: id == Asc.c_oAscConfirm.ConfirmReplaceRange ? this.confirmMoveCellRange : this.confirmReplaceFormulaInTable,
buttons: ['yes', 'no'],
primary: 'yes',
callback: _.bind(function(btn) {
@ -2951,7 +2951,8 @@ define([
textTryUndoRedoWarn: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.<br>Use the \'Refresh\' button to update the report.',
txtQuarter: 'Qtr',
txtOr: '%1 or %2'
txtOr: '%1 or %2',
confirmReplaceFormulaInTable: 'Formulas in the header row will be removed and converted to static text.<br>Do you want to continue?'
}
})(), SSE.Controllers.Main || {}))
});

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

@ -599,6 +599,7 @@
"SSE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
"SSE.Controllers.Main.confirmMoveCellRange": "The destination cell range can contain data. Continue the operation?",
"SSE.Controllers.Main.confirmPutMergeRange": "The source data contained merged cells.<br>They had been unmerged before they were pasted into the table.",
"SSE.Controllers.Main.confirmReplaceFormulaInTable": "Formulas in the header row will be removed and converted to static text.<br>Do you want to continue?",
"SSE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"SSE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",
"SSE.Controllers.Main.criticalErrorTitle": "Error",

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

@ -95,7 +95,8 @@
"textOk": "Ok",
"textNo": "No",
"confirmMoveCellRange": "The destination cell`s range can contain data. Continue the operation?",
"confirmPutMergeRange": "The source data contains merged cells.<br>They will be unmerged before they are pasted into the table."
"confirmPutMergeRange": "The source data contains merged cells.<br>They will be unmerged before they are pasted into the table.",
"confirmReplaceFormulaInTable": "Formulas in the header row will be removed and converted to static text.<br>Do you want to continue?"
},
"Error": {
"criticalErrorTitle": "Error",

4
apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx
View file

@ -185,10 +185,10 @@ const LongActionsController = () => {
};
const onConfirmAction = (id, apiCallback) => {
if (id === Asc.c_oAscConfirm.ConfirmReplaceRange) {
if (id === Asc.c_oAscConfirm.ConfirmReplaceRange || id === Asc.c_oAscConfirm.ConfirmReplaceFormulaInTable) {
f7.dialog.create({
title: _t.notcriticalErrorTitle,
text: _t.confirmMoveCellRange,
text: id == Asc.c_oAscConfirm.ConfirmReplaceRange ? _t.confirmMoveCellRange : _t.confirmReplaceFormulaInTable,
buttons: [
{text: _t.textYes,
onClick: () => {