From e1a0e868c7173617357707ef959c63594b1fc36d Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 18 Jan 2024 14:11:28 +0100 Subject: [PATCH] ui: adapt to fix of Korean language code Signed-off-by: Thomas Lamprecht --- debian/control | 2 +- www/manager6/Utils.js | 12 ++++++++++++ www/manager6/window/LoginWindow.js | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 8add0a3d..9339acb3 100644 --- a/debian/control +++ b/debian/control @@ -87,7 +87,7 @@ Depends: apt (>= 1.5~), pve-docs (>= 8.0~~), pve-firewall, pve-ha-manager, - pve-i18n (>= 1.0-3), + pve-i18n (>= 3.2.0~), pve-xtermjs (>= 4.7.0-1), qemu-server (>= 8.0.4), rsync, diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 9f44e560..a8d5786d 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1925,6 +1925,18 @@ Ext.define('PVE.Utils', { isStandaloneNode: function() { return PVE.data.ResourceStore.getNodes().length < 2; }, + + // main use case of this helper is the login window + getUiLanguage: function() { + let languageCookie = Ext.util.Cookies.get('PVELangCookie'); + if (languageCookie === 'kr') { + // fix-up 'kr' being used for Korean by mistake FIXME: remove with PVE 9 + let dt = Ext.Date.add(new Date(), Ext.Date.YEAR, 10); + languageCookie = 'ko'; + Ext.util.Cookies.set('PVELangCookie', languageCookie, dt); + } + return languageCookie || Proxmox.defaultLang || 'en'; + }, }, singleton: true, diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js index 4a07f75b..a79f5a2a 100644 --- a/www/manager6/window/LoginWindow.js +++ b/www/manager6/window/LoginWindow.js @@ -367,7 +367,7 @@ Ext.define('PVE.window.LoginWindow', { { xtype: 'proxmoxLanguageSelector', fieldLabel: gettext('Language'), - value: Ext.util.Cookies.get('PVELangCookie') || Proxmox.defaultLang || 'en', + value: PVE.Utils.getUiLanguage(), name: 'lang', reference: 'langField', submitValue: false, -- 2.39.2