i18n: snake_case helpers, section comments, menu_label tests

ErshovDmitry · ErshovDmitry · commit 79020f80bed0 · 2026-05-29T21:32:34.000+07:00
- Rename 11 const-&gt;fn helpers to snake_case (0 warnings)
- Add i18n section comments in ai_page and agent_management
- Add 4 menu_label unit tests (all pass)
- Clean commit ready for push
diff --git a/app/src/ai/agent_management/view.rs b/app/src/ai/agent_management/view.rs
@@ -113,9 +113,12 @@ const BUTTON_SIZE: f32 = 20.;
 const CARD_AGENT_ICON_SIZE: f32 = 24.;
 const CREATOR_AVATAR_FONT_SIZE: f32 = 10.;
 
-fn SESSION_EXPIRED_TEXT() -> &'static str {
+// ── i18n helpers ──────────────────────────────────────────────────────
+// Converted from `const` to `fn` so translation can happen at runtime.
+fn session_expired_text() -> &'static str {
     crate::menu_label("agent.session_expired.tooltip", "Sessions expire after one week and cannot be opened.")
 }
+// ───────────────────────────────────────────────────────────────────────
 
 pub fn init(app: &mut AppContext) {
     use crate::util::bindings::cmd_or_ctrl_shift;
@@ -1508,7 +1511,7 @@ impl AgentManagementView {
 
         // Early return if session is available - no status label rendered
         let (label_text, tooltip_text_opt) = match session_status {
-            SessionStatus::Expired => (crate::menu_label("agent.session_expired", "Session expired"), Some(SESSION_EXPIRED_TEXT())),
+            SessionStatus::Expired => (crate::menu_label("agent.session_expired", "Session expired"), Some(session_expired_text())),
             SessionStatus::Unavailable => (crate::menu_label("agent.no_session", "No session available"), None),
             SessionStatus::Available => return Empty::new().finish(),
         };
diff --git a/app/src/lib.rs b/app/src/lib.rs
@@ -1087,6 +1087,43 @@ pub(crate) fn menu_label(key: &str, fallback: &str) -> &'static str {
         },
     }
 }
+
+#[cfg(test)]
+mod menu_label_tests {
+    use super::*;
+
+    #[test]
+    fn test_menu_label_returns_static_str() {
+        // Verify that menu_label returns a reference that lives long enough
+        let label: &'static str = menu_label("test.key", "fallback");
+        assert!(!label.is_empty());
+    }
+
+    #[test]
+    fn test_menu_label_fallback_for_missing_key() {
+        // When key doesn't exist in any locale, should return the fallback
+        let result = menu_label("nonexistent.key.12345", "Fallback text");
+        assert_eq!(result, "Fallback text");
+    }
+
+    #[test]
+    fn test_menu_label_english_fallback() {
+        // English locale should return the English translation
+        i18n::set_locale("en");
+        let label = menu_label("agent.filter.all", "All");
+        // Should return the key's value from en.yml, or the fallback
+        assert!(!label.is_empty());
+    }
+
+    #[test]
+    fn test_menu_label_consistency() {
+        // Same key should return the same reference repeatedly
+        let a = menu_label("agent.filter.all", "All");
+        let b = menu_label("agent.filter.all", "All");
+        assert_eq!(a, b);
+    }
+}
+
 pub(crate) fn initialize_app(
     launch_mode: &LaunchMode,
     mut timer: IntervalTimer,
diff --git a/app/src/settings_view/ai_page.rs b/app/src/settings_view/ai_page.rs
@@ -153,24 +153,28 @@ const AI_SETTINGS_DROPDOWN_MAX_HEIGHT: f32 = 250.;
 const CONTEXT_WINDOW_SLIDER_WIDTH: f32 = 220.;
 const CONTEXT_WINDOW_INPUT_BOX_WIDTH: f32 = 120.;
 
-fn NEXT_COMMAND_DESCRIPTION() -> &'static str {
+// ── i18n helpers ──────────────────────────────────────────────────────
+// Converted from `const` to `fn` so translation can happen at runtime.
+fn next_command_description() -> &'static str {
     crate::menu_label("settings.ai.next_command_description", "Let AI suggest the next command to run based on your command history, outputs, and common workflows.")
 }
