fix: init_locale before menu bar, cleanup dead code, harden set_locale

Author: ErshovDmitry

Cargo.lock

@@ -23,7 +23,6 @@ use crate::{auth, report_if_error};
 use ai::workspace::WorkspaceMetadata;
 use csv::Writer;
 use enclose::enclose;
-use i18n;
 use itertools::Itertools;
 use settings::manager::SettingsManager;
 use settings::Setting as _;

app/src/app_menus.rs

@@ -941,6 +941,15 @@ fn run_internal(mut launch_mode: LaunchMode) -> Result<()> {
     let crash_recovery =
         crash_recovery::CrashRecovery::new(&launch_mode, prefs_for_public_settings);
 
+    // ── i18n init ────────────────────────────────────────────────────
+    // Must run before any UI construction (menu bar, windows) so that
+    // platform callbacks see the correct locale from the start.
+    i18n::init_locale();
+    log::info!(
+        "i18n: initialized, active locale: {}",
+        i18n::current_locale()
+    );
+
     // Set up the pty spawner before doing any meaningful work. We want to
     // ensure that the process is in the cleanest possible state (minimal opened
     // files, modified signal handlers, etc.) to avoid unexpected effects on
@@ -1082,11 +1091,6 @@ pub struct UpdateQuakeModeEventArg {
     active_window_id: Option<WindowId>,
 }
 
-// ── i18n readiness ──────────────────────────────────────────────
-
-/// Set to `true` after `warp_i18n::init()` succeeds.
-// i18n is always-on; no feature gate needed.
-
 /// Helper for i18n UI labels.
 /// Looks up the translation key using the user's chosen locale.
 /// Falls back to the provided English string if no translation exists.
@@ -1139,15 +1143,6 @@ pub(crate) fn initialize_app(
     let user_defaults_on_startup = settings::init(startup_toml_parse_error, ctx);
     timer.mark_interval_end("READ_USER_DEFAULTS_AND_INITIALIZE_SETTINGS");
 
-    // ── i18n init ────────────────────────────────────────────────
-    // Locale YAML files live in resources/bundled/locales/.
-    // Locale is detected from WARP_LANG env, system locale, or defaults to en.
-    i18n::init_locale();
-    log::info!(
-        "i18n: initialized, active locale: {}",
-        i18n::current_locale()
-    );
-
     if FeatureFlag::UIZoom.is_enabled() {
         ctx.set_zoom_factor(WindowSettings::as_ref(ctx).zoom_level.as_zoom_factor());
     }

app/src/lib.rs

@@ -7,5 +7,6 @@ publish.workspace = true
 license.workspace = true
 
 [dependencies]
+log = { workspace = true }
 serde_yaml.workspace = true
 sys-locale.workspace = true

crates/i18n/Cargo.toml

@@ -58,6 +58,8 @@ pub fn set_locale(locale: &str) {
 
     if let Ok(mut current_locale) = CURRENT_LOCALE.write() {
         *current_locale = locale;
+    } else {
+        log::error!("i18n: CURRENT_LOCALE lock poisoned, locale not changed");
     }
 }
 
@@ -314,7 +316,7 @@ fn flatten_value(prefix: &str, value: &serde_yaml::Value, translations: &mut Has
                 };
 
                 // Filter out _comment keys so they never appear in lookups.
-                if key == "_comment" && prefix.is_empty() {
+                if key == "_comment" {
                     continue;
                 }
 

crates/i18n/src/lib.rs

@@ -878,7 +878,9 @@ pub enum FeatureFlag {
     /// Enables the code review view for remote sessions.
     RemoteCodeReview,
 
-    /// Enable internationalization (i18n) support with localized UI strings.
+    /// Reserved for future staged rollout of internationalization (i18n) support.
+    /// The i18n system is currently always-on; this flag is unused but kept for
+    /// potential per-user opt-in/opt-out gating.
     I18n,
 }