From ad0893ec8bac49972051f372d5a85ccf98f07a52 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Sun, 26 Feb 2023 15:07:40 +0200 Subject: [PATCH] fix(i18n): changed format of selected launcher language in config file --- src/i18n.rs | 2 +- src/ui/preferences/general.rs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/i18n.rs b/src/i18n.rs index 581642e..3a5d134 100644 --- a/src/i18n.rs +++ b/src/i18n.rs @@ -53,7 +53,7 @@ pub fn get_default_lang() -> LanguageIdentifier { lang.parse().unwrap_or_else(|_| langid!("en-us")) } -pub fn format_lang(lang: LanguageIdentifier) -> String { +pub fn format_lang(lang: &LanguageIdentifier) -> String { let mut formatted = lang.language.to_string(); if let Some(region) = lang.region { diff --git a/src/ui/preferences/general.rs b/src/ui/preferences/general.rs index 6ac2ad6..fff3ca0 100644 --- a/src/ui/preferences/general.rs +++ b/src/ui/preferences/general.rs @@ -182,10 +182,9 @@ impl SimpleAsyncComponent for GeneralApp { connect_selected_notify => move |row| { if is_ready() { if let Ok(mut config) = config::get() { - config.launcher.language = SUPPORTED_LANGUAGES + config.launcher.language = crate::i18n::format_lang(SUPPORTED_LANGUAGES .get(row.selected() as usize) - .unwrap_or(&SUPPORTED_LANGUAGES[0]) - .language.to_string(); + .unwrap_or(&SUPPORTED_LANGUAGES[0])); config::update(config); }