Merge pull request '[PE] Fix loading languages' (#25) from fix/bugfix…

… into release/v8.2.0
ONLYOFFICE · Sep 16, 2024 · 41b3c18 · 41b3c18
2 parents 037ddbe + eedcda8
commit 41b3c18
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js
@@ -334,6 +334,7 @@ define([
             }
 
             me.showMathTrackOnLoad && me.onShowMathTrack(me.lastMathTrackBounds);
+            me.documentHolder && me.documentHolder.setLanguages();
         },
 
         createDelayedElements: function(view, type) {

diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -73,6 +73,7 @@ define([
                 isFormsOnly: false,
                 isCommentsOnly: false
             };
+            this._langs = null;
         },
 
         render: function () {
@@ -189,8 +190,13 @@ define([
 
         setLanguages: function(langs){
             var me = this;
-
-            if (langs && langs.length > 0 && me.langParaMenu && me.langTableMenu) {
+            if (!langs) langs = me._langs;
+            if (langs && langs.length > 0) {
+                if (!me.langParaMenu || !me.langTableMenu) {
+                    me._langs = langs;
+                    return;
+                }
+                me._langs = null;
                 var arrPara = [], arrTable = [];
                 _.each(langs, function(lang) {
                     var item = {

diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
@@ -476,6 +476,7 @@ define([
             }
 
             me.showMathTrackOnLoad && me.onShowMathTrack(me.lastMathTrackBounds);
+            me.documentHolder && me.documentHolder.setLanguages();
         },
 
         getView: function (name) {

diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -62,6 +62,7 @@ define([
             me._isDisabled = false;
             me._preventCustomClick = null;
             me._hasCustomItems = false;
+            me._langs = null;
 
             Common.NotificationCenter.on('settings:unitschanged', _.bind(this.unitsChanged, this));
         },
@@ -218,7 +219,13 @@ define([
 
         setLanguages: function(langs){
             var me = this;
-            if (langs && langs.length > 0 && me.langParaMenu && me.langTableMenu) {
+            if (!langs) langs = me._langs;
+            if (langs && langs.length > 0) {
+                if (!me.langParaMenu || !me.langTableMenu) {
+                    me._langs = langs;
+                    return;
+                }
+                me._langs = null;
                 var arrPara = [], arrTable = [];
                 _.each(langs, function(lang) {
                     var item = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -334,6 +334,7 @@ define([ @@
                 }
                 me.showMathTrackOnLoad && me.onShowMathTrack(me.lastMathTrackBounds);
+                me.documentHolder && me.documentHolder.setLanguages();
             },
             createDelayedElements: function(view, type) {
@@ Expand Down @@