From 5420efa4d35266ba792324435b58eaf4c48ab5d9 Mon Sep 17 00:00:00 2001 From: Aleksander Date: Tue, 31 Mar 2026 21:02:44 +0200 Subject: [PATCH] wayvr: Fix default locale fallback not working properly (regression caused by PR #411) --- dash-frontend/assets/gui/dashboard.xml | 2 +- wayvr/src/backend/openvr/playspace.rs | 3 --- wgui/src/i18n.rs | 2 +- wgui/src/parser/mod.rs | 2 +- wgui/src/parser/widget_image.rs | 3 --- wgui/src/parser/widget_sprite.rs | 3 --- wlx-common/src/locale.rs | 4 ++-- 7 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dash-frontend/assets/gui/dashboard.xml b/dash-frontend/assets/gui/dashboard.xml index 90112e18..7d5a9a4c 100644 --- a/dash-frontend/assets/gui/dashboard.xml +++ b/dash-frontend/assets/gui/dashboard.xml @@ -154,4 +154,4 @@ - \ No newline at end of file + diff --git a/wayvr/src/backend/openvr/playspace.rs b/wayvr/src/backend/openvr/playspace.rs index 66e1409f..830ee9bd 100644 --- a/wayvr/src/backend/openvr/playspace.rs +++ b/wayvr/src/backend/openvr/playspace.rs @@ -83,9 +83,6 @@ impl PlayspaceMover { let offset = (space_transform.transform_vector3a(app.input_state.hmd.translation) - app.input_state.hmd.translation) * -1.0; - let mut overlay_transform = Affine3A::from_rotation_y(-rel_y); - - overlay_transform.translation = offset; space_transform.translation = offset; data.pose *= space_transform; diff --git a/wgui/src/i18n.rs b/wgui/src/i18n.rs index 8fcad26b..08fc6dbd 100644 --- a/wgui/src/i18n.rs +++ b/wgui/src/i18n.rs @@ -174,7 +174,7 @@ fn find_translation<'a>(translation: &str, mut val: &'a serde_json::Value) -> Op impl I18n { pub fn new(asset_provider: &mut dyn AssetProvider, lang_provider: &dyn LangProvider) -> anyhow::Result { let locale = Locale::from_env(lang_provider); - log::info!("Guessed system language: {locale}"); + log::info!("Guessed system language: {locale} (matched: {})", locale.get_matched()); let data_english = asset_provider.load_from_path("lang/en.json")?; let path = format!("lang/{}.json", locale.get_matched()); diff --git a/wgui/src/parser/mod.rs b/wgui/src/parser/mod.rs index 2ed37d82..b5f5fa89 100644 --- a/wgui/src/parser/mod.rs +++ b/wgui/src/parser/mod.rs @@ -252,7 +252,7 @@ impl ParserState { Ok(ctx.data_local) } - /// Instantinate template by saving all the results into the main `ParserState` + /// Instantiate template by saving all the results into the main `ParserState` pub fn instantiate_template( &mut self, doc_params: &ParseDocumentParams, diff --git a/wgui/src/parser/widget_image.rs b/wgui/src/parser/widget_image.rs index 6abdc8e1..f27ed877 100644 --- a/wgui/src/parser/widget_image.rs +++ b/wgui/src/parser/widget_image.rs @@ -60,10 +60,7 @@ pub fn parse_widget_image<'a>( if let Some(glyph) = glyph { params.glyph_data = Some(glyph); - } else { - ctx.print_missing_attrib(tag_name, "src"); } - let (widget, _) = ctx.layout.add_child(parent_id, WidgetImage::create(params), style)?; parse_widget_universal(ctx, &widget, attribs, tag_name); diff --git a/wgui/src/parser/widget_sprite.rs b/wgui/src/parser/widget_sprite.rs index dcab26fe..15ab6846 100644 --- a/wgui/src/parser/widget_sprite.rs +++ b/wgui/src/parser/widget_sprite.rs @@ -51,10 +51,7 @@ pub fn parse_widget_sprite<'a>( if let Some(glyph) = glyph { params.glyph_data = Some(glyph); - } else { - ctx.print_missing_attrib(tag_name, "src"); } - let (widget, _) = ctx.layout.add_child(parent_id, WidgetSprite::create(params), style)?; parse_widget_universal(ctx, &widget, attribs, tag_name); diff --git a/wlx-common/src/locale.rs b/wlx-common/src/locale.rs index 78d814db..337b6a39 100644 --- a/wlx-common/src/locale.rs +++ b/wlx-common/src/locale.rs @@ -9,7 +9,7 @@ use crate::config::GeneralConfig; pub enum Language { #[strum(props(Text = "English"))] English, - #[strum(props(Text = "English(UK)"))] + #[strum(props(Text = "English (UK)"))] British, #[strum(props(Text = "Polski"))] Polish, @@ -28,7 +28,7 @@ pub enum Language { impl Language { pub const fn code(&self) -> &'static str { match self { - Language::English => "en_US", + Language::English => "en", Language::British => "en_GB", Language::Polish => "pl_PL", Language::Japanese => "ja_JP",