mirror of https://github.com/wayvr-org/wayvr.git
parent
12ceebec6d
commit
ad78fdab24
|
|
@ -123,13 +123,7 @@ impl Locale {
|
||||||
|
|
||||||
// check if forced language is set
|
// check if forced language is set
|
||||||
if let Some(forced_lang) = lang_provider.forced_lang() {
|
if let Some(forced_lang) = lang_provider.forced_lang() {
|
||||||
let matched =
|
return Self::parse_str(lang_provider.langs_list(), forced_lang);
|
||||||
Self::match_locale(default_lang, forced_lang, None, lang_provider.langs_list().all_locale()).to_string();
|
|
||||||
return Self {
|
|
||||||
lang: forced_lang.to_string(),
|
|
||||||
region: None,
|
|
||||||
matched,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// fallback to environment variables
|
// fallback to environment variables
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,8 @@ use crate::config::GeneralConfig;
|
||||||
pub enum Language {
|
pub enum Language {
|
||||||
#[strum(props(Text = "English"))]
|
#[strum(props(Text = "English"))]
|
||||||
English,
|
English,
|
||||||
|
#[strum(props(Text = "British"))]
|
||||||
|
British,
|
||||||
#[strum(props(Text = "Polski"))]
|
#[strum(props(Text = "Polski"))]
|
||||||
Polish,
|
Polish,
|
||||||
#[strum(props(Text = "日本語"))]
|
#[strum(props(Text = "日本語"))]
|
||||||
|
|
@ -26,13 +28,14 @@ pub enum Language {
|
||||||
impl Language {
|
impl Language {
|
||||||
pub const fn code(&self) -> &'static str {
|
pub const fn code(&self) -> &'static str {
|
||||||
match self {
|
match self {
|
||||||
Language::English => "en",
|
Language::English => "en_US",
|
||||||
Language::Polish => "pl",
|
Language::British => "en_GB",
|
||||||
Language::Japanese => "ja",
|
Language::Polish => "pl_PL",
|
||||||
Language::German => "de",
|
Language::Japanese => "ja_JP",
|
||||||
Language::Italian => "it",
|
Language::German => "de_DE",
|
||||||
|
Language::Italian => "it_IT",
|
||||||
Language::ChineseSimplified => "zh_CN",
|
Language::ChineseSimplified => "zh_CN",
|
||||||
Language::Spanish => "es",
|
Language::Spanish => "es_ES",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue