From d64c6f91d8df48bbd92595507e0788e1fdf3d333 Mon Sep 17 00:00:00 2001 From: "Julia.Radzhabova" Date: Tue, 13 May 2025 21:54:55 +0300 Subject: [PATCH] Change format for desktop system langs --- apps/documenteditor/main/app/controller/Main.js | 12 +++++++++--- apps/presentationeditor/main/app/controller/Main.js | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 23bb4afd59..4126fb2551 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2811,13 +2811,19 @@ define([ this.loadLanguages([]); } - let sLangs = Common.Controllers.Desktop.systemLangs() || [], - recentKey = 'de-settings-recent-langs', - arr = Common.localStorage.getItem(recentKey), + let sLangs = Common.Controllers.Desktop.systemLangs() || {}, + arr = []; + for (let name in sLangs) { + sLangs.hasOwnProperty(name) && arr.push(name); + } + sLangs = arr; + + let recentKey = 'de-settings-recent-langs', recentCount = Math.max(5, sLangs.length + 3); Common.Utils.InternalSettings.set(recentKey + "-count", recentCount); Common.Utils.InternalSettings.set(recentKey + "-offset", sLangs.length); + arr = Common.localStorage.getItem(recentKey); arr = arr ? arr.split(';') : []; arr = _.union(sLangs, arr); arr.splice(recentCount); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 7ddc3a6a9c..24eecefb13 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -2361,13 +2361,19 @@ define([ this.loadLanguages([]); } - let sLangs = Common.Controllers.Desktop.systemLangs() || [], - recentKey = 'pe-settings-recent-langs', - arr = Common.localStorage.getItem(recentKey), + let sLangs = Common.Controllers.Desktop.systemLangs() || {}, + arr = []; + for (let name in sLangs) { + sLangs.hasOwnProperty(name) && arr.push(name); + } + sLangs = arr; + + let recentKey = 'pe-settings-recent-langs', recentCount = Math.max(5, sLangs.length + 3); Common.Utils.InternalSettings.set(recentKey + "-count", recentCount); Common.Utils.InternalSettings.set(recentKey + "-offset", sLangs.length); + arr = Common.localStorage.getItem(recentKey); arr = arr ? arr.split(';') : []; arr = _.union(sLangs, arr); arr.splice(recentCount);