Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

refactor(i18n): consolidate duplicate strings into common.* keys

Juan Denisd3f6f29ed685
diff --git a/builtin-extensions/serverkit-walkthrough-studio/frontend/index.jsx b/builtin-extensions/serverkit-walkthrough-studio/frontend/index.jsx
index 97ddd853..30d2ed2f 100644
--- a/builtin-extensions/serverkit-walkthrough-studio/frontend/index.jsx
+++ b/builtin-extensions/serverkit-walkthrough-studio/frontend/index.jsx
@@ -150,7 +150,7 @@ function GuidePreview({ guide, issues, onRun, t }) {
return (
<aside className="wts-preview" data-walkthrough="studio-preview">
<div className="wts-panel-heading">
- <span>{t('walkthroughStudio.livePreview', 'Live preview')}</span>
+ <span>{t('common.labels.livePreview', 'Live preview')}</span>
<span className={`wts-validity${issues.length ? ' is-invalid' : ''}`}>
{issues.length
? t('walkthroughStudio.issueCount', '{{count}} issues', { count: issues.length })
@@ -381,7 +381,7 @@ export function WalkthroughStudioPage() {
<Download size={14} /> {t('common.actions.export', 'Export')}
</Button>
<Button type="button" size="sm" onClick={saveGuide} disabled={saving || issues.length > 0} data-walkthrough="studio-publish">
- <Save size={14} /> {saving ? t('common.saving', 'Saving…') : t('walkthroughStudio.publish', 'Publish')}
+ <Save size={14} /> {saving ? t('common.saving', 'Saving…') : t('common.actions.publish', 'Publish')}
</Button>
</>
);
@@ -447,7 +447,7 @@ export function WalkthroughStudioPage() {
</label>
</div>
<div className="wts-form-grid">
- <Field label={t('walkthroughStudio.guideTitle', 'Title')}>
+ <Field label={t('common.labels.title', 'Title')}>
<input value={draft.title} onChange={(event) => updateGuide({ title: event.target.value })} />
</Field>
<Field label={t('walkthroughStudio.stableId', 'Stable id')} hint={t('walkthroughStudio.stableIdHint', 'Do not rename after publishing; progress uses this id.')}>
@@ -457,7 +457,7 @@ export function WalkthroughStudioPage() {
<textarea rows="3" value={draft.description} onChange={(event) => updateGuide({ description: event.target.value })} />
</Field>
<div className="wts-form-grid__compact">
- <Field label={t('walkthroughStudio.duration', 'Duration')}>
+ <Field label={t('common.labels.duration', 'Duration')}>
<input value={draft.duration || ''} onChange={(event) => updateGuide({ duration: event.target.value })} />
</Field>
<Field label={t('walkthroughStudio.icon', 'Icon token')}>
@@ -504,8 +504,8 @@ export function WalkthroughStudioPage() {
<div className="wts-step-editor">
<div className="wts-step-editor__tools">
<span>STEP {String(stepIndex + 1).padStart(2, '0')}</span>
- <Button type="button" variant="ghost" size="icon" onClick={() => moveStep(-1)} disabled={stepIndex === 0} aria-label={t('walkthroughStudio.moveUp', 'Move up')}><ArrowUp size={14} /></Button>
- <Button type="button" variant="ghost" size="icon" onClick={() => moveStep(1)} disabled={stepIndex === draft.steps.length - 1} aria-label={t('walkthroughStudio.moveDown', 'Move down')}><ArrowDown size={14} /></Button>
+ <Button type="button" variant="ghost" size="icon" onClick={() => moveStep(-1)} disabled={stepIndex === 0} aria-label={t('common.actions.moveUp', 'Move up')}><ArrowUp size={14} /></Button>
+ <Button type="button" variant="ghost" size="icon" onClick={() => moveStep(1)} disabled={stepIndex === draft.steps.length - 1} aria-label={t('common.actions.moveDown', 'Move down')}><ArrowDown size={14} /></Button>
<Button type="button" variant="ghost" size="icon" onClick={deleteStep} aria-label={t('common.actions.delete', 'Delete')}><Trash2 size={14} /></Button>
</div>
<div className="wts-form-grid">
diff --git a/frontend/src/components/backups/BackupDetailDrawer.jsx b/frontend/src/components/backups/BackupDetailDrawer.jsx
index a0082587..2e47eb66 100644
--- a/frontend/src/components/backups/BackupDetailDrawer.jsx
+++ b/frontend/src/components/backups/BackupDetailDrawer.jsx
@@ -46,7 +46,7 @@ export default function BackupDetailDrawer({ run, open, onClose, onRestore, onVe
<div className="backup-detail-drawer__meta">
<div className="backup-detail-drawer__row"><span>{t('common.labels.created', 'Created')}</span><span>{formatDateTime(run.started_at)}</span></div>
<div className="backup-detail-drawer__row"><span>{t('app.backupDetailDrawer.finished', 'Finished')}</span><span>{formatDateTime(run.finished_at)}</span></div>
- <div className="backup-detail-drawer__row"><span>{t('app.backupDetailDrawer.duration', 'Duration')}</span><span>{run.duration_seconds != null ? `${run.duration_seconds}s` : '—'}</span></div>
+ <div className="backup-detail-drawer__row"><span>{t('common.labels.duration', 'Duration')}</span><span>{run.duration_seconds != null ? `${run.duration_seconds}s` : '—'}</span></div>
<div className="backup-detail-drawer__row"><span>{t('common.labels.type', 'Type')}</span><span>{run.kind}</span></div>
<div className="backup-detail-drawer__row"><span>{t('app.backupDetailDrawer.compression', 'Compression')}</span><span>{run.compression || '—'}</span></div>
<div className="backup-detail-drawer__row"><span>{t('common.labels.storage', 'Storage')}</span><span>{storageLabel(run)}</span></div>
diff --git a/frontend/src/components/dashboard/grid/WidgetEditor.jsx b/frontend/src/components/dashboard/grid/WidgetEditor.jsx
index 52c560e8..185b155b 100644
--- a/frontend/src/components/dashboard/grid/WidgetEditor.jsx
+++ b/frontend/src/components/dashboard/grid/WidgetEditor.jsx
@@ -292,7 +292,7 @@ export function WidgetEditor({
>
<div className="skwe-edit">
<div className="skwe-edit__cols">
- <section className="skwe-edit__preview" aria-label={t('app.widgetEditor.livePreview', 'Live preview')}>
+ <section className="skwe-edit__preview" aria-label={t('common.labels.livePreview', 'Live preview')}>
<div className="skwe-edit__stage">
{/* Same chrome the board draws, driven by the same
renderer — so "preview" costs no second
@@ -316,7 +316,7 @@ export function WidgetEditor({
<section className="skwe-edit__pane" aria-label={t('app.widgetEditor.widgetSettings', 'Widget settings')}>
<Group title={t('app.widgetEditor.widget', 'Widget')}>
- <Field label={t('app.widgetEditor.title', 'Title')}>
+ <Field label={t('common.labels.title', 'Title')}>
<input
type="text"
className="skwe-edit__field"
diff --git a/frontend/src/components/service-detail/EventsTab.jsx b/frontend/src/components/service-detail/EventsTab.jsx
index 3b7ebf64..63e48a71 100644
--- a/frontend/src/components/service-detail/EventsTab.jsx
+++ b/frontend/src/components/service-detail/EventsTab.jsx
@@ -402,7 +402,7 @@ const EventsTab = ({ appId }) => {
<InfoItem label={t('app.eventsTab.commit', 'Commit')} value={deployDetail.deploy.commitSha} mono />
)}
{deployDetail.deploy.duration && (
- <InfoItem label={t('app.eventsTab.duration', 'Duration')} value={formatDuration(deployDetail.deploy.duration)} />
+ <InfoItem label={t('common.labels.duration', 'Duration')} value={formatDuration(deployDetail.deploy.duration)} />
)}
</InfoList>
{deployDetail.deploy.logs ? (
diff --git a/frontend/src/components/service-detail/SettingsTab.jsx b/frontend/src/components/service-detail/SettingsTab.jsx
index a23e894b..33e3628c 100644
--- a/frontend/src/components/service-detail/SettingsTab.jsx
+++ b/frontend/src/components/service-detail/SettingsTab.jsx
@@ -775,7 +775,7 @@ const DomainSslPanel = ({ app, domains, primaryDomain, onUpdate }) => {
<>
<div className="modal-body">
<p className="hint">
- {t('app.settingsTab.publish', 'Publish')} <strong>{app.name}</strong> {t('app.settingsTab.atAManagedSubdomainOf', 'at a managed subdomain of')}{' '}
+ {t('common.actions.publish', 'Publish')} <strong>{app.name}</strong> {t('app.settingsTab.atAManagedSubdomainOf', 'at a managed subdomain of')}{' '}
<code>{subdomainBase || subdomainModal.base_domain}</code>.
</p>
{subdomainBases.length > 1 && (
diff --git a/frontend/src/components/settings/ApiSettingsTab.jsx b/frontend/src/components/settings/ApiSettingsTab.jsx
index cd68ef0f..14f516c3 100644
--- a/frontend/src/components/settings/ApiSettingsTab.jsx
+++ b/frontend/src/components/settings/ApiSettingsTab.jsx
@@ -484,7 +484,7 @@ const DELIVERY_COLUMNS = [
},
{
key: 'duration',
- headerKey: 'app.apiSettingsTab.duration', header: 'Duration',
+ headerKey: 'common.labels.duration', header: 'Duration',
sortable: true,
sortValue: (d) => d.duration_ms ?? null,
render: (d) => (d.duration_ms ? `${d.duration_ms}ms` : '-'),
diff --git a/frontend/src/i18n/locales/en.json b/frontend/src/i18n/locales/en.json
index 9ec1aad3..4c830ed9 100644
--- a/frontend/src/i18n/locales/en.json
+++ b/frontend/src/i18n/locales/en.json
@@ -218,7 +218,6 @@
"deleteSubscription": "Delete subscription",
"deleteThisSubscription": "Delete this subscription?",
"deleteWebhookSubscription": "Delete webhook subscription",
- "duration": "Duration",
"eG100PerMinute": "e.g. 100 per minute",
"endpoint": "Endpoint",
"errorRate": "Error Rate",
@@ -349,7 +348,6 @@
"backupDetailDrawer": {
"backup": "Backup",
"compression": "Compression",
- "duration": "Duration",
"estimatedCost": "Estimated cost:",
"finished": "Finished",
"local": "(local) +",
@@ -1168,7 +1166,6 @@
"descriptionOptional": "Description (optional)",
"disableJob": "Disable job",
"dismissError": "Dismiss error",
- "duration": "Duration",
"eGNightlySiteBackups": "e.g. Nightly site backups",
"editCronJob": "Edit cron job",
"enableJob": "Enable job",
@@ -1990,7 +1987,6 @@
"commit": "Commit",
"deployment": "Deployment",
"deploymentsConfigChangesAndEditsTo": "Deployments, config changes and edits to this service will show up here.",
- "duration": "Duration",
"event": "Event",
"failedAttemptsThreshold": "failed attempts · threshold",
"failedLoginAttempts24h": "Failed Login Attempts (24h)",
@@ -3699,9 +3695,7 @@
"inThisProjectNoEnvironment": "In this project, no environment",
"loadingProject": "Loading project",
"manifest": "Manifest",
- "moveDown": "Move down",
"moveDown2": "Move {{name}} down",
- "moveUp": "Move up",
"moveUp2": "Move {{name}} up",
"newEnvironment": "New Environment",
"noAppsInThisEnvironment": "No apps in this environment",
@@ -5109,7 +5103,6 @@
"primaryDomain": "Primary Domain",
"production": "Production",
"publicDomainMappedToThisService": "Public domain mapped to this service",
- "publish": "Publish",
"publishThisServiceAtAServerkit": "Publish this service at a ServerKit-managed subdomain.",
"publishedAt": "Published at {{url}}",
"repositoryConnected": "Repository connected",
@@ -5456,7 +5449,6 @@
"theseMonitorsAreAlreadyRunningAnd": "These monitors are already running and are not on any status page yet. Adding one publishes it here — it keeps the history it has already collected.",
"thisRemovesTheSelectedRecordAnd": "This removes the selected record and related status data.",
"timeout": "Timeout",
- "title": "Title",
"visibility": "Visibility"
},
"statusbar": {
@@ -6533,7 +6525,6 @@
"level": "Level",
"lineStyle": "Line style",
"lines": "Lines",
- "livePreview": "Live preview",
"livePreview2": "live preview ·",
"logSource": "Log source",
"metric": "Metric",
@@ -6557,7 +6548,6 @@
"sparkline": "Sparkline",
"text": "Text",
"thresholds": "Thresholds",
- "title": "Title",
"valueColoursTurnAmberThenRed": "Value colours turn amber, then red.",
"widget": "Widget",
"widgetSettings": "Widget settings",
@@ -6743,7 +6733,10 @@
"import": "Import",
"loadMore": "Load more",
"logOut": "Log out",
+ "moveDown": "Move down",
+ "moveUp": "Move up",
"open": "Open",
+ "publish": "Publish",
"refresh": "Refresh",
"remove": "Remove",
"restart": "Restart",
@@ -6798,11 +6791,13 @@
"docker": "Docker",
"domain": "Domain",
"domains": "Domains",
+ "duration": "Duration",
"extensions": "Extensions",
"info": "Info",
"ipAddress": "IP Address",
"key": "Key",
"kind": "Kind",
+ "livePreview": "Live preview",
"logs": "Logs",
"memory": "Memory",
"monitoring": "Monitoring",
@@ -6829,6 +6824,7 @@
"system": "System",
"target": "Target",
"time": "Time",
+ "title": "Title",
"type": "Type",
"uptime": "Uptime",
"user": "User",
@@ -7066,11 +7062,9 @@
"deleteTitle": "Delete walkthrough",
"deleted": "Walkthrough deleted.",
"description": "Outcome description",
- "duration": "Duration",
"fixIssues": "Fix the validation issues before publishing.",
"flowEyebrow": "02 / FLOW",
"guideEyebrow": "01 / GUIDE",
- "guideTitle": "Title",
"icon": "Icon token",
"importFailed": "Could not import this file.",
"importInvalid": "The file does not contain a valid walkthrough.",
@@ -7085,12 +7079,9 @@
"keepOneStep": "A walkthrough needs at least one step.",
"library": "Shared library",
"libraryIntro": "Published guides appear in the walkthrough dock for everyone with the required permissions.",
- "livePreview": "Live preview",
"loadFailed": "Could not load the walkthrough library.",
"manualCompletionHint": "The operator uses Done · next step after completing the instruction.",
"meta": "Declarative guide authoring",
- "moveDown": "Move down",
- "moveUp": "Move up",
"newGuide": "New walkthrough",
"newStepDescription": "Describe the operator action and the expected outcome.",
"noCodeRequired": "No application code required",
@@ -7102,7 +7093,6 @@
"outcome": "Define the outcome",
"previewFailed": "The draft could not be previewed.",
"previewOpened": "Draft opened in the walkthrough dock.",
- "publish": "Publish",
"publishFailed": "Could not publish the walkthrough.",
"published": "Walkthrough published.",
"runInDock": "Run in walkthrough dock",
diff --git a/frontend/src/pages/CronJobs.jsx b/frontend/src/pages/CronJobs.jsx
index 8f7b79bc..0aaadcd1 100644
--- a/frontend/src/pages/CronJobs.jsx
+++ b/frontend/src/pages/CronJobs.jsx
@@ -743,7 +743,7 @@ function CronDrawer({ job, isAdmin, running, onClose, onRefresh, onRun, onEdit,
},
{
key: 'duration',
- headerKey: 'app.cronJobs.duration', header: 'Duration',
+ headerKey: 'common.labels.duration', header: 'Duration',
sortable: true,
sortValue: (r) => r.duration_seconds,
render: (r) => formatDuration(r.duration_seconds),
diff --git a/frontend/src/pages/ProjectDetail.jsx b/frontend/src/pages/ProjectDetail.jsx
index 0a7a557d..ecc36139 100644
--- a/frontend/src/pages/ProjectDetail.jsx
+++ b/frontend/src/pages/ProjectDetail.jsx
@@ -195,7 +195,7 @@ const ProjectDetail = () => {
<div className="project-env-tab__controls">
<button
type="button"
- title={t('app.projectDetail.moveUp', 'Move up')}
+ title={t('common.actions.moveUp', 'Move up')}
aria-label={t('app.projectDetail.moveUp2', 'Move {{name}} up', { name: env.name })}
disabled={index === 0}
onClick={() => handleReorder(env.id, -1)}
@@ -204,7 +204,7 @@ const ProjectDetail = () => {
</button>
<button
type="button"
- title={t('app.projectDetail.moveDown', 'Move down')}
+ title={t('common.actions.moveDown', 'Move down')}
aria-label={t('app.projectDetail.moveDown2', 'Move {{name}} down', { name: env.name })}
disabled={index === environments.length - 1}
onClick={() => handleReorder(env.id, 1)}
diff --git a/frontend/src/pages/StatusPages.jsx b/frontend/src/pages/StatusPages.jsx
index 47efe06e..fcc82a01 100644
--- a/frontend/src/pages/StatusPages.jsx
+++ b/frontend/src/pages/StatusPages.jsx
@@ -778,7 +778,7 @@ const StatusPages = () => {
)}
>
<div className="form-group">
- <label>{t('app.statusPages.title', 'Title')}</label>
+ <label>{t('common.labels.title', 'Title')}</label>
<Input value={incidentForm.title} onChange={(e) => setIncidentForm({ ...incidentForm, title: e.target.value })} autoFocus />
</div>
<div className="status-modal-grid">
diff --git a/frontend/src/plugins/serverkit-walkthrough-studio/index.jsx b/frontend/src/plugins/serverkit-walkthrough-studio/index.jsx
index 97ddd853..30d2ed2f 100644
--- a/frontend/src/plugins/serverkit-walkthrough-studio/index.jsx
+++ b/frontend/src/plugins/serverkit-walkthrough-studio/index.jsx
@@ -150,7 +150,7 @@ function GuidePreview({ guide, issues, onRun, t }) {
return (
<aside className="wts-preview" data-walkthrough="studio-preview">
<div className="wts-panel-heading">
- <span>{t('walkthroughStudio.livePreview', 'Live preview')}</span>
+ <span>{t('common.labels.livePreview', 'Live preview')}</span>
<span className={`wts-validity${issues.length ? ' is-invalid' : ''}`}>
{issues.length
? t('walkthroughStudio.issueCount', '{{count}} issues', { count: issues.length })
@@ -381,7 +381,7 @@ export function WalkthroughStudioPage() {
<Download size={14} /> {t('common.actions.export', 'Export')}
</Button>
<Button type="button" size="sm" onClick={saveGuide} disabled={saving || issues.length > 0} data-walkthrough="studio-publish">
- <Save size={14} /> {saving ? t('common.saving', 'Saving…') : t('walkthroughStudio.publish', 'Publish')}
+ <Save size={14} /> {saving ? t('common.saving', 'Saving…') : t('common.actions.publish', 'Publish')}
</Button>
</>
);
@@ -447,7 +447,7 @@ export function WalkthroughStudioPage() {
</label>
</div>
<div className="wts-form-grid">
- <Field label={t('walkthroughStudio.guideTitle', 'Title')}>
+ <Field label={t('common.labels.title', 'Title')}>
<input value={draft.title} onChange={(event) => updateGuide({ title: event.target.value })} />
</Field>
<Field label={t('walkthroughStudio.stableId', 'Stable id')} hint={t('walkthroughStudio.stableIdHint', 'Do not rename after publishing; progress uses this id.')}>
@@ -457,7 +457,7 @@ export function WalkthroughStudioPage() {
<textarea rows="3" value={draft.description} onChange={(event) => updateGuide({ description: event.target.value })} />
</Field>
<div className="wts-form-grid__compact">
- <Field label={t('walkthroughStudio.duration', 'Duration')}>
+ <Field label={t('common.labels.duration', 'Duration')}>
<input value={draft.duration || ''} onChange={(event) => updateGuide({ duration: event.target.value })} />
</Field>
<Field label={t('walkthroughStudio.icon', 'Icon token')}>
@@ -504,8 +504,8 @@ export function WalkthroughStudioPage() {
<div className="wts-step-editor">
<div className="wts-step-editor__tools">
<span>STEP {String(stepIndex + 1).padStart(2, '0')}</span>
- <Button type="button" variant="ghost" size="icon" onClick={() => moveStep(-1)} disabled={stepIndex === 0} aria-label={t('walkthroughStudio.moveUp', 'Move up')}><ArrowUp size={14} /></Button>
- <Button type="button" variant="ghost" size="icon" onClick={() => moveStep(1)} disabled={stepIndex === draft.steps.length - 1} aria-label={t('walkthroughStudio.moveDown', 'Move down')}><ArrowDown size={14} /></Button>
+ <Button type="button" variant="ghost" size="icon" onClick={() => moveStep(-1)} disabled={stepIndex === 0} aria-label={t('common.actions.moveUp', 'Move up')}><ArrowUp size={14} /></Button>
+ <Button type="button" variant="ghost" size="icon" onClick={() => moveStep(1)} disabled={stepIndex === draft.steps.length - 1} aria-label={t('common.actions.moveDown', 'Move down')}><ArrowDown size={14} /></Button>
<Button type="button" variant="ghost" size="icon" onClick={deleteStep} aria-label={t('common.actions.delete', 'Delete')}><Trash2 size={14} /></Button>
</div>
<div className="wts-form-grid">