Merge pull request 'fix/bugfix' (#241) from fix/bugfix into release/v…

…8.3.0
ONLYOFFICE · Jan 22, 2025 · cf6b438 · cf6b438
2 parents 7a7b317 + 6b88386
commit cf6b438
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/apps/common/main/lib/util/LanguageInfo.js b/apps/common/main/lib/util/LanguageInfo.js
@@ -440,8 +440,7 @@ Common.util.LanguageInfo = new(function() {
         0x0431 : ["ts-ZA", "Tsonga (South Africa)", "Tsonga (South Africa)"],
         0x0433 : ["ven-ZA", "South Africa", "South Africa"],
         0x0092 : ["ku", "Central Kurdish"],
-        0x7C92 : ["ku-Arab", "Central Kurdish", "Central Kurdish"],
-        0x0492 : ["ku-Arab-IQ", "Central Kurdish (Iraq)", "Central Kurdish (Iraq)"]
+        0x7C92 : ["ku-Arab", "کوردیی ناوەندی", "Central Kurdish"]
     };
 
     return {

diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js
@@ -247,7 +247,7 @@ define([
                 }
             }
 
-            if ( this._settings[Common.Utils.documentSettingsType.Header].locked ) { // если находимся в locked header/footer, то считаем, что все элементы в нем тоже недоступны
+            if ( this._settings[Common.Utils.documentSettingsType.Header].locked ) { // all elements are locked if header/footer is locked
                 for (i=0; i<this._settings.length; i++)  {
                     if (this._settings[i])
                         this._settings[i].locked = true;

diff --git a/apps/presentationeditor/main/app/controller/RightMenu.js b/apps/presentationeditor/main/app/controller/RightMenu.js
@@ -174,7 +174,7 @@ define([
                 }
             }
 
-            if ( this._settings[Common.Utils.documentSettingsType.Slide].locked ) { // если находимся в locked slide, то считаем, что все элементы в нем тоже недоступны
+            if ( this._settings[Common.Utils.documentSettingsType.Slide].locked ) { // all elements are locked if the slide is locked
                 for (i=0; i<this._settings.length; i++)  {
                     if (this._settings[i])
                         this._settings[i].locked = true;

diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -2784,6 +2784,7 @@ define([
 
                 var animationController = me.getApplication().getController('Animation');
                 animationController.setApi(me.api).setConfig({toolbar: me,mode:config}).createToolbarPanel();
+                Array.prototype.push.apply(me.toolbar.slideOnlyControls,animationController.getView().getButtons());
 
                 me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));