From 20e36645583df0d9d1c275af42f3678081bd6ca9 Mon Sep 17 00:00:00 2001 From: Albert Bogusz Date: Sat, 6 Jun 2026 14:24:10 +0100 Subject: [PATCH 1/2] Change "Ok" to "OK" in UI --- crates/auto_update/src/auto_update.rs | 4 ++-- crates/git_ui/src/git_panel.rs | 4 ++-- crates/gpui/examples/window.rs | 2 +- crates/gpui/src/platform.rs | 2 +- crates/install_cli/src/install_cli_binary.rs | 2 +- crates/onboarding/src/onboarding.rs | 4 ++-- crates/recent_projects/src/recent_projects.rs | 4 ++-- crates/recent_projects/src/remote_servers.rs | 6 +++--- crates/ui/src/components/notification/alert_modal.rs | 2 +- crates/workspace/src/notifications.rs | 2 +- crates/workspace/src/workspace.rs | 2 +- crates/zed/src/zed.rs | 2 +- crates/zed/src/zed/move_to_applications.rs | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs index 15afca8e8b6929..ea5eb01f837dbf 100644 --- a/crates/auto_update/src/auto_update.rs +++ b/crates/auto_update/src/auto_update.rs @@ -281,7 +281,7 @@ pub fn check(_: &Check, window: &mut Window, cx: &mut App) { gpui::PromptLevel::Info, "Zed was installed via a package manager.", Some(&message), - &["Ok"], + &["OK"], cx, )); return; @@ -301,7 +301,7 @@ pub fn check(_: &Check, window: &mut Window, cx: &mut App) { gpui::PromptLevel::Info, "Could not check for updates", Some("Auto-updates disabled for non-bundled app."), - &["Ok"], + &["OK"], cx, )); } diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs index 8dd47948a897ae..4fffe0da4a414b 100644 --- a/crates/git_ui/src/git_panel.rs +++ b/crates/git_ui/src/git_panel.rs @@ -2275,7 +2275,7 @@ impl GitPanel { return; }; let error_spawn = |message, window: &mut Window, cx: &mut App| { - let prompt = window.prompt(PromptLevel::Warning, message, None, &["Ok"], cx); + let prompt = window.prompt(PromptLevel::Warning, message, None, &["OK"], cx); cx.spawn(async move |_| { prompt.await.ok(); }) @@ -2952,7 +2952,7 @@ impl GitPanel { PromptLevel::Warning, "Unable to initialize a git repository", Some("Open a directory first"), - &["Ok"], + &["OK"], cx, ); cx.background_executor() diff --git a/crates/gpui/examples/window.rs b/crates/gpui/examples/window.rs index c51f43fe66deff..959ea4981c49b4 100644 --- a/crates/gpui/examples/window.rs +++ b/crates/gpui/examples/window.rs @@ -272,7 +272,7 @@ impl Render for WindowDemo { PromptLevel::Info, "Are you sure?", None, - &["Ok", "Cancel"], + &["OK", "Cancel"], cx, ); diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs index fad863d9ff3df9..06072b0d5e61e6 100644 --- a/crates/gpui/src/platform.rs +++ b/crates/gpui/src/platform.rs @@ -1796,7 +1796,7 @@ impl PromptButton { impl From<&str> for PromptButton { fn from(value: &str) -> Self { match value.to_lowercase().as_str() { - "ok" => PromptButton::Ok("Ok".into()), + "ok" => PromptButton::Ok("OK".into()), "cancel" => PromptButton::Cancel("Cancel".into()), _ => PromptButton::Other(SharedString::from(value.to_owned())), } diff --git a/crates/install_cli/src/install_cli_binary.rs b/crates/install_cli/src/install_cli_binary.rs index 4c6d8cde40ca3b..ee8b8b2b669b05 100644 --- a/crates/install_cli/src/install_cli_binary.rs +++ b/crates/install_cli/src/install_cli_binary.rs @@ -70,7 +70,7 @@ pub fn install_cli_binary(window: &mut Window, cx: &mut Context) { PromptLevel::Warning, "CLI should already be installed", Some(LINUX_PROMPT_DETAIL), - &["Ok"], + &["OK"], ); cx.background_spawn(prompt).detach(); return Ok(()); diff --git a/crates/onboarding/src/onboarding.rs b/crates/onboarding/src/onboarding.rs index 3f1509b922eda4..4c9c11e8264a7f 100644 --- a/crates/onboarding/src/onboarding.rs +++ b/crates/onboarding/src/onboarding.rs @@ -485,7 +485,7 @@ pub async fn handle_import_vscode_settings( gpui::PromptLevel::Info, &format!("Could not find or load a {source} settings file"), None, - &["Ok"], + &["OK"], ); return; } @@ -501,7 +501,7 @@ pub async fn handle_import_vscode_settings( truncate_and_remove_front(&vscode_settings.path.to_string_lossy(), 128), ), None, - &["Ok", "Cancel"], + &["OK", "Cancel"], ); let result = cx.spawn(async move |_| prompt.await.ok()).await; if result != Some(0) { diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs index 4abfc9ccd3a2a3..22b07679f962df 100644 --- a/crates/recent_projects/src/recent_projects.rs +++ b/crates/recent_projects/src/recent_projects.rs @@ -348,7 +348,7 @@ pub fn init(cx: &mut App) { Please note that Zed currently does not support opening network share folders inside wsl. "#}; - let _ = cx.prompt(gpui::PromptLevel::Critical, "Invalid path", Some(&message), &["Ok"]).await; + let _ = cx.prompt(gpui::PromptLevel::Critical, "Invalid path", Some(&message), &["OK"]).await; return; } @@ -492,7 +492,7 @@ pub fn init(cx: &mut App) { gpui::PromptLevel::Critical, "Cannot open Dev Container from remote project", None, - &["Ok"], + &["OK"], ) .await .ok(); diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs index fefc8e1fad4506..7dc53a55a96a42 100644 --- a/crates/recent_projects/src/remote_servers.rs +++ b/crates/recent_projects/src/remote_servers.rs @@ -1780,7 +1780,7 @@ impl RemoteServerProjects { gpui::PromptLevel::Critical, "Failed to connect", Some(&e.to_string()), - &["Ok"], + &["OK"], ) .await .ok(); @@ -2075,7 +2075,7 @@ impl RemoteServerProjects { gpui::PromptLevel::Critical, "Failed to start Dev Container. See logs for details", Some(&format!("{e}")), - &["Ok"], + &["OK"], ) .await .ok(); @@ -2130,7 +2130,7 @@ impl RemoteServerProjects { gpui::PromptLevel::Critical, "Failed to connect", Some(&e.to_string()), - &["Ok"], + &["OK"], ) .await .ok(); diff --git a/crates/ui/src/components/notification/alert_modal.rs b/crates/ui/src/components/notification/alert_modal.rs index 5c368a9a7457da..0a82a309aca5bd 100644 --- a/crates/ui/src/components/notification/alert_modal.rs +++ b/crates/ui/src/components/notification/alert_modal.rs @@ -141,7 +141,7 @@ impl RenderOnce for AlertModal { if let Some(footer) = self.footer { modal = modal.child(footer); } else if has_default_footer { - let primary_action = self.primary_action.unwrap_or_else(|| "Ok".into()); + let primary_action = self.primary_action.unwrap_or_else(|| "OK".into()); let dismiss_label = self.dismiss_label.unwrap_or_else(|| "Cancel".into()); modal = modal.child( diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs index e7a1dbd5e09c72..44ef14ccf48310 100644 --- a/crates/workspace/src/notifications.rs +++ b/crates/workspace/src/notifications.rs @@ -1256,7 +1256,7 @@ where display.push('.'); } let detail = f(err, window, cx).unwrap_or(display); - window.prompt(PromptLevel::Critical, &msg, Some(&detail), &["Ok"], cx) + window.prompt(PromptLevel::Critical, &msg, Some(&detail), &["OK"], cx) }) { prompt.await.ok(); } diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index a1b588988b10b6..d316fe3fe8ac52 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -9641,7 +9641,7 @@ pub fn join_channel( PromptLevel::Critical, "Failed to join channel", Some(&detail), - &["Ok"], + &["OK"], cx, ) })? diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs index 55644986147b61..8fcdf62cc364bf 100644 --- a/crates/zed/src/zed.rs +++ b/crates/zed/src/zed.rs @@ -1485,7 +1485,7 @@ fn open_about_window(cx: &mut App) { window.remove_window(); })) .child( - Button::new("ok", "Ok") + Button::new("ok", "OK") .full_width() .style(ButtonStyle::OutlinedGhost) .toggle_state(ok_is_focused) diff --git a/crates/zed/src/zed/move_to_applications.rs b/crates/zed/src/zed/move_to_applications.rs index 10bd4b80472353..329e49fb81c624 100644 --- a/crates/zed/src/zed/move_to_applications.rs +++ b/crates/zed/src/zed/move_to_applications.rs @@ -105,7 +105,7 @@ impl MoveToApplicationsRequest { PromptLevel::Critical, "Failed to move Zed to Applications", Some(&error.to_string()), - &["Ok"], + &["OK"], ) .await .log_err(); From afd3fbdd48fde2eb3e815d60b0f1bc0759cfb752 Mon Sep 17 00:00:00 2001 From: Danilo Leal Date: Mon, 8 Jun 2026 11:36:02 -0300 Subject: [PATCH 2/2] Improve the onboarding case specifically --- crates/onboarding/src/onboarding.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/onboarding/src/onboarding.rs b/crates/onboarding/src/onboarding.rs index 4c9c11e8264a7f..a0aa0b9811ff14 100644 --- a/crates/onboarding/src/onboarding.rs +++ b/crates/onboarding/src/onboarding.rs @@ -501,7 +501,7 @@ pub async fn handle_import_vscode_settings( truncate_and_remove_front(&vscode_settings.path.to_string_lossy(), 128), ), None, - &["OK", "Cancel"], + &["Import", "Cancel"], ); let result = cx.spawn(async move |_| prompt.await.ok()).await; if result != Some(0) {