mirror of
https://github.com/stablyai/orca.git
synced 2026-11-19 04:23:57 +00:00
fix(desktop): SHORT-VERBS dialog primary buttons are a short verb; the title carries the context
Neil: a dialog's confirm/primary button is one word where possible. Swept the dialogs added or
changed on cloud/integration (DialogFooter / AlertDialog / confirm({ confirmLabel })):
Changed (button, was -> now):
- Move to this computer: "Move to this computer" -> "Move" (computer icon kept; title unchanged)
- Delete sandbox / VM (VmDeleteConfirmDialog): "Delete sandbox" / "Delete VM" -> "Delete" (new key;
the build-failure card's own "Delete sandbox" button is unchanged), "Keep it" -> "Keep"
- Cloud environment: "Use this build" -> "Use"; Import from repo: "Apply to draft" -> "Apply"
- Mirror to this computer (sync section): "Remove copy" -> "Remove"
- Share a port: "Create public link" / "Create link" -> "Create"
- API keys: "Create key" -> "Create", "Revoke key" -> "Revoke"; Approve app: "Generate code" ->
"Generate", "Generate a new code" -> "Regenerate"
- Routines: "Create routine" -> "Create", "Save changes" -> "Save", "Delete routine" -> "Delete"
- Agent API key remove: "Remove {{name}}" -> "Remove"
- orca.yaml trust: "Run hooks" -> "Run"; setup script review: "Save local setup" -> "Save"
- Local command approval: "Always allow this command" -> "Always allow" (its scope line stays)
- Skill share: "Publish skill" / "Publish bundle" / "Publish new version" -> "Publish"
Kept (no one-word form without losing meaning): "Sign out", "Turn on", "Make private",
"Make owner", "Allow once", "Add line and open" (adds an SSH config line, then opens), "Cancel
upload", and the Claude account switch's "Restart N sessions" (the count is the live selection).
Already short: delete-workspace Archive / Delete (#814).
This commit is contained in:
@@ -283,7 +283,7 @@ function CloudEnvironmentController({
|
||||
'New workspaces will start from build #{{number}}. Existing workspaces keep theirs.',
|
||||
{ number: String(build.number) }
|
||||
),
|
||||
confirmLabel: t('cloudEnvironment.activate.confirm', 'Use this build')
|
||||
confirmLabel: t('cloudEnvironment.activate.confirm', 'Use')
|
||||
}).then((accepted) => {
|
||||
if (accepted) {
|
||||
void env.activate(build)
|
||||
|
||||
@@ -196,7 +196,7 @@ function ImportReviewContent({
|
||||
})
|
||||
}
|
||||
>
|
||||
{t('cloudEnvironment.import.apply', 'Apply to draft')}
|
||||
{t('cloudEnvironment.import.apply', 'Apply')}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
|
||||
@@ -231,7 +231,7 @@ export function LocalCommandApprovalDialogView({
|
||||
disabled={disabled}
|
||||
onClick={() => onDecide('always-allow')}
|
||||
>
|
||||
{t('localCommands.prompt.alwaysAllow', 'Always allow this command')}
|
||||
{t('localCommands.prompt.alwaysAllow', 'Always allow')}
|
||||
</Button>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent side="top" sideOffset={4}>
|
||||
|
||||
@@ -155,7 +155,7 @@ export function CloudMoveToComputerView({
|
||||
</Button>
|
||||
<Button ref={primary} size="sm" onClick={onConfirm}>
|
||||
<Monitor />
|
||||
{t('orcaCloudMove.confirm.action', 'Move to this computer')}
|
||||
{t('orcaCloudMove.confirm.action', 'Move')}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -226,7 +226,7 @@ export function CloudWorkspaceSyncSection({
|
||||
defaultValue_one: '{{count}} changed file on this computer will be removed.'
|
||||
}
|
||||
),
|
||||
confirmLabel: t('orcaCloudSync.removeCopy', 'Remove copy'),
|
||||
confirmLabel: t('orcaCloudSync.removeCopy', 'Remove'),
|
||||
confirmVariant: 'destructive',
|
||||
initialFocus: 'cancel'
|
||||
})
|
||||
|
||||
@@ -356,8 +356,8 @@ export function SharePortDialog({
|
||||
>
|
||||
{creating && <Loader2 className="size-4 animate-spin motion-reduce:animate-none" />}
|
||||
{audience === 'public'
|
||||
? t('auto.components.right.sidebar.CloudShare.createPublic', 'Create public link')
|
||||
: t('auto.components.right.sidebar.CloudShare.create', 'Create link')}
|
||||
? t('auto.components.right.sidebar.CloudShare.createPublic', 'Create')
|
||||
: t('auto.components.right.sidebar.CloudShare.create', 'Create')}
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -140,7 +140,7 @@ export function AgentApiKeyRemoveFromAccountConfirm({
|
||||
return (
|
||||
<div
|
||||
role="group"
|
||||
aria-label={t('agentApiKeys.remove.confirmLabel', 'Remove {{name}}', {
|
||||
aria-label={t('agentApiKeys.remove.confirmLabel', 'Remove', {
|
||||
name: envName
|
||||
})}
|
||||
className="ml-[22px] space-y-2 rounded-md border border-border bg-muted/40 px-3 py-2 text-xs"
|
||||
|
||||
@@ -235,8 +235,8 @@ export function ApproveAppDialog({
|
||||
>
|
||||
{busy ? <Loader2 className="animate-spin motion-reduce:animate-none" /> : null}
|
||||
{expired
|
||||
? t('auto.components.settings.cloudApi.approve.regenerate', 'Generate a new code')
|
||||
: t('auto.components.settings.cloudApi.approve.generate', 'Generate code')}
|
||||
? t('auto.components.settings.cloudApi.approve.regenerate', 'Regenerate')
|
||||
: t('auto.components.settings.cloudApi.approve.generate', 'Generate')}
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -323,7 +323,7 @@ export function CloudApiKeysView(props: CloudApiKeysViewProps): React.JSX.Elemen
|
||||
) : null}
|
||||
</>
|
||||
}
|
||||
confirmLabel={t('auto.components.settings.cloudApi.revoke.confirm', 'Revoke key')}
|
||||
confirmLabel={t('auto.components.settings.cloudApi.revoke.confirm', 'Revoke')}
|
||||
returnFocusTo={focusAfterRevoke}
|
||||
onConfirm={async () => {
|
||||
if (!revoking) {
|
||||
|
||||
@@ -232,7 +232,7 @@ export function CloudRoutinesView(props: CloudRoutinesViewProps): React.JSX.Elem
|
||||
)}
|
||||
</p>
|
||||
}
|
||||
confirmLabel={t('auto.components.settings.cloudRoutines.delete.confirm', 'Delete routine')}
|
||||
confirmLabel={t('auto.components.settings.cloudRoutines.delete.confirm', 'Delete')}
|
||||
returnFocusTo={() => {
|
||||
// The deleted row is gone: land on the next row's Run now, else New routine.
|
||||
if (
|
||||
|
||||
@@ -310,7 +310,7 @@ function FormStep({
|
||||
) : (
|
||||
<KeyRound />
|
||||
)}
|
||||
{t('auto.components.settings.cloudApi.create.submit', 'Create key')}
|
||||
{t('auto.components.settings.cloudApi.create.submit', 'Create')}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</form>
|
||||
|
||||
@@ -374,8 +374,8 @@ function EditorForm({
|
||||
<Button type="submit" size="sm" aria-disabled={submitting} aria-busy={submitting}>
|
||||
{submitting ? <Loader2 className="animate-spin motion-reduce:animate-none" /> : null}
|
||||
{routine
|
||||
? t('auto.components.settings.cloudRoutines.editor.save', 'Save changes')
|
||||
: t('auto.components.settings.cloudRoutines.editor.create', 'Create routine')}
|
||||
? t('auto.components.settings.cloudRoutines.editor.save', 'Save')
|
||||
: t('auto.components.settings.cloudRoutines.editor.create', 'Create')}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</div>
|
||||
|
||||
@@ -86,7 +86,7 @@ async function approveWithAlwaysTrust(): Promise<void> {
|
||||
act(() => {
|
||||
document.body.querySelector<HTMLInputElement>('input[type="checkbox"]')?.click()
|
||||
})
|
||||
clickButton('Run hooks')
|
||||
clickButton('Run')
|
||||
}
|
||||
|
||||
describe('OrcaYamlTrustDialog Always trust', () => {
|
||||
@@ -126,7 +126,7 @@ describe('OrcaYamlTrustDialog created branch review', () => {
|
||||
serveSetupScript('pnpm install')
|
||||
const primary = confirmSetup()
|
||||
await waitForPrompt()
|
||||
clickButton('Run hooks')
|
||||
clickButton('Run')
|
||||
await expect(primary).resolves.toBe('run')
|
||||
const primaryHash = useAppStore.getState().trustedOrcaHooks['repo-1']?.setup?.contentHash
|
||||
|
||||
@@ -140,7 +140,7 @@ describe('OrcaYamlTrustDialog created branch review', () => {
|
||||
const review = reviewBranch()
|
||||
await waitForPrompt()
|
||||
expect(document.body.textContent).toContain('pnpm install && pnpm build')
|
||||
clickButton('Run hooks')
|
||||
clickButton('Run')
|
||||
const approval = await review
|
||||
expect(approval.decision).toBe('run')
|
||||
|
||||
|
||||
@@ -372,7 +372,7 @@ const OrcaYamlTrustDialog = React.memo(function OrcaYamlTrustDialog() {
|
||||
</Button>
|
||||
<Button onClick={() => resolveAndClose('run')}>
|
||||
{reviewCopy?.confirmLabel ??
|
||||
t('auto.components.sidebar.OrcaYamlTrustDialog.f3e2b868fb', 'Run hooks')}
|
||||
t('auto.components.sidebar.OrcaYamlTrustDialog.f3e2b868fb', 'Run')}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
|
||||
@@ -144,7 +144,7 @@ export function SetupScriptReviewDialog({
|
||||
<Download className="size-3.5" />
|
||||
)}
|
||||
<span className={cn(isSaving && 'text-muted-foreground')}>
|
||||
{t('auto.components.sidebar.SetupScriptReviewDialog.save', 'Save local setup')}
|
||||
{t('auto.components.sidebar.SetupScriptReviewDialog.save', 'Save')}
|
||||
</span>
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
|
||||
@@ -352,10 +352,10 @@ export function SkillShareDialog({
|
||||
>
|
||||
<Share2 className="size-4" />
|
||||
{publishingNewVersion
|
||||
? t('auto.components.skills.SkillShareDialog.7aa4ba0dba', 'Publish new version')
|
||||
? t('auto.components.skills.SkillShareDialog.7aa4ba0dba', 'Publish')
|
||||
: selectedSkills.length > 1
|
||||
? t('auto.components.skills.SkillShareDialog.publishBundle', 'Publish bundle')
|
||||
: t('auto.components.skills.SkillShareDialog.0f07fa2a79', 'Publish skill')}
|
||||
? t('auto.components.skills.SkillShareDialog.publishBundle', 'Publish')
|
||||
: t('auto.components.skills.SkillShareDialog.0f07fa2a79', 'Publish')}
|
||||
</Button>
|
||||
)
|
||||
) : null}
|
||||
|
||||
@@ -52,15 +52,11 @@ export function VmDeleteConfirmDialog({
|
||||
</DialogHeader>
|
||||
<DialogFooter>
|
||||
<Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
|
||||
{t('auto.components.worktree.creation.VmDeleteConfirmDialog.keep', 'Keep it')}
|
||||
{t('auto.components.worktree.creation.VmDeleteConfirmDialog.keep', 'Keep')}
|
||||
</Button>
|
||||
<Button type="button" variant="destructive" onClick={onConfirm}>
|
||||
{cloud
|
||||
? t(
|
||||
'auto.components.worktree.creation.VmBuildFailureCard.deleteSandbox',
|
||||
'Delete sandbox'
|
||||
)
|
||||
: t('auto.components.worktree.creation.VmBuildFailureCard.deleteVm', 'Delete VM')}
|
||||
{/* The title names the sandbox or VM; the button is the verb. */}
|
||||
{t('auto.components.worktree.creation.VmDeleteConfirmDialog.delete', 'Delete')}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
|
||||
@@ -4705,7 +4705,8 @@
|
||||
"titleVm": "Delete this VM?",
|
||||
"bodyCloud": "The sandbox and anything on it are deleted, and the workspace isn’t created.",
|
||||
"bodyVm": "The VM and anything on it are destroyed, and the workspace isn’t created.",
|
||||
"keep": "Keep it"
|
||||
"keep": "Keep",
|
||||
"delete": "Delete"
|
||||
},
|
||||
"VmBuildErrorDetails": {
|
||||
"copyFailed": "Couldn’t copy the details.",
|
||||
@@ -6501,13 +6502,13 @@
|
||||
"preparing": "Preparing preview…",
|
||||
"ready": "Skill link ready",
|
||||
"title": "Share skill",
|
||||
"0f07fa2a79": "Publish skill",
|
||||
"7aa4ba0dba": "Publish new version",
|
||||
"0f07fa2a79": "Publish",
|
||||
"7aa4ba0dba": "Publish",
|
||||
"3a51d0f34f": "Cancel upload",
|
||||
"e9d652ae3d": "Cancelling…",
|
||||
"30985d4fc0": "Cancel",
|
||||
"3af85f6add": "Done",
|
||||
"publishBundle": "Publish bundle",
|
||||
"publishBundle": "Publish",
|
||||
"cancelRequestFailed": "Orca could not send the cancellation request. The upload may still finish."
|
||||
},
|
||||
"SkillCard": {
|
||||
@@ -7119,7 +7120,7 @@
|
||||
"sshConnectionUnavailable": "SSH connection \"{{connection}}\" not found or not connected"
|
||||
},
|
||||
"OrcaYamlTrustDialog": {
|
||||
"f3e2b868fb": "Run hooks",
|
||||
"f3e2b868fb": "Run",
|
||||
"43b7bec4cd": "Don't run",
|
||||
"setupChangedTitle": "{{repo}}'s setup script changed — run the new version?",
|
||||
"archiveChangedTitle": "{{repo}}'s archive script changed — run the new version?",
|
||||
@@ -7259,7 +7260,7 @@
|
||||
"description": "Saving runs this whenever Orca creates a worktree for {{repo}}.",
|
||||
"setupScript": "Setup script",
|
||||
"archiveScript": "Archive script",
|
||||
"save": "Save local setup",
|
||||
"save": "Save",
|
||||
"descriptionWithSource": "From <file>{{source}}</file>. Saving runs this whenever Orca creates a worktree for {{repo}}.",
|
||||
"notImported": "Not imported",
|
||||
"notImportedHint": "These settings have no Orca equivalent and won't be saved.",
|
||||
@@ -9033,8 +9034,8 @@
|
||||
"readHint": "List workspaces, projects and routines. It cannot start, change or delete anything.",
|
||||
"fullHint": "Start, sleep, wake and delete workspaces, message agents and manage routines as you.",
|
||||
"close": "Close",
|
||||
"regenerate": "Generate a new code",
|
||||
"generate": "Generate code"
|
||||
"regenerate": "Regenerate",
|
||||
"generate": "Generate"
|
||||
},
|
||||
"create": {
|
||||
"readOnly": "Read only",
|
||||
@@ -9054,7 +9055,7 @@
|
||||
"expiryNever": "Never",
|
||||
"expiryDays": "In {{days}} days",
|
||||
"expiryYear": "In 1 year",
|
||||
"submit": "Create key"
|
||||
"submit": "Create"
|
||||
},
|
||||
"cancel": "Cancel",
|
||||
"links": {
|
||||
@@ -9084,7 +9085,7 @@
|
||||
"createdByOther": "<person></person> created this key and may still be using it.",
|
||||
"appsCount_one": "An app approved with this key is disconnected too.",
|
||||
"appsCount_other": "{{count}} apps approved with this key are disconnected too.",
|
||||
"confirm": "Revoke key",
|
||||
"confirm": "Revoke",
|
||||
"done": "Revoked “{{keyName}}”"
|
||||
},
|
||||
"signedOut": {
|
||||
@@ -9214,7 +9215,7 @@
|
||||
"delete": {
|
||||
"title": "Delete “{{routineName}}”?",
|
||||
"body": "It stops running and its run history is deleted. Workspaces it already started are not affected.",
|
||||
"confirm": "Delete routine",
|
||||
"confirm": "Delete",
|
||||
"done": "Deleted “{{routineName}}”"
|
||||
},
|
||||
"editor": {
|
||||
@@ -9249,8 +9250,8 @@
|
||||
"name": "Name",
|
||||
"namePlaceholder": "e.g. Triage new issues",
|
||||
"when": "When it runs",
|
||||
"save": "Save changes",
|
||||
"create": "Create routine",
|
||||
"save": "Save",
|
||||
"create": "Create",
|
||||
"where": "Where it runs",
|
||||
"project": "Project",
|
||||
"repo": "Repository URL",
|
||||
@@ -16844,9 +16845,9 @@
|
||||
"copy": "Copy",
|
||||
"copyFailed": "Couldn’t copy the link.",
|
||||
"copyLink": "Copy link",
|
||||
"create": "Create link",
|
||||
"create": "Create",
|
||||
"createFailed": "Couldn’t create the link.",
|
||||
"createPublic": "Create public link",
|
||||
"createPublic": "Create",
|
||||
"createdCopied": "Your link is ready and copied.",
|
||||
"createdNotCopied": "Your link is ready. Copy it below.",
|
||||
"description": "Get a link that opens port {{value0}} in a browser.",
|
||||
@@ -27319,7 +27320,7 @@
|
||||
"activate": {
|
||||
"title": "Use build #{{number}}?",
|
||||
"description": "New workspaces will start from build #{{number}}. Existing workspaces keep theirs.",
|
||||
"confirm": "Use this build"
|
||||
"confirm": "Use"
|
||||
},
|
||||
"form": {
|
||||
"script": "Install script",
|
||||
@@ -27373,7 +27374,7 @@
|
||||
"added": "added: ",
|
||||
"removed": "removed: ",
|
||||
"cancel": "Cancel",
|
||||
"apply": "Apply to draft"
|
||||
"apply": "Apply"
|
||||
},
|
||||
"readOnlyAsk": "Ask an owner or admin to change the environment or start a build.",
|
||||
"size": {
|
||||
@@ -28037,7 +28038,7 @@
|
||||
"changes": "Uncommitted changes and untracked files",
|
||||
"branchTaken": "{{branch}} is already checked out on this computer",
|
||||
"branchTakenDetail": "It will be {{newName}}. Chats already on this computer are kept.",
|
||||
"action": "Move to this computer",
|
||||
"action": "Move",
|
||||
"branchNamed": "Branch {{branch}} and its commits",
|
||||
"changesCount_one": "{{count}} uncommitted change, plus untracked files",
|
||||
"changesCount_other": "{{count}} uncommitted changes, plus untracked files",
|
||||
@@ -28564,7 +28565,7 @@
|
||||
"unreachableDetail": "Showing the last known state. Keys you save now go to your Orca account when Orca is back."
|
||||
},
|
||||
"remove": {
|
||||
"confirmLabel": "Remove {{name}}",
|
||||
"confirmLabel": "Remove",
|
||||
"fromAccountQuestion": "Also remove it from your Orca account? Cloud workspaces will stop using it.",
|
||||
"thisComputerOnly": "Remove from this computer only",
|
||||
"both": "Remove from both",
|
||||
@@ -29127,7 +29128,7 @@
|
||||
"waiting": "{{count}} more waiting",
|
||||
"turnOff": "Turn off for this workspace",
|
||||
"deny": "Deny",
|
||||
"alwaysAllow": "Always allow this command",
|
||||
"alwaysAllow": "Always allow",
|
||||
"alwaysAllowScope": "Runs without asking again, only this exact command in this workspace and folder. What it runs can still change, such as a script the agent edits.",
|
||||
"allowOnce": "Allow once",
|
||||
"turnOffFailed": "Couldn’t turn off local commands. Turn them off in Settings → Orca Cloud → Commands on this computer."
|
||||
@@ -29211,7 +29212,7 @@
|
||||
"removeConfirmTitle": "Remove the copy on this computer?",
|
||||
"removalEdited_one": "{{count}} changed file on this computer will be removed.",
|
||||
"removalEdited_other": "{{count}} changed files on this computer will be removed.",
|
||||
"removeCopy": "Remove copy",
|
||||
"removeCopy": "Remove",
|
||||
"title": "On this computer",
|
||||
"syncedEmpty": "Synced · {{ago}}",
|
||||
"contextLabel": ".context folder",
|
||||
|
||||
Reference in New Issue
Block a user