ui: adapt to fix of Korean language code

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/debian/control b/debian/control
index 8add0a3d04b309d085b79a0b6dde0cfd0362baad..9339acb385b46492d2524a0ea0ca15b2c743c235 100644 (file)
--- 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 9f44e560140ea82d4406644c890758281ad6bd90..a8d5786d20c091a8e1653f71d7f3ed7681f3dca9 100644 (file)
--- 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 4a07f75bf75dcbe50d6950600dbc281ac1422bd6..a79f5a2a25d6eeb29a0981dc9f826eb5ef2593c0 100644 (file)
--- 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,