From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D9C79904ED for ; Thu, 1 Sep 2022 09:21:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D7BFB23E43 for ; Thu, 1 Sep 2022 09:21:29 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 1 Sep 2022 09:21:28 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0347743386 for ; Thu, 1 Sep 2022 09:21:28 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 1 Sep 2022 09:21:27 +0200 Message-Id: <20220901072127.3237686-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.093 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: [pbs-devel] [PATCH proxmox-backup] ui: fix default language display X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Sep 2022 07:21:29 -0000 when we set a default language server side, we want to display that on the login page. For that we have to use the 'language' variable in the index template. Also set the fallback to '__default__' instead of 'en' so that we show 'Default (English)'. Was reported in the forum: https://forum.proxmox.com/threads/set-default-language-on-server-login-screen-to-german.114431/ Signed-off-by: Dominik Csapak --- www/LoginView.js | 2 +- www/index.hbs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/www/LoginView.js b/www/LoginView.js index a9538ded..33734f6c 100644 --- a/www/LoginView.js +++ b/www/LoginView.js @@ -298,7 +298,7 @@ Ext.define('PBS.LoginView', { { xtype: 'proxmoxLanguageSelector', fieldLabel: gettext('Language'), - value: Ext.util.Cookies.get('PBSLangCookie') || Proxmox.defaultLang || 'en', + value: Ext.util.Cookies.get('PBSLangCookie') || Proxmox.defaultLang || '__default__', name: 'lang', reference: 'langField', submitValue: false, diff --git a/www/index.hbs b/www/index.hbs index 665bef23..1b8ea710 100644 --- a/www/index.hbs +++ b/www/index.hbs @@ -29,6 +29,7 @@ Setup: { auth_cookie_name: 'PBSAuthCookie' }, NodeName: "{{ NodeName }}", UserName: "{{ UserName }}", + defaultLang: "{{ language }}", CSRFPreventionToken: "{{ CSRFPreventionToken }}", }; -- 2.30.2