-fn PROMPT_SUGGESTIONS_DESCRIPTION() -> &'static str {
+fn prompt_suggestions_description() -> &'static str {
     crate::menu_label("settings.ai.prompt_suggestions_description", "Let AI suggest natural language prompts, as inline banners in the input, based on recent commands and their outputs.")
 }
-fn SUGGESTED_CODE_BANNERS_DESCRIPTION() -> &'static str {
+fn suggested_code_banners_description() -> &'static str {
     crate::menu_label("settings.ai.suggested_code_banners_description", "Let AI suggest code diffs and queries as inline banners in the blocklist, based on recent commands and their outputs.")
 }
-fn NATURAL_LANGUAGE_AUTOSUGGESTIONS() -> &'static str {
+fn natural_language_autosuggestions() -> &'static str {
     crate::menu_label("settings.ai.natural_language_autosuggestions_description", "Let AI suggest natural language autosuggestions, based on recent commands and their outputs.")
 }
-fn SHARED_BLOCK_TITLE_GENERATION_DESCRIPTION() -> &'static str {
+fn shared_block_title_generation_description() -> &'static str {
     crate::menu_label("settings.ai.shared_block_title_generation_description", "Let AI generate a title for your shared block based on the command and output.")
 }
-fn GIT_OPERATIONS_AUTOGEN_DESCRIPTION() -> &'static str {
+fn git_operations_autogen_description() -> &'static str {
     crate::menu_label("settings.ai.git_operations_autogen_description", "Let AI generate commit messages and pull request titles and descriptions.")
 }
+// ───────────────────────────────────────────────────────────────────────
+
 const WISPR_FLOW_URL: &str = "https://wisprflow.ai/";
 const CUSTOM_INFERENCE_LEARN_MORE_URL: &str =
     "https://docs.warp.dev/support-and-community/plans-and-billing/bring-your-own-api-key/";
@@ -4350,7 +4354,7 @@ impl ActiveAIWidget {
                 ),
             )
             .with_child(render_ai_setting_description(
-                NEXT_COMMAND_DESCRIPTION(),
+                next_command_description(),
                 is_toggleable,
                 app,
             ))
@@ -4377,7 +4381,7 @@ impl ActiveAIWidget {
                 ),
             )
             .with_child(render_ai_setting_description(
-                PROMPT_SUGGESTIONS_DESCRIPTION(),
+                prompt_suggestions_description(),
                 is_toggleable,
                 app,
             ))
@@ -4404,7 +4408,7 @@ impl ActiveAIWidget {
                 ),
             )
             .with_child(render_ai_setting_description(
-                SUGGESTED_CODE_BANNERS_DESCRIPTION(),
+                suggested_code_banners_description(),
                 is_toggleable,
                 app,
             ))
@@ -4431,7 +4435,7 @@ impl ActiveAIWidget {
                 app,
             ))
             .with_child(render_ai_setting_description(
-                NATURAL_LANGUAGE_AUTOSUGGESTIONS(),
+                natural_language_autosuggestions(),
                 is_toggleable,
                 app,
             ))
@@ -4458,7 +4462,7 @@ impl ActiveAIWidget {
                 ),
             )
             .with_child(render_ai_setting_description(
-                SHARED_BLOCK_TITLE_GENERATION_DESCRIPTION(),
+                shared_block_title_generation_description(),
                 is_toggleable,
                 app,
             ))
@@ -4483,7 +4487,7 @@ impl ActiveAIWidget {
                 app,
             ))
             .with_child(render_ai_setting_description(
-                GIT_OPERATIONS_AUTOGEN_DESCRIPTION(),
+                git_operations_autogen_description(),
                 is_toggleable,
                 app,
             ))
diff --git a/app/src/workspace/view.rs b/app/src/workspace/view.rs
@@ -535,7 +535,7 @@ const TAB_BAR_PILL_WIDTH: f32 = 100.;
 const PILL_FONT_SIZE: f32 = 12.;
 // We use the word "Warp" in the Update Ready button to make it obvious that the terminal is Warp.
 // This can lead to free advertising when users screen-share Warp when an update is available.
