From 3d7849468568472b83829b2848792bc68cf332f8 Mon Sep 17 00:00:00 2001
From: Julia Svinareva <julia.svinaryova@onlyoffice.com>
Date: Tue, 27 Aug 2019 16:04:21 +0300
Subject: [PATCH] [SSE] Fix Calculate, Add translations

---
 apps/spreadsheeteditor/main/app/view/FormulaTab.js | 6 +++---
 apps/spreadsheeteditor/main/locale/en.json         | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/view/FormulaTab.js b/apps/spreadsheeteditor/main/app/view/FormulaTab.js
index af51c513b..a05c58a44 100644
--- a/apps/spreadsheeteditor/main/app/view/FormulaTab.js
+++ b/apps/spreadsheeteditor/main/app/view/FormulaTab.js
@@ -58,10 +58,10 @@ define([
                 me.fireEvent('function:apply', [{name: 'more', origin: 'more'}]);
             });
             me.btnCalculate.on('click', function () {
-                me.fireEvent('function:calculate', [{name: 'calculate', type: Asc.c_oAscCalculateType.All}]);
+                me.fireEvent('function:calculate', [{type: Asc.c_oAscCalculateType.All}]);
             });
             me.btnCalculate.menu.on('item:click', function (menu, item, e) {
-                me.fireEvent('function:calculate', [{name: item.caption, type: item.value}]);
+                me.fireEvent('function:calculate', [{type: item.value}]);
             });
         }
         return {
@@ -227,7 +227,7 @@ define([
                     split: true,
                     menu: true,
                     disabled: true,
-                    lock: [_set.editCell, _set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
+                    lock: [_set.editCell, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
                 });
                 Common.Utils.injectComponent($host.find('#slot-btn-calculate'), this.btnCalculate);
                 this.lockedControls.push(this.btnCalculate);
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index b644c07c0..454ac6d14 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -1633,6 +1633,13 @@
   "SSE.Views.FormulaTab.txtFormulaTip": "Insert function",
   "SSE.Views.FormulaTab.txtMore": "More functions",
   "SSE.Views.FormulaTab.txtRecent": "Recently used",
+  "SSE.Views.txtCalculate": "Calculate",
+  "SSE.Views.tipCalculate": "Calculate",
+  "SSE.Views.textEntireWorkbook": "Entire Workbook",
+  "SSE.Views.textCurrentSheet": "Current Sheet",
+  "SSE.Views.textAutomatic": "Automatic",
+  "SSE.Views.textManual": "Manual",
+  "SSE.Views.tipCalculateTheEntireWorkbook": "Calculate the entire workbook",
   "SSE.Views.GroupDialog.cancelButtonText": "Cancel",
   "SSE.Views.GroupDialog.okButtonText": "OK",
   "SSE.Views.GroupDialog.textColumns": "Columns",