diff options
| author | Adam <[email protected]> | 2026-01-20 10:50:46 -0600 |
|---|---|---|
| committer | Adam <[email protected]> | 2026-01-20 17:58:06 -0600 |
| commit | 9b7d9c8173c222c880cf731b859fc78fed5265fc (patch) | |
| tree | 7cfd07bd8dd0c0b869c9d4ca38a5e167962261c8 /packages | |
| parent | 0f2e8ea2b49fcab8c539449b51c40eea8215c2d3 (diff) | |
| download | opencode-9b7d9c8173c222c880cf731b859fc78fed5265fc.tar.gz opencode-9b7d9c8173c222c880cf731b859fc78fed5265fc.zip | |
wip(app): i18n
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/app/src/components/session/session-sortable-terminal-tab.tsx | 14 | ||||
| -rw-r--r-- | packages/app/src/context/terminal.tsx | 40 | ||||
| -rw-r--r-- | packages/app/src/i18n/en.ts | 2 | ||||
| -rw-r--r-- | packages/app/src/i18n/zh.ts | 2 | ||||
| -rw-r--r-- | packages/app/src/pages/session.tsx | 22 |
5 files changed, 67 insertions, 13 deletions
diff --git a/packages/app/src/components/session/session-sortable-terminal-tab.tsx b/packages/app/src/components/session/session-sortable-terminal-tab.tsx index d20f587f4..0e387b9fb 100644 --- a/packages/app/src/components/session/session-sortable-terminal-tab.tsx +++ b/packages/app/src/components/session/session-sortable-terminal-tab.tsx @@ -3,10 +3,22 @@ import { createSortable } from "@thisbeyond/solid-dnd" import { IconButton } from "@opencode-ai/ui/icon-button" import { Tabs } from "@opencode-ai/ui/tabs" import { useTerminal, type LocalPTY } from "@/context/terminal" +import { useLanguage } from "@/context/language" export function SortableTerminalTab(props: { terminal: LocalPTY }): JSX.Element { const terminal = useTerminal() + const language = useLanguage() const sortable = createSortable(props.terminal.id) + + const label = () => { + language.locale() + const number = props.terminal.titleNumber + if (Number.isFinite(number) && number > 0) { + return language.t("terminal.title.numbered", { number }) + } + if (props.terminal.title) return props.terminal.title + return language.t("terminal.title") + } return ( // @ts-ignore <div use:sortable classList={{ "h-full": true, "opacity-0": sortable.isActiveDraggable }}> @@ -19,7 +31,7 @@ export function SortableTerminalTab(props: { terminal: LocalPTY }): JSX.Element ) } > - {props.terminal.title} + {label()} </Tabs.Trigger> </div> </div> diff --git a/packages/app/src/context/terminal.tsx b/packages/app/src/context/terminal.tsx index 5732114b4..8bde12da1 100644 --- a/packages/app/src/context/terminal.tsx +++ b/packages/app/src/context/terminal.tsx @@ -1,6 +1,6 @@ import { createStore, produce } from "solid-js/store" import { createSimpleContext } from "@opencode-ai/ui/context" -import { batch, createMemo, createRoot, onCleanup } from "solid-js" +import { batch, createEffect, createMemo, createRoot, onCleanup } from "solid-js" import { useParams } from "@solidjs/router" import { useSDK } from "./sdk" import { Persist, persisted } from "@/utils/persist" @@ -28,6 +28,14 @@ type TerminalCacheEntry = { function createTerminalSession(sdk: ReturnType<typeof useSDK>, dir: string, session?: string) { const legacy = session ? [`${dir}/terminal/${session}.v1`, `${dir}/terminal.v1`] : [`${dir}/terminal.v1`] + const numberFromTitle = (title: string) => { + const match = title.match(/^Terminal (\d+)$/) + if (!match) return + const value = Number(match[1]) + if (!Number.isFinite(value) || value <= 0) return + return value + } + const [store, setStore, _, ready] = persisted( Persist.workspace(dir, "terminal", legacy), createStore<{ @@ -54,24 +62,36 @@ function createTerminalSession(sdk: ReturnType<typeof useSDK>, dir: string, sess }) onCleanup(unsub) + const meta = { migrated: false } + + createEffect(() => { + if (!ready()) return + if (meta.migrated) return + meta.migrated = true + + setStore("all", (all) => { + const next = all.map((pty) => { + const direct = Number.isFinite(pty.titleNumber) && pty.titleNumber > 0 ? pty.titleNumber : undefined + if (direct !== undefined) return pty + const parsed = numberFromTitle(pty.title) + if (parsed === undefined) return pty + return { ...pty, titleNumber: parsed } + }) + if (next.every((pty, index) => pty === all[index])) return all + return next + }) + }) + return { ready, all: createMemo(() => Object.values(store.all)), active: createMemo(() => store.active), new() { - const parse = (title: string) => { - const match = title.match(/^Terminal (\d+)$/) - if (!match) return - const value = Number(match[1]) - if (!Number.isFinite(value) || value <= 0) return - return value - } - const existingTitleNumbers = new Set( store.all.flatMap((pty) => { const direct = Number.isFinite(pty.titleNumber) && pty.titleNumber > 0 ? pty.titleNumber : undefined if (direct !== undefined) return [direct] - const parsed = parse(pty.title) + const parsed = numberFromTitle(pty.title) if (parsed === undefined) return [] return [parsed] }), diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts index 34fec6177..3d35e8f86 100644 --- a/packages/app/src/i18n/en.ts +++ b/packages/app/src/i18n/en.ts @@ -384,6 +384,8 @@ export const dict = { "prompt.loading": "Loading prompt...", "terminal.loading": "Loading terminal...", + "terminal.title": "Terminal", + "terminal.title.numbered": "Terminal {{number}}", "common.closeTab": "Close tab", "common.dismiss": "Dismiss", diff --git a/packages/app/src/i18n/zh.ts b/packages/app/src/i18n/zh.ts index 7ae62350d..242d8a170 100644 --- a/packages/app/src/i18n/zh.ts +++ b/packages/app/src/i18n/zh.ts @@ -381,6 +381,8 @@ export const dict = { "prompt.loading": "正在加载提示...", "terminal.loading": "正在加载终端...", + "terminal.title": "终端", + "terminal.title.numbered": "终端 {{number}}", "common.closeTab": "关闭标签页", "common.dismiss": "忽略", diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx index 7733784f9..ebc6b8c23 100644 --- a/packages/app/src/pages/session.tsx +++ b/packages/app/src/pages/session.tsx @@ -1172,7 +1172,18 @@ export default function Page() { createEffect(() => { if (!terminal.ready()) return - handoff.terminals = terminal.all().map((t) => t.title) + language.locale() + + const label = (pty: LocalPTY) => { + const number = pty.titleNumber + if (Number.isFinite(number) && number > 0) { + return language.t("terminal.title.numbered", { number }) + } + if (pty.title) return pty.title + return language.t("terminal.title") + } + + handoff.terminals = terminal.all().map(label) }) createEffect(() => { @@ -1906,7 +1917,14 @@ export default function Page() { <Show when={pty()}> {(t) => ( <div class="relative p-1 h-10 flex items-center bg-background-stronger text-14-regular"> - {t().title} + {(() => { + const number = t().titleNumber + if (Number.isFinite(number) && number > 0) { + return language.t("terminal.title.numbered", { number }) + } + if (t().title) return t().title + return language.t("terminal.title") + })()} </div> )} </Show> |
