Skip to content

chore: reword some workspace actions stuff #9061

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.

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
merged 2 commits into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions site/src/i18n/en/templateSettingsPage.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
"failureTTLHelperText_zero": "Coder will not automatically stop failed workspaces",
"failureTTLHelperText_one": "Coder will attempt to stop failed workspaces after {{count}} day.",
"failureTTLHelperText_other": "Coder will attempt to stop failed workspaces after {{count}} days.",
"inactivityTTLHelperText_zero": "Coder will not automatically lock inactive workspaces",
"inactivityTTLHelperText_one": "Coder will automatically lock inactive workspaces after {{count}} day.",
"inactivityTTLHelperText_other": "Coder will automatically lock inactive workspaces after {{count}} days.",
"lockedTTLHelperText_zero": "Coder will not automatically delete locked workspaces",
"lockedTTLHelperText_one": "Coder will automatically delete locked workspaces after {{count}} day.",
"lockedTTLHelperText_other": "Coder will automatically delete locked workspaces after {{count}} days.",
"inactivityTTLHelperText_zero": "Coder will not mark workspaces as inactive",
"inactivityTTLHelperText_one": "Coder will will mark workspaces as inactive after {{count}} day without user connections.",
"inactivityTTLHelperText_other": "Coder will will mark workspaces as inactive after {{count}} days without user connections",
"lockedTTLHelperText_zero": "Coder will not automatically delete inactive workspaces",
"lockedTTLHelperText_one": "Coder will automatically delete inactive workspaces after {{count}} day.",
"lockedTTLHelperText_other": "Coder will automatically delete inactive workspaces after {{count}} days.",
"allowUserCancelWorkspaceJobsLabel": "Allow users to cancel in-progress workspace jobs.",
"allowUserCancelWorkspaceJobsNotice": "Depending on your template, canceling builds may leave workspaces in an unhealthy state. This option isn't recommended for most use cases.",
"allowUsersCancelHelperText": "If checked, users may be able to corrupt their workspace.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
</FormFields>
</FormSection>
<FormSection
title="Inactivity Soft Deletion"
description="When enabled, Coder will soft-delete workspaces that have not been accessed after a specified number of days. A soft-deleted workspace cannot be interacted with until it is recovered by the user."
title="Inactivity Threshold"
description="When enabled, Coder will mark workspaces as inactive after a period of time with no connections. Inactive workspaces can be auto-deleted (see below) or manually reviewed by the workspace owner or admins."
>
<FormFields>
<FormControlLabel
Expand All @@ -371,7 +371,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
onChange={handleToggleInactivityCleanup}
/>
}
label="Enable Inactivity Soft Deletion"
label="Enable Inactivity Threshold"
/>
<TextField
{...getFieldHelpers(
Expand All @@ -392,8 +392,8 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
</FormFields>
</FormSection>
<FormSection
title="Deletion Retention"
description="When enabled, Coder will permanently delete workspaces that have been soft-deleted for a specified number of days. Once a workspace is permanently deleted it cannot be recovered."
title="Inactivity Deletion"
description="When enabled, Coder will permanently delete workspaces that have been marked as inactive. Once a workspace is permanently deleted it cannot be recovered."
>
<FormFields>
<FormControlLabel
Expand All @@ -404,7 +404,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
onChange={handleToggleLockedCleanup}
/>
}
label="Enable Deletion Retention"
label="Enable Inactivity Deletion"
/>
<TextField
{...getFieldHelpers(
Expand Down