diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index afc240b19f..e1b313ddc4 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -2143,6 +2143,11 @@ define([
config.msg = this.errorLockedCellGoalSeek;
break;
+ case Asc.c_oAscError.ID.CircularReference:
+ config.msg = this.errorCircularReference;
+ config.maxwidth = 600;
+ break;
+
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@@ -3967,7 +3972,8 @@ define([
errorDependentsNoFormulas: 'The Trace Dependents command found no formulas that refer to the active cell.',
errorPrecedentsNoValidRef: 'The Trace Precedents command requires that the active cell contain a formula which includes a valid references.',
txtPicture: 'Picture',
- errorLockedCellGoalSeek: 'One of the cells involved in the goal seek process has been modified by another user.'
+ errorLockedCellGoalSeek: 'One of the cells involved in the goal seek process has been modified by another user.',
+ errorCircularReference: 'There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells.'
}
})(), SSE.Controllers.Main || {}))
});
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 639ca18a35..9c50211f5d 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -391,6 +391,17 @@ define([
'
',
'
',
'
',
+ '
',
+ '
',
+ '
',
+ '
',
+ '
',
+ '
',
+ '
',
+ '
',
+ '
',
+ '
',
+ '
',
'
',
'
',
'
',
@@ -803,6 +814,42 @@ define([
me.chQuickPrint.setValue(!me.chQuickPrint.isChecked());
});
+ this.chIterative = new Common.UI.CheckBox({
+ el: $markup.findById('#fms-chb-iterative-calc'),
+ labelText: this.strEnableIterative,
+ dataHint: '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
+ });
+
+ this.inputMaxChange = new Common.UI.InputField({
+ el: $markup.findById('#fms-max-change'),
+ style: 'width: 60px;',
+ validateOnBlur: false,
+ maskExp: /[0-9,\.]/,
+ dataHint : '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small',
+ validation: function(value) {
+ return !_.isEmpty(value) && (!/^(\d*(\.|,)?\d+)$|^(\d+(\.|,)?\d*)$/.test(value) || isNaN(Common.Utils.String.parseFloat(value))) ? me.txtErrorNumber : true;
+ }
+ });
+
+ this.spnMaxIterations = new Common.UI.MetricSpinner({
+ el: $markup.findById('#fms-max-iterations'),
+ step: 1,
+ width: 60,
+ defaultUnit : '',
+ value: 100,
+ maxValue: 32767,
+ minValue: 1,
+ allowDecimal: false,
+ maskExp: /[0-9]/,
+ dataHint : '2',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
+ });
+
this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
this.pnlApply = $markup.find('.fms-flex-apply').addBack().filter('.fms-flex-apply');
this.pnlTable = this.pnlSettings.find('table');
@@ -968,6 +1015,13 @@ define([
this.chRTL.setValue(Common.localStorage.getBool("ui-rtl", Common.Locale.isCurrentLanguageRtl()));
this.chQuickPrint.setValue(Common.Utils.InternalSettings.get("sse-settings-quick-print-button"));
+ value = this.api.asc_GetCalcSettings();
+ if (value) {
+ this.chIterative.setValue(!!value.asc_getIterativeCalc());
+ this.spnMaxIterations.setValue(value.asc_getMaxIterations());
+ this.inputMaxChange.setValue(value.asc_getMaxChange());
+ }
+
var data = [];
for (var t in Common.UI.Themes.map()) {
data.push({value: t, displayValue: Common.UI.Themes.get(t).text});
@@ -1021,7 +1075,20 @@ define([
}
},
+ isValid: function() {
+ if (this.mode.isEdit) {
+ if (this.inputMaxChange.checkValidate() !== true) {
+ this.inputMaxChange.focus();
+ return;
+ }
+ }
+ return true;
+ },
+
applySettings: function() {
+ if (!this.isValid())
+ return;
+
Common.UI.Themes.setTheme(this.cmbTheme.getValue());
Common.localStorage.setItem("sse-settings-show-alt-hints", this.chUseAltKey.isChecked() ? 1 : 0);
Common.Utils.InternalSettings.set("sse-settings-show-alt-hints", Common.localStorage.getBool("sse-settings-show-alt-hints"));
@@ -1105,9 +1172,18 @@ define([
}
}
- if (this.mode.isEdit)
+ if (this.mode.isEdit) {
this.api.asc_setDate1904(this.chDateSystem.isChecked());
+ value = this.api.asc_GetCalcSettings();
+ if (value) {
+ value.asc_setIterativeCalc(this.chIterative.isChecked());
+ value.asc_setMaxIterations(this.spnMaxIterations.getNumberValue());
+ this.inputMaxChange.getValue() && value.asc_setMaxChange(Common.Utils.String.parseFloat(this.inputMaxChange.getValue()));
+ this.api.asc_UpdateCalcSettings(value);
+ }
+ }
+
if (isRtlChanged) {
var config = {
title: this.txtWorkspaceSettingChange,
@@ -1281,7 +1357,11 @@ define([
txtRestartEditor: 'Please restart spreadsheet editor so that your workspace settings can take effect',
txtHy: 'Armenian',
txtLastUsed: 'Last used',
- txtScreenReader: 'Turn on screen reader support'
+ txtScreenReader: 'Turn on screen reader support',
+ strMaxIterations: 'Maximum iterations',
+ strMaxChange: 'Maximum change',
+ strEnableIterative: 'Enable iterative calculation',
+ txtErrorNumber: 'Your entry cannot be used. An integer or decimal number may be required.'
}, SSE.Views.FileMenuPanels.MainSettingsGeneral || {}));
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 13b6a8ac3e..b22f36b167 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -1047,6 +1047,7 @@
"SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula. Wrong number of brackets is used.",
"SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used. Please correct the error.",
"SSE.Controllers.Main.errorWrongPassword": "The password you supplied is not correct.",
+ "SSE.Controllers.Main.errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells.",
"SSE.Controllers.Main.errRemDuplicates": "Duplicate values found and deleted: {0}, unique values left: {1}.",
"SSE.Controllers.Main.leavePageText": "You have unsaved changes in this spreadsheet. Click 'Stay on this Page' then 'Save' to save them. Click 'Leave this Page' to discard all the unsaved changes.",
"SSE.Controllers.Main.leavePageTextOnClose": "All unsaved changes in this spreadsheet will be lost. Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
@@ -2677,6 +2678,10 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWorkspace": "Workspace",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtZh": "Chinese",
+ "SSE.Views.FileMenuPanels.MainSettingsGeneral.strMaxIterations": "Maximum iterations",
+ "SSE.Views.FileMenuPanels.MainSettingsGeneral.strMaxChange": "Maximum change",
+ "SSE.Views.FileMenuPanels.MainSettingsGeneral.strEnableIterative": "Enable iterative calculation",
+ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtErrorNumber": "Your entry cannot be used. An integer or decimal number may be required.",
"SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",
"SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "With password",
"SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Protect Spreadsheet",
diff --git a/apps/spreadsheeteditor/mobile/locale/ar.json b/apps/spreadsheeteditor/mobile/locale/ar.json
index c1f6e4a58e..370eebc84f 100644
--- a/apps/spreadsheeteditor/mobile/locale/ar.json
+++ b/apps/spreadsheeteditor/mobile/locale/ar.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "تم تجاوز الحد الأقصى المسموح به لحجم الملف",
"uploadImageExtMessage": "امتداد صورة غير معروف",
"uploadImageFileCountMessage": "لم يتم رفع أية صور.",
- "uploadImageSizeMessage": "حجم الصورة كبير للغاية. اقصى حجم هو 25 ميغابايت"
+ "uploadImageSizeMessage": "حجم الصورة كبير للغاية. اقصى حجم هو 25 ميغابايت",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "كملة السر",
diff --git a/apps/spreadsheeteditor/mobile/locale/az.json b/apps/spreadsheeteditor/mobile/locale/az.json
index 2b4843df52..842e965214 100644
--- a/apps/spreadsheeteditor/mobile/locale/az.json
+++ b/apps/spreadsheeteditor/mobile/locale/az.json
@@ -316,7 +316,8 @@
"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.",
"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.",
- "textFormulaFilledFirstRowsOtherIsEmpty": "Formula filled only first {0} rows by memory save reason. Other rows in this sheet don't have data."
+ "textFormulaFilledFirstRowsOtherIsEmpty": "Formula filled only first {0} rows by memory save reason. Other rows in this sheet don't have data.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Parol",
diff --git a/apps/spreadsheeteditor/mobile/locale/be.json b/apps/spreadsheeteditor/mobile/locale/be.json
index b488b40032..6aef1ede78 100644
--- a/apps/spreadsheeteditor/mobile/locale/be.json
+++ b/apps/spreadsheeteditor/mobile/locale/be.json
@@ -316,7 +316,8 @@
"uploadDocFileCountMessage": "No documents uploaded.",
"uploadDocSizeMessage": "Maximum document size limit exceeded.",
"uploadImageFileCountMessage": "No images uploaded.",
- "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB."
+ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"notcriticalErrorTitle": "Увага",
diff --git a/apps/spreadsheeteditor/mobile/locale/bg.json b/apps/spreadsheeteditor/mobile/locale/bg.json
index 4cf09725c3..dac79ee1b2 100644
--- a/apps/spreadsheeteditor/mobile/locale/bg.json
+++ b/apps/spreadsheeteditor/mobile/locale/bg.json
@@ -751,7 +751,8 @@
"uploadDocSizeMessage": "Maximum document size limit exceeded.",
"uploadImageExtMessage": "Unknown image format.",
"uploadImageFileCountMessage": "No images uploaded.",
- "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB."
+ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Password",
diff --git a/apps/spreadsheeteditor/mobile/locale/ca.json b/apps/spreadsheeteditor/mobile/locale/ca.json
index 62a6440ad4..787eb89ce8 100644
--- a/apps/spreadsheeteditor/mobile/locale/ca.json
+++ b/apps/spreadsheeteditor/mobile/locale/ca.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "S'ha superat el límit màxim de mida del document.",
"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.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Contrasenya",
diff --git a/apps/spreadsheeteditor/mobile/locale/cs.json b/apps/spreadsheeteditor/mobile/locale/cs.json
index 8cfed555a2..9ce9487bc2 100644
--- a/apps/spreadsheeteditor/mobile/locale/cs.json
+++ b/apps/spreadsheeteditor/mobile/locale/cs.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Překročena maximální velikost dokumentu.",
"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.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Heslo",
diff --git a/apps/spreadsheeteditor/mobile/locale/da.json b/apps/spreadsheeteditor/mobile/locale/da.json
index 33e916ceb8..10a9a42037 100644
--- a/apps/spreadsheeteditor/mobile/locale/da.json
+++ b/apps/spreadsheeteditor/mobile/locale/da.json
@@ -316,7 +316,8 @@
"uploadDocFileCountMessage": "No documents uploaded.",
"uploadDocSizeMessage": "Maximum document size limit exceeded.",
"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.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Kodeord",
diff --git a/apps/spreadsheeteditor/mobile/locale/de.json b/apps/spreadsheeteditor/mobile/locale/de.json
index 1435a1542f..c3fe30b4ee 100644
--- a/apps/spreadsheeteditor/mobile/locale/de.json
+++ b/apps/spreadsheeteditor/mobile/locale/de.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Die maximale Dokumentgröße wurde überschritten.",
"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.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Passwort",
diff --git a/apps/spreadsheeteditor/mobile/locale/el.json b/apps/spreadsheeteditor/mobile/locale/el.json
index 805f25c8c0..779cca9614 100644
--- a/apps/spreadsheeteditor/mobile/locale/el.json
+++ b/apps/spreadsheeteditor/mobile/locale/el.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Ξεπεράστηκε το μέγιστο μέγεθος εγγράφου.",
"uploadImageExtMessage": "Άγνωστη μορφή εικόνας.",
"uploadImageFileCountMessage": "Δεν μεταφορτώθηκαν εικόνες.",
- "uploadImageSizeMessage": "Η εικόνα είναι πολύ μεγάλη. Το μέγιστο μέγεθος είναι 25MB."
+ "uploadImageSizeMessage": "Η εικόνα είναι πολύ μεγάλη. Το μέγιστο μέγεθος είναι 25MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Συνθηματικό",
diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json
index e194d02977..1b3b7344e9 100644
--- a/apps/spreadsheeteditor/mobile/locale/en.json
+++ b/apps/spreadsheeteditor/mobile/locale/en.json
@@ -294,6 +294,7 @@
"errorViewerDisconnect": "Connection is lost. You can still view the document, but you won't be able to download or print it until the connection is restored and the page is reloaded.",
"errorWrongBracketsCount": "An error in the formula. Wrong number of brackets.",
"errorWrongOperator": "An error in the entered formula. Wrong operator is used. Please correct the error.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells.",
"errRemDuplicates": "Duplicate values found and deleted: {0}, unique values left: {1}.",
"notcriticalErrorTitle": "Warning",
"openErrorText": "An error has occurred while opening the file",
diff --git a/apps/spreadsheeteditor/mobile/locale/es.json b/apps/spreadsheeteditor/mobile/locale/es.json
index 385a9b3b35..6a222d3e56 100644
--- a/apps/spreadsheeteditor/mobile/locale/es.json
+++ b/apps/spreadsheeteditor/mobile/locale/es.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Se ha excedido el límite de tamaño máximo del documento.",
"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.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Contraseña",
diff --git a/apps/spreadsheeteditor/mobile/locale/eu.json b/apps/spreadsheeteditor/mobile/locale/eu.json
index 3269a5274d..258689840d 100644
--- a/apps/spreadsheeteditor/mobile/locale/eu.json
+++ b/apps/spreadsheeteditor/mobile/locale/eu.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Dokumentuaren gehienezko tamaina gainditu da.",
"uploadImageExtMessage": "Irudi-formatu ezezaguna.",
"uploadImageFileCountMessage": "Ez da irudirik kargatu.",
- "uploadImageSizeMessage": "Irudia handiegia da. Gehienezko tamaina 25 MB da."
+ "uploadImageSizeMessage": "Irudia handiegia da. Gehienezko tamaina 25 MB da.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Pasahitza",
diff --git a/apps/spreadsheeteditor/mobile/locale/fr.json b/apps/spreadsheeteditor/mobile/locale/fr.json
index 805180a143..566e6feec2 100644
--- a/apps/spreadsheeteditor/mobile/locale/fr.json
+++ b/apps/spreadsheeteditor/mobile/locale/fr.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "La taille du fichier dépasse la limite autorisée.",
"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.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Mot de passe",
diff --git a/apps/spreadsheeteditor/mobile/locale/gl.json b/apps/spreadsheeteditor/mobile/locale/gl.json
index a27f3e2538..b98cd40044 100644
--- a/apps/spreadsheeteditor/mobile/locale/gl.json
+++ b/apps/spreadsheeteditor/mobile/locale/gl.json
@@ -316,7 +316,8 @@
"errorInconsistentExtXlsx": "An error has occurred while opening the file. The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
"errorLabledColumnsPivot": "To create a pivot table report, you must use data that is organized as a list with labeled columns.",
"errorPrecedentsNoValidRef": "The Trace Precedents command requires that the active cell contain a formula which includes a valid references.",
- "errorProtectedRange": "This range is not allowed for editing."
+ "errorProtectedRange": "This range is not allowed for editing.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Contrasinal",
diff --git a/apps/spreadsheeteditor/mobile/locale/hu.json b/apps/spreadsheeteditor/mobile/locale/hu.json
index b27ee2ebcf..a755c5195b 100644
--- a/apps/spreadsheeteditor/mobile/locale/hu.json
+++ b/apps/spreadsheeteditor/mobile/locale/hu.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "A maximális dokumentum méret elérve.",
"uploadImageExtMessage": "Ismeretlen képformátum.",
"uploadImageFileCountMessage": "Nincs kép feltöltve.",
- "uploadImageSizeMessage": "A kép túl nagy. A maximális méret 25 MB."
+ "uploadImageSizeMessage": "A kép túl nagy. A maximális méret 25 MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Jelszó",
diff --git a/apps/spreadsheeteditor/mobile/locale/hy.json b/apps/spreadsheeteditor/mobile/locale/hy.json
index aac384c164..e4ae98c031 100644
--- a/apps/spreadsheeteditor/mobile/locale/hy.json
+++ b/apps/spreadsheeteditor/mobile/locale/hy.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Փաստաթղթի չափի առավելագույն սահմանաչափը գերազանցվել է:",
"uploadImageExtMessage": "Նկարի անհայտ ձևաչափ։",
"uploadImageFileCountMessage": "Ոչ մի նկար չի բեռնվել։",
- "uploadImageSizeMessage": "Պատկերը չափազանց մեծ է:Առավելագույն չափը 25 ՄԲ է:"
+ "uploadImageSizeMessage": "Պատկերը չափազանց մեծ է:Առավելագույն չափը 25 ՄԲ է:",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Գաղտնաբառ",
diff --git a/apps/spreadsheeteditor/mobile/locale/id.json b/apps/spreadsheeteditor/mobile/locale/id.json
index d230688e89..bf8baf8eb0 100644
--- a/apps/spreadsheeteditor/mobile/locale/id.json
+++ b/apps/spreadsheeteditor/mobile/locale/id.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Batas ukuran maksimum dokumen terlampaui.",
"uploadImageExtMessage": "Format gambar tidak dikenal.",
"uploadImageFileCountMessage": "Tidak ada gambar yang diunggah.",
- "uploadImageSizeMessage": "Melebihi ukuran maksimal file. Ukuran maksimum adalah 25 MB."
+ "uploadImageSizeMessage": "Melebihi ukuran maksimal file. Ukuran maksimum adalah 25 MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Kata Sandi",
diff --git a/apps/spreadsheeteditor/mobile/locale/it.json b/apps/spreadsheeteditor/mobile/locale/it.json
index da06e928c8..47408e2db2 100644
--- a/apps/spreadsheeteditor/mobile/locale/it.json
+++ b/apps/spreadsheeteditor/mobile/locale/it.json
@@ -316,7 +316,8 @@
"textInformation": "Information",
"uploadDocExtMessage": "Unknown document format.",
"uploadDocFileCountMessage": "No documents uploaded.",
- "uploadDocSizeMessage": "Maximum document size limit exceeded."
+ "uploadDocSizeMessage": "Maximum document size limit exceeded.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Password",
diff --git a/apps/spreadsheeteditor/mobile/locale/ja.json b/apps/spreadsheeteditor/mobile/locale/ja.json
index bd61630e2e..ad58fcff7c 100644
--- a/apps/spreadsheeteditor/mobile/locale/ja.json
+++ b/apps/spreadsheeteditor/mobile/locale/ja.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "文書の最大サイズ制限を超えています。",
"uploadImageExtMessage": "不明なイメージ形式",
"uploadImageFileCountMessage": "アップロードしたイメージがない",
- "uploadImageSizeMessage": "イメージのサイズの上限が超えさせました。サイズの上限が25MB。"
+ "uploadImageSizeMessage": "イメージのサイズの上限が超えさせました。サイズの上限が25MB。",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "パスワード",
diff --git a/apps/spreadsheeteditor/mobile/locale/ko.json b/apps/spreadsheeteditor/mobile/locale/ko.json
index e45f95ae70..6829df6353 100644
--- a/apps/spreadsheeteditor/mobile/locale/ko.json
+++ b/apps/spreadsheeteditor/mobile/locale/ko.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "최대 문서 크기 제한을 초과했습니다.",
"uploadImageExtMessage": "알수 없는 이미지 형식입니다.",
"uploadImageFileCountMessage": "이미지가 업로드되지 않았습니다.",
- "uploadImageSizeMessage": "이미지 크기 제한을 초과했습니다."
+ "uploadImageSizeMessage": "이미지 크기 제한을 초과했습니다.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "암호",
diff --git a/apps/spreadsheeteditor/mobile/locale/lo.json b/apps/spreadsheeteditor/mobile/locale/lo.json
index deb0ca73f1..a80d893c18 100644
--- a/apps/spreadsheeteditor/mobile/locale/lo.json
+++ b/apps/spreadsheeteditor/mobile/locale/lo.json
@@ -316,7 +316,8 @@
"textInformation": "Information",
"uploadDocExtMessage": "Unknown document format.",
"uploadDocFileCountMessage": "No documents uploaded.",
- "uploadDocSizeMessage": "Maximum document size limit exceeded."
+ "uploadDocSizeMessage": "Maximum document size limit exceeded.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "ລະຫັດຜ່ານ",
diff --git a/apps/spreadsheeteditor/mobile/locale/lv.json b/apps/spreadsheeteditor/mobile/locale/lv.json
index 6cd0db9a90..68ce057e2b 100644
--- a/apps/spreadsheeteditor/mobile/locale/lv.json
+++ b/apps/spreadsheeteditor/mobile/locale/lv.json
@@ -316,7 +316,8 @@
"textInformation": "Information",
"uploadDocExtMessage": "Unknown document format.",
"uploadDocFileCountMessage": "No documents uploaded.",
- "uploadDocSizeMessage": "Maximum document size limit exceeded."
+ "uploadDocSizeMessage": "Maximum document size limit exceeded.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Parole",
diff --git a/apps/spreadsheeteditor/mobile/locale/ms.json b/apps/spreadsheeteditor/mobile/locale/ms.json
index e97249df0b..754572ed44 100644
--- a/apps/spreadsheeteditor/mobile/locale/ms.json
+++ b/apps/spreadsheeteditor/mobile/locale/ms.json
@@ -316,7 +316,8 @@
"textOk": "Ok",
"uploadDocExtMessage": "Unknown document format.",
"uploadDocFileCountMessage": "No documents uploaded.",
- "uploadDocSizeMessage": "Maximum document size limit exceeded."
+ "uploadDocSizeMessage": "Maximum document size limit exceeded.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Kata laluan",
diff --git a/apps/spreadsheeteditor/mobile/locale/nl.json b/apps/spreadsheeteditor/mobile/locale/nl.json
index 7f2428ec64..05a1efc45d 100644
--- a/apps/spreadsheeteditor/mobile/locale/nl.json
+++ b/apps/spreadsheeteditor/mobile/locale/nl.json
@@ -316,7 +316,8 @@
"textOk": "Ok",
"uploadDocExtMessage": "Unknown document format.",
"uploadDocFileCountMessage": "No documents uploaded.",
- "uploadDocSizeMessage": "Maximum document size limit exceeded."
+ "uploadDocSizeMessage": "Maximum document size limit exceeded.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Wachtwoord",
diff --git a/apps/spreadsheeteditor/mobile/locale/pl.json b/apps/spreadsheeteditor/mobile/locale/pl.json
index 5d2bf248a0..dc8cefacea 100644
--- a/apps/spreadsheeteditor/mobile/locale/pl.json
+++ b/apps/spreadsheeteditor/mobile/locale/pl.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Maximum document size limit exceeded.",
"uploadImageExtMessage": "Unknown image format.",
"uploadImageFileCountMessage": "No images uploaded.",
- "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB."
+ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"textCancel": "Anuluj",
diff --git a/apps/spreadsheeteditor/mobile/locale/pt-pt.json b/apps/spreadsheeteditor/mobile/locale/pt-pt.json
index f8bb1029ff..17537776ef 100644
--- a/apps/spreadsheeteditor/mobile/locale/pt-pt.json
+++ b/apps/spreadsheeteditor/mobile/locale/pt-pt.json
@@ -316,7 +316,8 @@
"textFormulaFilledFirstRowsOtherIsEmpty": "Formula filled only first {0} rows by memory save reason. Other rows in this sheet don't have data.",
"uploadDocExtMessage": "Unknown document format.",
"uploadDocFileCountMessage": "No documents uploaded.",
- "uploadDocSizeMessage": "Maximum document size limit exceeded."
+ "uploadDocSizeMessage": "Maximum document size limit exceeded.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Palavra-passe",
diff --git a/apps/spreadsheeteditor/mobile/locale/pt.json b/apps/spreadsheeteditor/mobile/locale/pt.json
index fb588bb3e1..b632127e58 100644
--- a/apps/spreadsheeteditor/mobile/locale/pt.json
+++ b/apps/spreadsheeteditor/mobile/locale/pt.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Tamanho máximo do documento excedido.",
"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.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Senha",
diff --git a/apps/spreadsheeteditor/mobile/locale/ro.json b/apps/spreadsheeteditor/mobile/locale/ro.json
index 7b9747d75a..d1d75e5526 100644
--- a/apps/spreadsheeteditor/mobile/locale/ro.json
+++ b/apps/spreadsheeteditor/mobile/locale/ro.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Dimensiunea documentului depășește limita permisă.",
"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.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Parola",
diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json
index 35133c8c3f..42ddfe6d84 100644
--- a/apps/spreadsheeteditor/mobile/locale/ru.json
+++ b/apps/spreadsheeteditor/mobile/locale/ru.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Превышен максимальный размер документа.",
"uploadImageExtMessage": "Неизвестный формат рисунка.",
"uploadImageFileCountMessage": "Ни одного рисунка не загружено.",
- "uploadImageSizeMessage": "Слишком большой рисунок. Максимальный размер - 25 MB."
+ "uploadImageSizeMessage": "Слишком большой рисунок. Максимальный размер - 25 MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Пароль",
diff --git a/apps/spreadsheeteditor/mobile/locale/si.json b/apps/spreadsheeteditor/mobile/locale/si.json
index 27817e57eb..af5a182a3a 100644
--- a/apps/spreadsheeteditor/mobile/locale/si.json
+++ b/apps/spreadsheeteditor/mobile/locale/si.json
@@ -316,7 +316,8 @@
"uploadImageFileCountMessage": "අනුරුවක් උඩුගත කර නැත.",
"uploadImageSizeMessage": "අනුරුව ඉතා විශාලයි. උපරිම ප්රමාණය මෙ.බ. 25 කි.",
"errorDependentsNoFormulas": "The Trace Dependents command found no formulas that refer to the active cell.",
- "errorPrecedentsNoValidRef": "The Trace Precedents command requires that the active cell contain a formula which includes a valid references."
+ "errorPrecedentsNoValidRef": "The Trace Precedents command requires that the active cell contain a formula which includes a valid references.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "මුරපදය",
diff --git a/apps/spreadsheeteditor/mobile/locale/sk.json b/apps/spreadsheeteditor/mobile/locale/sk.json
index dd1ff87b5e..23924b4ed8 100644
--- a/apps/spreadsheeteditor/mobile/locale/sk.json
+++ b/apps/spreadsheeteditor/mobile/locale/sk.json
@@ -316,7 +316,8 @@
"textOk": "Ok",
"uploadDocExtMessage": "Unknown document format.",
"uploadDocFileCountMessage": "No documents uploaded.",
- "uploadDocSizeMessage": "Maximum document size limit exceeded."
+ "uploadDocSizeMessage": "Maximum document size limit exceeded.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Heslo",
diff --git a/apps/spreadsheeteditor/mobile/locale/sl.json b/apps/spreadsheeteditor/mobile/locale/sl.json
index 82f4fd929d..3b8d492d85 100644
--- a/apps/spreadsheeteditor/mobile/locale/sl.json
+++ b/apps/spreadsheeteditor/mobile/locale/sl.json
@@ -776,7 +776,8 @@
"uploadDocSizeMessage": "Maximum document size limit exceeded.",
"uploadImageExtMessage": "Unknown image format.",
"uploadImageFileCountMessage": "No images uploaded.",
- "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB."
+ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Password",
diff --git a/apps/spreadsheeteditor/mobile/locale/sr.json b/apps/spreadsheeteditor/mobile/locale/sr.json
index 16a34c5eee..ea73d0432a 100644
--- a/apps/spreadsheeteditor/mobile/locale/sr.json
+++ b/apps/spreadsheeteditor/mobile/locale/sr.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "Maksimum limit veličine dokumenta prekoračen.",
"uploadImageExtMessage": "Nepoznati format slike.",
"uploadImageFileCountMessage": "Nema otpremljenih slika.",
- "uploadImageSizeMessage": "Slika je prevelika. Maksimum veličina je 25 MB."
+ "uploadImageSizeMessage": "Slika je prevelika. Maksimum veličina je 25 MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Lozinka",
diff --git a/apps/spreadsheeteditor/mobile/locale/tr.json b/apps/spreadsheeteditor/mobile/locale/tr.json
index 78b1560dfb..dc7090cc2c 100644
--- a/apps/spreadsheeteditor/mobile/locale/tr.json
+++ b/apps/spreadsheeteditor/mobile/locale/tr.json
@@ -316,7 +316,8 @@
"textOk": "Ok",
"uploadDocExtMessage": "Unknown document format.",
"uploadDocFileCountMessage": "No documents uploaded.",
- "uploadDocSizeMessage": "Maximum document size limit exceeded."
+ "uploadDocSizeMessage": "Maximum document size limit exceeded.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Şifre",
diff --git a/apps/spreadsheeteditor/mobile/locale/uk.json b/apps/spreadsheeteditor/mobile/locale/uk.json
index 214ebb0bed..764e13c16e 100644
--- a/apps/spreadsheeteditor/mobile/locale/uk.json
+++ b/apps/spreadsheeteditor/mobile/locale/uk.json
@@ -751,7 +751,8 @@
"uploadDocSizeMessage": "Maximum document size limit exceeded.",
"uploadImageExtMessage": "Unknown image format.",
"uploadImageFileCountMessage": "No images uploaded.",
- "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB."
+ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Password",
diff --git a/apps/spreadsheeteditor/mobile/locale/vi.json b/apps/spreadsheeteditor/mobile/locale/vi.json
index 531567ea90..807608f5b2 100644
--- a/apps/spreadsheeteditor/mobile/locale/vi.json
+++ b/apps/spreadsheeteditor/mobile/locale/vi.json
@@ -776,7 +776,8 @@
"uploadDocSizeMessage": "Maximum document size limit exceeded.",
"uploadImageExtMessage": "Unknown image format.",
"uploadImageFileCountMessage": "No images uploaded.",
- "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB."
+ "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "Password",
diff --git a/apps/spreadsheeteditor/mobile/locale/zh-tw.json b/apps/spreadsheeteditor/mobile/locale/zh-tw.json
index 727027d471..c1687a3d96 100644
--- a/apps/spreadsheeteditor/mobile/locale/zh-tw.json
+++ b/apps/spreadsheeteditor/mobile/locale/zh-tw.json
@@ -316,7 +316,8 @@
"textInformation": "Information",
"uploadDocExtMessage": "Unknown document format.",
"uploadDocFileCountMessage": "No documents uploaded.",
- "uploadDocSizeMessage": "Maximum document size limit exceeded."
+ "uploadDocSizeMessage": "Maximum document size limit exceeded.",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "密碼",
diff --git a/apps/spreadsheeteditor/mobile/locale/zh.json b/apps/spreadsheeteditor/mobile/locale/zh.json
index 7f26ca792f..c2cf5d59dd 100644
--- a/apps/spreadsheeteditor/mobile/locale/zh.json
+++ b/apps/spreadsheeteditor/mobile/locale/zh.json
@@ -316,7 +316,8 @@
"uploadDocSizeMessage": "超出最大文件大小限制。",
"uploadImageExtMessage": "未知图像格式。",
"uploadImageFileCountMessage": "没有上传图片",
- "uploadImageSizeMessage": "图像太大。最大大小为25 MB。"
+ "uploadImageSizeMessage": "图像太大。最大大小为25 MB。",
+ "errorCircularReference": "There are one or more circular references where a formula refers to its own cell either directly or indirectly. Try removing or changing these references, or moving the formulas to different cells."
},
"LongActions": {
"advDRMPassword": "密码",
diff --git a/apps/spreadsheeteditor/mobile/src/controller/Error.jsx b/apps/spreadsheeteditor/mobile/src/controller/Error.jsx
index eeacb71de2..d4c68c8657 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/Error.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/Error.jsx
@@ -487,6 +487,10 @@ const ErrorController = inject('storeAppOptions','storeSpreadsheetInfo')(({store
config.msg = t('Error.errorPrecedentsNoValidRef');
break;
+ case Asc.c_oAscError.ID.CircularReference:
+ config.msg = t('Error.errorCircularReference');
+ break;
+
default:
config.msg = _t.errorDefaultMessage.replace('%1', id);
break;