Skip to content

Change "Ok" to "OK" in UI #58744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danilo-leal merged 2 commits into from
Jun 8, 2026
Merged

Change "Ok" to "OK" in UI #58744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20e3664
Change "Ok" to "OK" in UI
albertbogusz Jun 6, 2026
afd3fbd
Improve the onboarding case specifically
danilo-leal Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/auto_update/src/auto_update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
));
}
Expand Down
4 changes: 2 additions & 2 deletions crates/git_ui/src/git_panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
})
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion crates/gpui/examples/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ impl Render for WindowDemo {
PromptLevel::Info,
"Are you sure?",
None,
&["Ok", "Cancel"],
&["OK", "Cancel"],
cx,
);

Expand Down
2 changes: 1 addition & 1 deletion crates/gpui/src/platform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())),
}
Expand Down
2 changes: 1 addition & 1 deletion crates/install_cli/src/install_cli_binary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub fn install_cli_binary(window: &mut Window, cx: &mut Context<Workspace>) {
PromptLevel::Warning,
"CLI should already be installed",
Some(LINUX_PROMPT_DETAIL),
&["Ok"],
&["OK"],
);
cx.background_spawn(prompt).detach();
return Ok(());
Expand Down
4 changes: 2 additions & 2 deletions crates/onboarding/src/onboarding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions crates/recent_projects/src/recent_projects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions crates/recent_projects/src/remote_servers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1780,7 +1780,7 @@ impl RemoteServerProjects {
gpui::PromptLevel::Critical,
"Failed to connect",
Some(&e.to_string()),
&["Ok"],
&["OK"],
)
.await
.ok();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -2130,7 +2130,7 @@ impl RemoteServerProjects {
gpui::PromptLevel::Critical,
"Failed to connect",
Some(&e.to_string()),
&["Ok"],
&["OK"],
)
.await
.ok();
Expand Down
2 changes: 1 addition & 1 deletion crates/ui/src/components/notification/alert_modal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion crates/workspace/src/notifications.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion crates/workspace/src/workspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9641,7 +9641,7 @@ pub fn join_channel(
PromptLevel::Critical,
"Failed to join channel",
Some(&detail),
&["Ok"],
&["OK"],
cx,
)
})?
Expand Down
2 changes: 1 addition & 1 deletion crates/zed/src/zed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion crates/zed/src/zed/move_to_applications.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ impl MoveToApplicationsRequest {
PromptLevel::Critical,
"Failed to move Zed to Applications",
Some(&error.to_string()),
&["Ok"],
&["OK"],
)
.await
.log_err();
Expand Down
Loading