From 01473b72406ab8dfb84a593ac312b592cfdc4cde Mon Sep 17 00:00:00 2001
From: Alexander Yuzhin <alexander.yuzhin@onlyoffice.com>
Date: Tue, 7 Feb 2017 12:58:35 +0300
Subject: [PATCH] [SSE] Fix Bug 33907

---
 .../main/app/controller/FormulaDialog.js      | 56 ++++++++++---------
 .../mobile/app/controller/add/AddFunction.js  | 12 +++-
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js
index 98425604b..8039c6cda 100644
--- a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js
+++ b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js
@@ -60,6 +60,9 @@ define([
 
         initialize: function () {
             var me = this;
+
+            Common.NotificationCenter.on('document:ready', _.bind(me.onDocumentReady, me));
+
             this.addListeners({
                 'FileMenu': {
                     'settings:apply': function() {
@@ -71,32 +74,6 @@ define([
 
         setApi: function (api) {
             this.api = api;
-
-            if (this.formulasGroups && this.api) {
-                this.loadingFormulas();
-
-                var me = this;
-
-                this.formulas = new SSE.Views.FormulaDialog({
-                    api             : this.api,
-                    toolclose       : 'hide',
-                    formulasGroups  : this.formulasGroups,
-                    handler         : function (func) {
-                        if (func && me.api) {
-                            me.api.asc_insertFormula(func, Asc.c_oAscPopUpSelectorType.Func);
-                        }
-                    }
-                });
-
-                this.formulas.on({
-                    'hide': function () {
-                        if (me.api) {
-                            me.api.asc_enableKeyEvents(true);
-                        }
-                    }
-                });
-            }
-
             return this;
         },
 
@@ -109,6 +86,33 @@ define([
             this.formulasGroups = this.getApplication().getCollection('FormulaGroups');
         },
 
+        onDocumentReady: function () {
+            var me = this;
+
+            if (me.formulasGroups && me.api) {
+                me.loadingFormulas();
+
+                me.formulas = new SSE.Views.FormulaDialog({
+                    api             : me.api,
+                    toolclose       : 'hide',
+                    formulasGroups  : me.formulasGroups,
+                    handler         : function (func) {
+                        if (func && me.api) {
+                            me.api.asc_insertFormula(func, Asc.c_oAscPopUpSelectorType.Func);
+                        }
+                    }
+                });
+
+                me.formulas.on({
+                    'hide': function () {
+                        if (me.api) {
+                            me.api.asc_enableKeyEvents(true);
+                        }
+                    }
+                });
+            }
+        },
+
         showDialog: function () {
             if (this.formulas) {
                 if (this.needUpdateFormula)
diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddFunction.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddFunction.js
index 08326b197..47c6144f6 100644
--- a/apps/spreadsheeteditor/mobile/app/controller/add/AddFunction.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddFunction.js
@@ -58,7 +58,8 @@ define([
             ],
 
             initialize: function () {
-                Common.NotificationCenter.on('addcontainer:show', _.bind(this.initEvents, this));
+                Common.NotificationCenter.on('addcontainer:show',   _.bind(this.initEvents, this));
+                Common.NotificationCenter.on('document:ready',      _.bind(this.onDocumentReady, this));
 
                 this.addListeners({
                     'AddFunction': {
@@ -85,6 +86,15 @@ define([
             initEvents: function () {
             },
 
+            onDocumentReady: function () {
+                var me = this;
+
+                _.defer(function () {
+                    me.api.asc_setLocalization(fc);
+                    me.fillFunctions.call(me);
+                });
+            },
+
             fillFunctions: function() {
                 var functions = {};
                 var jsonDescr   = JSON.parse(fd);