-fn UPDATE_READY_TEXT() -> &'static str {
+fn update_ready_text() -> &'static str {
     crate::menu_label("workspace.update_warp", "Update Warp")
 }
 
@@ -564,11 +564,11 @@ const ELLIPSE_SVG_PATH: &str = "bundled/svg/ellipse.svg";
 
 const AI_ASSISTANT_BUTTON_ID: &str = "workspace_view:ai_assistant_button";
 
-fn VERSION_DEPRECATION_BANNER_TEXT() -> &'static str {
+fn version_deprecation_banner_text() -> &'static str {
     crate::menu_label("workspace.version_deprecation", "Your app is out of date and some features may not work as expected. Please update immediately.")
 }
 
-fn VERSION_DEPRECATION_WITHOUT_PERMISSIONS_BANNER_TEXT() -> &'static str {
+fn version_deprecation_without_permissions_banner_text() -> &'static str {
     crate::menu_label("workspace.version_deprecation_without_permissions", "Some Warp features may not work as expected without updating immediately, but Warp is unable to perform the update.")
 }
 
@@ -584,7 +584,7 @@ const NEW_SESSION_SIDECAR_SEARCH_BOX_HORIZONTAL_PADDING: f32 = 12.;
 const NEW_SESSION_SIDECAR_SEARCH_BOX_VERTICAL_PADDING: f32 = 6.;
 const NEW_SESSION_SIDECAR_FOOTER_HORIZONTAL_PADDING: f32 = 16.;
 const NEW_SESSION_SIDECAR_FOOTER_VERTICAL_PADDING: f32 = 8.;
-fn SESSION_CONFIG_TAB_CONFIG_CHIP_TEXT() -> &'static str {
+fn session_config_tab_config_chip_text() -> &'static str {
     crate::menu_label("workspace.tab_configs_chip", "Access your tab configs here.")
 }
 const SESSION_CONFIG_TAB_CONFIG_CHIP_WIDTH: f32 = 206.;
@@ -2376,7 +2376,7 @@ impl Workspace {
         .finish();
 
         let text = Text::new_inline(
-            SESSION_CONFIG_TAB_CONFIG_CHIP_TEXT().to_string(),
+            session_config_tab_config_chip_text().to_string(),
             appearance.ui_font_family(),
             12.,
         )
@@ -19553,7 +19553,7 @@ impl Workspace {
                     Flex::row()
                         .with_child(
                             Text::new_inline(
-                                UPDATE_READY_TEXT(),
+                                update_ready_text(),
                                 appearance.ui_font_family(),
                                 PILL_FONT_SIZE,
                             )
@@ -19808,7 +19808,7 @@ impl Workspace {
                 {
                     let description =
                         if is_incoming_version_past_current(new_version.soft_cutoff.as_deref()) {
-                            VERSION_DEPRECATION_WITHOUT_PERMISSIONS_BANNER_TEXT().to_owned()
+                            version_deprecation_without_permissions_banner_text().to_owned()
                         } else {
                             crate::menu_label("workspace.unable_update_new_version", "A new version is available but Warp is unable to perform the update.")
                                 .to_owned()
@@ -19834,7 +19834,7 @@ impl Workspace {
                 {
                     let description =
                         if is_incoming_version_past_current(new_version.soft_cutoff.as_deref()) {
-                            VERSION_DEPRECATION_WITHOUT_PERMISSIONS_BANNER_TEXT().to_owned()
+                            version_deprecation_without_permissions_banner_text().to_owned()
                         } else {
                             crate::menu_label("workspace.unable_launch_new_version", "Warp was unable to launch the new installed version.").to_owned()
                         };
@@ -19861,7 +19861,7 @@ impl Workspace {
                             banner_type: WorkspaceBanner::VersionDeprecated,
                             severity: BannerSeverity::Error,
                             heading: None,
-                            description: VERSION_DEPRECATION_BANNER_TEXT().to_string(),
+                            description: version_deprecation_banner_text().to_string(),
                             secondary_button: None,
                             button: Some(WorkspaceBannerButtonDetails {
                                 text: crate::menu_label("workspace.update_now", "Update now").to_string(),
