Skip to content

Commit c35441c

Browse files
authored
fix(settings): restore debug value interpolation (anomalyco#1657)
Co-authored-by: src-opn <[email protected]>
1 parent 556eae8 commit c35441c

3 files changed

Lines changed: 60 additions & 49 deletions

File tree

‎apps/app/src/i18n/index.ts‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,19 @@ const resolvePluralKey = (loc: Language, key: string, count: number): string =>
155155
* `${key}_one` / `${key}_other` (or `${key}_zero` when count === 0) per
156156
* `Intl.PluralRules`, and falls back to the bare key when no variants exist.
157157
*/
158-
export const t = (key: string, params?: Record<string, string | number> & { lng?: Language }): string => {
159-
const loc = params?.lng ?? locale();
158+
type TranslationParams = Record<string, string | number> & { lng?: Language };
159+
160+
export const t = (
161+
key: string,
162+
paramsOrLocale?: TranslationParams | Language,
163+
legacyParams?: Record<string, string | number>,
164+
): string => {
165+
const params = legacyParams ?? (typeof paramsOrLocale === "string" ? undefined : paramsOrLocale);
166+
const loc: Language = typeof paramsOrLocale === "string"
167+
? paramsOrLocale
168+
: isLanguage(params?.lng)
169+
? params.lng
170+
: locale();
160171

161172
const lookupKey =
162173
typeof params?.count === "number" ? resolvePluralKey(loc, key, params.count) : key;

‎apps/app/src/react-app/domains/settings/pages/debug-view.tsx‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -339,13 +339,13 @@ export function DebugView(props: DebugViewProps) {
339339
</div>
340340
</div>
341341
<div className="grid gap-2 text-[12px] text-dls-secondary md:grid-cols-2">
342-
<div>{t("settings.debug_desktop_app", undefined, { version: props.runtimeSummary.appVersionLabel })}</div>
343-
<div>{t("settings.debug_commit", undefined, { commit: props.runtimeSummary.appCommitLabel })}</div>
342+
<div>{t("settings.debug_desktop_app", { version: props.runtimeSummary.appVersionLabel })}</div>
343+
<div>{t("settings.debug_commit", { commit: props.runtimeSummary.appCommitLabel })}</div>
344344
<div>
345-
{t("settings.debug_opencode_version", undefined, { version: props.runtimeSummary.opencodeVersionLabel })}
345+
{t("settings.debug_opencode_version", { version: props.runtimeSummary.opencodeVersionLabel })}
346346
</div>
347347
<div>
348-
{t("settings.debug_openwork_server_version", undefined, {
348+
{t("settings.debug_openwork_server_version", {
349349
version: props.runtimeSummary.openworkServerVersionLabel,
350350
})}
351351
</div>
@@ -450,41 +450,41 @@ export function DebugView(props: DebugViewProps) {
450450

451451
{props.openworkServerDiagnostics ? (
452452
<div className="grid gap-2 text-[12px] text-dls-secondary md:grid-cols-2">
453-
<div>{t("settings.diag_started", undefined, { time: formatUptime(props.openworkServerDiagnostics.uptimeMs) })}</div>
453+
<div>{t("settings.diag_started", { time: formatUptime(props.openworkServerDiagnostics.uptimeMs) })}</div>
454454
<div>
455-
{t("settings.diag_read_only", undefined, {
455+
{t("settings.diag_read_only", {
456456
value: props.openworkServerDiagnostics.readOnly ? "true" : "false",
457457
})}
458458
</div>
459459
<div>
460-
{t("settings.diag_approval", undefined, {
460+
{t("settings.diag_approval", {
461461
mode: props.openworkServerDiagnostics.approval.mode,
462462
ms: String(props.openworkServerDiagnostics.approval.timeoutMs),
463463
})}
464464
</div>
465-
<div>{t("settings.diag_workspaces", undefined, { count: String(props.openworkServerDiagnostics.workspaceCount) })}</div>
465+
<div>{t("settings.diag_workspaces", { count: String(props.openworkServerDiagnostics.workspaceCount) })}</div>
466466
<div>
467-
{t("settings.diag_selected_workspace", undefined, {
467+
{t("settings.diag_selected_workspace", {
468468
id: props.openworkServerDiagnostics.selectedWorkspaceId ?? "—",
469469
})}
470470
</div>
471471
<div>
472-
{t("settings.diag_runtime_workspace", undefined, {
472+
{t("settings.diag_runtime_workspace", {
473473
id: props.openworkServerDiagnostics.activeWorkspaceId ?? "—",
474474
})}
475475
</div>
476476
<div>
477-
{t("settings.diag_config_path", undefined, {
477+
{t("settings.diag_config_path", {
478478
path: props.openworkServerDiagnostics.server.configPath ?? t("settings.diag_default"),
479479
})}
480480
</div>
481481
<div>
482-
{t("settings.diag_token_source", undefined, {
482+
{t("settings.diag_token_source", {
483483
source: props.openworkServerDiagnostics.tokenSource.client,
484484
})}
485485
</div>
486486
<div>
487-
{t("settings.diag_host_token_source", undefined, {
487+
{t("settings.diag_host_token_source", {
488488
source: props.openworkServerDiagnostics.tokenSource.host,
489489
})}
490490
</div>
@@ -500,19 +500,19 @@ export function DebugView(props: DebugViewProps) {
500500
</div>
501501
<div className="truncate font-mono text-[11px] text-dls-secondary">
502502
{props.runtimeWorkspaceId
503-
? t("settings.worker_id_label", undefined, { id: props.runtimeWorkspaceId })
503+
? t("settings.worker_id_label", { id: props.runtimeWorkspaceId })
504504
: t("settings.worker_unresolved")}
505505
</div>
506506
</div>
507507
{props.openworkServerCapabilities ? (
508508
<div className="grid gap-2 text-[12px] text-dls-secondary md:grid-cols-2">
509-
<div>{t("settings.cap_skills", undefined, { value: formatCapability(props.openworkServerCapabilities.skills) })}</div>
510-
<div>{t("settings.cap_plugins", undefined, { value: formatCapability(props.openworkServerCapabilities.plugins) })}</div>
511-
<div>{t("settings.cap_mcp", undefined, { value: formatCapability(props.openworkServerCapabilities.mcp) })}</div>
512-
<div>{t("settings.cap_commands", undefined, { value: formatCapability(props.openworkServerCapabilities.commands) })}</div>
513-
<div>{t("settings.cap_config", undefined, { value: formatCapability(props.openworkServerCapabilities.config) })}</div>
509+
<div>{t("settings.cap_skills", { value: formatCapability(props.openworkServerCapabilities.skills) })}</div>
510+
<div>{t("settings.cap_plugins", { value: formatCapability(props.openworkServerCapabilities.plugins) })}</div>
511+
<div>{t("settings.cap_mcp", { value: formatCapability(props.openworkServerCapabilities.mcp) })}</div>
512+
<div>{t("settings.cap_commands", { value: formatCapability(props.openworkServerCapabilities.commands) })}</div>
513+
<div>{t("settings.cap_config", { value: formatCapability(props.openworkServerCapabilities.config) })}</div>
514514
<div>
515-
{t("settings.cap_browser_tools", undefined, {
515+
{t("settings.cap_browser_tools", {
516516
value: (() => {
517517
const browser = props.openworkServerCapabilities.toolProviders?.browser;
518518
if (!browser?.enabled) return t("settings.disabled");
@@ -521,7 +521,7 @@ export function DebugView(props: DebugViewProps) {
521521
})}
522522
</div>
523523
<div>
524-
{t("settings.cap_file_tools", undefined, {
524+
{t("settings.cap_file_tools", {
525525
value: (() => {
526526
const files = props.openworkServerCapabilities.toolProviders?.files;
527527
if (!files) return t("config.unavailable");
@@ -533,7 +533,7 @@ export function DebugView(props: DebugViewProps) {
533533
})}
534534
</div>
535535
<div>
536-
{t("settings.cap_sandbox", undefined, {
536+
{t("settings.cap_sandbox", {
537537
value: props.openworkServerCapabilities.sandbox
538538
? `${props.openworkServerCapabilities.sandbox.backend} (${props.openworkServerCapabilities.sandbox.enabled ? t("settings.on") : t("settings.off")})`
539539
: t("config.unavailable"),
@@ -648,7 +648,7 @@ export function DebugView(props: DebugViewProps) {
648648
</div>
649649
</div>
650650
<div className="text-[11px] text-dls-secondary">
651-
{t("settings.developer_log_count", undefined, { count: String(props.developerLogRecordCount) })}
651+
{t("settings.developer_log_count", { count: String(props.developerLogRecordCount) })}
652652
</div>
653653
<pre className={monoPreClass}>{props.developerLogText || t("settings.developer_log_empty")}</pre>
654654
{props.developerLogStatus ? <StatusBanner tone="info" message={props.developerLogStatus} /> : null}
@@ -681,9 +681,9 @@ export function DebugView(props: DebugViewProps) {
681681
</div>
682682
{props.sandboxProbeResult ? (
683683
<div className="space-y-1 text-[12px] text-dls-secondary">
684-
<div>{t("settings.sandbox_run_id", undefined, { id: props.sandboxProbeResult.runId ?? "—" })}</div>
684+
<div>{t("settings.sandbox_run_id", { id: props.sandboxProbeResult.runId ?? "—" })}</div>
685685
<div>
686-
{t("settings.sandbox_result", undefined, {
686+
{t("settings.sandbox_result", {
687687
status: props.sandboxProbeResult.ready ? t("settings.sandbox_ready") : t("settings.sandbox_error"),
688688
})}
689689
</div>

‎apps/app/src/react-app/domains/settings/state/debug-view-model.ts‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,12 @@ function describeEngine(info: EngineInfo | null) {
157157
return {
158158
...statusPill(running),
159159
lines: [
160-
t("settings.debug_base_url", undefined, { url: info?.baseUrl ?? "—" }),
161-
t("settings.debug_runtime", undefined, { runtime: info?.runtime ?? "—" }),
162-
t("settings.diag_opencode_binary", undefined, { binary: formatOpencodeBinary(info) }),
163-
t("settings.debug_pid", undefined, { pid: info?.pid ? String(info.pid) : "—" }),
164-
t("settings.debug_hostname", undefined, { hostname: info?.hostname ?? "—" }),
165-
t("settings.debug_port", undefined, { port: info?.port ? String(info.port) : "—" }),
160+
t("settings.debug_base_url", { url: info?.baseUrl ?? "—" }),
161+
t("settings.debug_runtime", { runtime: info?.runtime ?? "—" }),
162+
t("settings.diag_opencode_binary", { binary: formatOpencodeBinary(info) }),
163+
t("settings.debug_pid", { pid: info?.pid ? String(info.pid) : "—" }),
164+
t("settings.debug_hostname", { hostname: info?.hostname ?? "—" }),
165+
t("settings.debug_port", { port: info?.port ? String(info.port) : "—" }),
166166
],
167167
stdout: info?.lastStdout ?? null,
168168
stderr: info?.lastStderr ?? null,
@@ -193,13 +193,13 @@ function describeOpenworkServer(info: OpenworkServerInfo | null) {
193193
return {
194194
...statusPill(running),
195195
lines: [
196-
t("settings.debug_base_url", undefined, { url: info?.baseUrl ?? "—" }),
197-
t("settings.diag_opencode_binary", undefined, { binary: formatManagedOpencodeBinary(info) }),
198-
t("settings.debug_connect_url", undefined, { url: info?.connectUrl ?? "—" }),
199-
t("settings.debug_lan_url", undefined, { url: info?.lanUrl ?? "—" }),
200-
t("settings.debug_mdns_url", undefined, { url: info?.mdnsUrl ?? "—" }),
201-
t("settings.debug_pid", undefined, { pid: info?.pid ? String(info.pid) : "—" }),
202-
t("settings.debug_remote_access", undefined, {
196+
t("settings.debug_base_url", { url: info?.baseUrl ?? "—" }),
197+
t("settings.diag_opencode_binary", { binary: formatManagedOpencodeBinary(info) }),
198+
t("settings.debug_connect_url", { url: info?.connectUrl ?? "—" }),
199+
t("settings.debug_lan_url", { url: info?.lanUrl ?? "—" }),
200+
t("settings.debug_mdns_url", { url: info?.mdnsUrl ?? "—" }),
201+
t("settings.debug_pid", { pid: info?.pid ? String(info.pid) : "—" }),
202+
t("settings.debug_remote_access", {
203203
value: info?.remoteAccessEnabled ? t("settings.on") : t("settings.off"),
204204
}),
205205
],
@@ -214,9 +214,9 @@ function describeOpencodeConnect(engine: EngineInfo | null) {
214214
return {
215215
...statusPill(running),
216216
lines: [
217-
t("settings.debug_base_url", undefined, { url: engine?.baseUrl ?? "—" }),
218-
t("settings.debug_project_dir", undefined, { path: engine?.projectDir ?? "—" }),
219-
t("settings.debug_runtime", undefined, { runtime: engine?.runtime ?? "—" }),
217+
t("settings.debug_base_url", { url: engine?.baseUrl ?? "—" }),
218+
t("settings.debug_project_dir", { path: engine?.projectDir ?? "—" }),
219+
t("settings.debug_runtime", { runtime: engine?.runtime ?? "—" }),
220220
],
221221
metricsLines: [] as string[],
222222
error: null as string | null,
@@ -785,14 +785,14 @@ export function useDebugViewModel(options: UseDebugViewModelOptions) {
785785
await bootFullEngineStack();
786786
setOpencodeServiceStatus({
787787
tone: "success",
788-
message: t("settings.restart_succeeded_template", undefined, { service: "OpenCode" }),
788+
message: t("settings.restart_succeeded_template", { service: "OpenCode" }),
789789
});
790790
pushDeveloperLog("Restarted OpenCode via engine_start");
791791
} catch (error) {
792792
const message = error instanceof Error ? error.message : safeStringify(error);
793793
setOpencodeServiceStatus({
794794
tone: "error",
795-
message: `${t("settings.restart_failed_template", undefined, { service: "OpenCode" })} ${message}`,
795+
message: `${t("settings.restart_failed_template", { service: "OpenCode" })} ${message}`,
796796
});
797797
setServiceRestartError(message);
798798
} finally {
@@ -811,15 +811,15 @@ export function useDebugViewModel(options: UseDebugViewModelOptions) {
811811
});
812812
setOpenworkServiceStatus({
813813
tone: "success",
814-
message: t("settings.restart_succeeded_template", undefined, { service: "OpenWork server" }),
814+
message: t("settings.restart_succeeded_template", { service: "OpenWork server" }),
815815
});
816816
pushDeveloperLog("Restarted openwork-server");
817817
await openworkServerStore.reconnectOpenworkServer();
818818
} catch (error) {
819819
const message = error instanceof Error ? error.message : safeStringify(error);
820820
setOpenworkServiceStatus({
821821
tone: "error",
822-
message: `${t("settings.restart_failed_template", undefined, { service: "OpenWork server" })} ${message}`,
822+
message: `${t("settings.restart_failed_template", { service: "OpenWork server" })} ${message}`,
823823
});
824824
setServiceRestartError(message);
825825
} finally {
@@ -851,7 +851,7 @@ export function useDebugViewModel(options: UseDebugViewModelOptions) {
851851
}
852852
try {
853853
await navigator.clipboard.writeText(text);
854-
setOpencodeLogStatus(t("settings.copied_service_logs", undefined, { service: "OpenCode" }));
854+
setOpencodeLogStatus(t("settings.copied_service_logs", { service: "OpenCode" }));
855855
} catch (error) {
856856
setOpencodeLogStatus(error instanceof Error ? error.message : safeStringify(error));
857857
}
@@ -884,7 +884,7 @@ export function useDebugViewModel(options: UseDebugViewModelOptions) {
884884
}
885885
try {
886886
await navigator.clipboard.writeText(text);
887-
setOpenworkLogStatus(t("settings.copied_service_logs", undefined, { service: "OpenWork server" }));
887+
setOpenworkLogStatus(t("settings.copied_service_logs", { service: "OpenWork server" }));
888888
} catch (error) {
889889
setOpenworkLogStatus(error instanceof Error ? error.message : safeStringify(error));
890890
}

0 commit comments

Comments
 (0)