Bug 69581 - [Watermark] When expanding the list of the text backgroun…

…d language, the language selected by default is not the same as before expanding it. (good case)
ONLYOFFICE · Aug 12, 2024 · 390900f · 390900f
1 parent e6542ca
commit 390900f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
@@ -477,7 +477,7 @@ define([
                 this.cmbText.setData(data);
                 this.cmbText.setValue(data[0].value);
             }
-            return item ? item.get('displayValue') : null;
+            return item ? item.get('value') : null;
         },
 
         onImageSelect: function(menu, item) {
@@ -526,7 +526,11 @@ define([
                     if (val) {
                         var lang = Common.util.LanguageInfo.getLocalLanguageName(val.get_Lang());
                         this.lang = {value: lang[0], displayValue: lang[1]};
-                        this.cmbLang.setValue(lang[1]);
+                        var langKey = lang[0];
+                        var cmbLangLi = this.cmbLang.store.findWhere({value: langKey});
+                        if (!cmbLangLi)
+                            langKey = langKey.split(/[\-\_]/)[0];
+                        this.cmbLang.setValue(langKey, lang[1]);
                         this.loadWMText(lang[0]);
 
                         var font = val.get_FontFamily().get_Name();