"Connecting…"
} + let i18n = use_i18n(); + view! {{t!(i18n, connecting)}
} } diff --git a/client_web/src/components/game_screen.rs b/client_web/src/components/game_screen.rs index 6f0e192..b3631d1 100644 --- a/client_web/src/components/game_screen.rs +++ b/client_web/src/components/game_screen.rs @@ -3,6 +3,7 @@ use leptos::prelude::*; use trictrac_store::CheckerMove; use crate::app::{GameUiState, NetCommand}; +use crate::i18n::*; use crate::trictrac::types::{JanEntry, PlayerAction, SerStage, SerTurnStage}; use super::board::Board; @@ -11,7 +12,6 @@ use super::score_panel::PlayerScorePanel; #[allow(dead_code)] /// Returns (d0_used, d1_used) by matching each staged move's distance to a die. -/// Falls back to position order for exit moves (distance doesn't match any die). fn matched_dice_used(staged: &[(u8, u8)], dice: (u8, u8)) -> (bool, bool) { let mut d0 = false; let mut d1 = false; @@ -35,8 +35,6 @@ fn matched_dice_used(staged: &[(u8, u8)], dice: (u8, u8)) -> (bool, bool) { } /// Split `dice_jans` into (viewer_jans, opponent_jans). -/// Entries where the active player scores (total >= 0) go to the active player. -/// Entries where the active player loses (total < 0) go to the opponent, with signs flipped. fn split_jans( dice_jans: &[JanEntry], viewer_is_active: bool, @@ -50,12 +48,10 @@ fn split_jans( } else { theirs.push(JanEntry { total: -e.total, points_per: -e.points_per, ..e.clone() }); } + } else if e.total >= 0 { + theirs.push(e.clone()); } else { - if e.total >= 0 { - theirs.push(e.clone()); - } else { - mine.push(JanEntry { total: -e.total, points_per: -e.points_per, ..e.clone() }); - } + mine.push(JanEntry { total: -e.total, points_per: -e.points_per, ..e.clone() }); } } (mine, theirs) @@ -63,6 +59,8 @@ fn split_jans( #[component] pub fn GameScreen(state: GameUiState) -> impl IntoView { + let i18n = use_i18n(); + let vs = state.view_state.clone(); let player_id = state.player_id; let is_my_turn = vs.active_mp_player == Some(player_id); @@ -96,19 +94,6 @@ pub fn GameScreen(state: GameUiState) -> impl IntoView { } }); - // ── Status text ──────────────────────────────────────────────────────────── - let status = match &vs.stage { - SerStage::Ended => "Game over".to_string(), - SerStage::PreGame => "Waiting for opponent…".to_string(), - SerStage::InGame => match (is_my_turn, &vs.turn_stage) { - (true, SerTurnStage::RollDice) => "Your turn — roll the dice".to_string(), - (true, SerTurnStage::HoldOrGoChoice) => "Hold or Go?".to_string(), - (true, SerTurnStage::Move) => "Select move 1 of 2".to_string(), - (true, _) => "Your turn".to_string(), - (false, _) => "Opponent's turn".to_string(), - }, - }; - let dice = vs.dice; let show_dice = dice != (0, 0); @@ -122,19 +107,34 @@ pub fn GameScreen(state: GameUiState) -> impl IntoView { // ── Jan split: viewer_jans / opponent_jans ───────────────────────────────── let (my_jans, opp_jans) = split_jans(&vs.dice_jans, is_my_turn); - // ── Scores: index = mp_player_id ────────────────────────────────────────── + // ── Scores ───────────────────────────────────────────────────────────────── let my_score = vs.scores[player_id as usize].clone(); let opp_score = vs.scores[1 - player_id as usize].clone(); + // ── Capture for closures ─────────────────────────────────────────────────── + let stage = vs.stage.clone(); + let turn_stage = vs.turn_stage.clone(); + let room_id = state.room_id.clone(); + view! {{err}
})} @@ -35,7 +48,7 @@ pub fn LoginScreen(error: Option