From: Matthias Heiserer <m.heiserer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] close #3103: default lang
Date: Thu, 20 Jan 2022 10:33:25 +0100 [thread overview]
Message-ID: <20220120093325.1120218-1-m.heiserer@proxmox.com> (raw)
A default language can now be set in node.cfg.
This language is only used if none is set in the cookies.
Signed-off-by: Matthias Heiserer <m.heiserer@proxmox.com>
---
src/bin/proxmox-backup-proxy.rs | 8 ++++++
src/config/node.rs | 45 ++++++++++++++++++++++++++++++---
2 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index 523966cf..c197b512 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -168,6 +168,14 @@ async fn get_index_future(
lang = language;
}
}
+ if lang.is_empty() {
+ if let Ok((config, _)) = proxmox_backup::config::node::config() {
+ if let Some(default_lang) = config.default_lang {
+ // don't need to check for existance for language file because node::config() only returns valid results
+ lang = default_lang;
+ }
+ }
+ }
let data = json!({
"NodeName": nodename,
diff --git a/src/config/node.rs b/src/config/node.rs
index 40d7b220..d78dfec6 100644
--- a/src/config/node.rs
+++ b/src/config/node.rs
@@ -4,7 +4,7 @@ use openssl::ssl::{SslAcceptor, SslMethod};
use anyhow::{bail, Error};
use serde::{Deserialize, Serialize};
-use proxmox_schema::{api, ApiStringFormat, ApiType, Updater};
+use proxmox_schema::{api, ApiStringFormat, ApiType, EnumEntry, Schema, StringSchema, Updater};
use proxmox_http::ProxyConfig;
@@ -57,6 +57,37 @@ pub struct AcmeConfig {
account: AcmeAccountName,
}
+/// All available languages in Proxmox. Taken from proxmox-i18n repository
+const LANG_SCHEMA: Schema = StringSchema::new("Available languages")
+ .format(&ApiStringFormat::Enum(&[
+ EnumEntry::new("ar", "ar"),
+ EnumEntry::new("ca", "ca"),
+ EnumEntry::new("da", "da"),
+ EnumEntry::new("de", "de"),
+ EnumEntry::new("es", "es"),
+ EnumEntry::new("eu", "eu"),
+ EnumEntry::new("fa", "fa"),
+ EnumEntry::new("fr", "fr"),
+ EnumEntry::new("gl", "gl"),
+ EnumEntry::new("he", "he"),
+ EnumEntry::new("hu", "hu"),
+ EnumEntry::new("it", "it"),
+ EnumEntry::new("ja", "ja"),
+ EnumEntry::new("kr", "kr"),
+ EnumEntry::new("nb", "nb"),
+ EnumEntry::new("nl", "nl"),
+ EnumEntry::new("nn", "nn"),
+ EnumEntry::new("pl", "pl"),
+ EnumEntry::new("pt_BR", "pt_BR"),
+ EnumEntry::new("ru", "ru"),
+ EnumEntry::new("sl", "sl"),
+ EnumEntry::new("sv", "sv"),
+ EnumEntry::new("tr", "tr"),
+ EnumEntry::new("zh_CN", "zh_CN"),
+ EnumEntry::new("zh_TW", "zh_TW"),
+ ]))
+ .schema();
+
#[api(
properties: {
acme: {
@@ -100,6 +131,10 @@ pub struct AcmeConfig {
schema: OPENSSL_CIPHERS_TLS_1_2_SCHEMA,
optional: true,
},
+ "default-lang" : {
+ schema: LANG_SCHEMA,
+ optional: true,
+ }
},
)]
#[derive(Deserialize, Serialize, Updater)]
@@ -127,17 +162,21 @@ pub struct NodeConfig {
#[serde(skip_serializing_if = "Option::is_none")]
pub http_proxy: Option<String>,
-
+
#[serde(skip_serializing_if = "Option::is_none")]
pub email_from: Option<String>,
/// List of TLS ciphers for TLS 1.3 that will be used by the proxy. (Proxy has to be restarted for changes to take effect)
#[serde(skip_serializing_if = "Option::is_none", rename="ciphers-tls-1.3")]
pub ciphers_tls_1_3: Option<String>,
-
+
/// List of TLS ciphers for TLS <= 1.2 that will be used by the proxy. (Proxy has to be restarted for changes to take effect)
#[serde(skip_serializing_if = "Option::is_none", rename="ciphers-tls-1.2")]
pub ciphers_tls_1_2: Option<String>,
+
+ /// Default language used in the GUI
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub default_lang: Option<String>,
}
impl NodeConfig {
--
2.30.2
next reply other threads:[~2022-01-20 9:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-20 9:33 Matthias Heiserer [this message]
2022-01-20 12:04 ` Thomas Lamprecht
2022-01-24 8:54 ` Matthias Heiserer
2022-01-24 8:59 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220120093325.1120218-1-m.heiserer@proxmox.com \
--to=m.heiserer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox