@dickpy/dsh-imagegen 1.5.2 → 1.5.4

package/src/client/helpers.ts

@@ -1,33 +1,71 @@
-/**
- * Shared panel helpers: the active-dictionary pick (document-language based,
- * dsh-ssh precedent) bound to the dsh-imagegen interpolator, plus a small
- * error-message extractor. All copy stays in the locale dictionaries.
- */
-
-import { en, zh, type ImageGenKey } from './locales.ts'
-
-/** Template values accepted by the interpolator. */
-export type TranslateValues = Record<string, string | number>
-
-/** Active dictionary, picked by the document language at call time. */
-export function dictionary(): Record<string, string> {
-  const lang = typeof document !== 'undefined' ? document.documentElement.lang : 'zh'
-  return lang.toLowerCase().startsWith('en') ? { ...en } : { ...zh }
-}
-
-/** Translate a key with optional {name} template params (current language). */
-export function tt(key: ImageGenKey, values?: TranslateValues): string {
-  const text = dictionary()[key] ?? key
-  if (values === undefined) return text
-  let rendered = text
-  for (const [name, value] of Object.entries(values)) {
-    rendered = rendered.replaceAll(`{${name}}`, String(value))
-  }
-  return rendered
-}
-
-/** Human-readable error text from an unknown thrown value. */
-export function errorMessage(error: unknown): string {
-  if (error instanceof Error) return error.message
-  return String(error)
-}
+/**
+ * Shared panel helpers: the active-dictionary pick bound to the dsh-imagegen
+ * interpolator, the plugin locale that follows the DSH interface language
+ * (bridged in client/index.ts from ctx.locale — the plugin ships zh / en / ru
+ * and registers itself as a DSH language pack for Русский), plus a small
+ * error-message extractor. All copy stays in the locale dictionaries.
+ */
+
+import { en, ru, zh, type ImageGenKey } from './locales.ts'
+
+/** Template values accepted by the interpolator. */
+export type TranslateValues = Record<string, string | number>
+
+/** Languages with a shipped dictionary. */
+export type ImageGenLanguage = 'zh' | 'en' | 'ru'
+
+const DICTIONARIES: Record<ImageGenLanguage, Record<string, string>> = { zh, en, ru }
+
+/** The active DSH locale mapped onto our dictionary (module-level, one value per app). */
+let activeLocale: ImageGenLanguage = 'zh'
+
+/** Bumped on every locale change; useSyncExternalStore version. */
+let languageVersion = 0
+
+const languageListeners = new Set<() => void>()
+
+/**
+ * Adopt the DSH interface language. Unknown ids (future language packs)
+ * resolve to English — the same per-key fallback convention the host locale
+ * chain uses.
+ */
+export function applyHostLocale(id: unknown): void {
+  const next: ImageGenLanguage = id === 'zh' || id === 'ru' ? id : 'en'
+  if (next === activeLocale) return
+  activeLocale = next
+  languageVersion += 1
+  for (const listener of [...languageListeners]) listener()
+}
+
+/** Monotonic version of the active locale (external-store snapshot). */
+export function getImageGenLanguageVersion(): number {
+  return languageVersion
+}
+
+/** Observe locale changes; returns the unsubscriber. */
+export function subscribeImageGenLanguage(listener: () => void): () => void {
+  languageListeners.add(listener)
+  return () => { languageListeners.delete(listener) }
+}
+
+/** Active dictionary for the current DSH language. */
+export function dictionary(): Record<string, string> {
+  return DICTIONARIES[activeLocale]
+}
+
+/** Translate a key with optional {name} template params (current language). */
+export function tt(key: ImageGenKey, values?: TranslateValues): string {
+  const text = dictionary()[key] ?? key
+  if (values === undefined) return text
+  let rendered = text
+  for (const [name, value] of Object.entries(values)) {
+    rendered = rendered.replaceAll(`{${name}}`, String(value))
+  }
+  return rendered
+}
+
+/** Human-readable error text from an unknown thrown value. */
+export function errorMessage(error: unknown): string {
+  if (error instanceof Error) return error.message
+  return String(error)
+}

package/src/client/index.ts

@@ -11,18 +11,18 @@
  * whole boot when a plugin apply throws, and an external plugin must not take
  * the GUI down.
  */
-import type { Context as ClientContext } from '@deepseek-ai/cordis'
-import type { ISessions } from '@deepseek-ai/dsh-api-session-controller/client'
+import type { Context as ClientContext } from '@deepseek-ai/cordis'
+import type { ISessions } from '@deepseek-ai/dsh-api-session-controller/client'
 import type { ConnectionHandle } from '@deepseek-ai/dsh-client-connection/client'
 // Type-only: pulls the locale plugin's Context merge (ctx.locale).
-import type {} from '@deepseek-ai/dsh-client-locale/client'
-import type {} from '@deepseek-ai/dsh-client-ui-renderer/client'
-// Type-only: pulls the LocaleNamespaceMap merge table.
+import type {} from '@deepseek-ai/dsh-client-locale/client'
+import type {} from '@deepseek-ai/dsh-client-ui-renderer/client'
+// Type-only: pulls the LocaleNamespaceMap merge table.
 import type {} from '@deepseek-ai/dsh-client-ui-slots'
 import { ImageGenApi } from './api.ts'
 import { ImageGenController } from './controller.ts'
-import { tt } from './helpers.ts'
-import { en, zh, type ImageGenKey } from './locales.ts'
+import { tt, applyHostLocale } from './helpers.ts'
+import { en, ru, zh, type ImageGenKey } from './locales.ts'
 import { mountPanel } from './mount.tsx'
 import { mountSidebarEntry } from './sidebar-entry.ts'
 import { ImageGenSettingsCard, ImageGenSettingsCardController } from './SettingsCard.tsx'
@@ -68,7 +68,39 @@ export const inject = ['slots', 'locale', 'connection', 'sessions', 'conversatio
  * @param ctx - client root context (services: slots, locale, connection).
  */
 export function apply(ctx: ClientContext): void {
+  // The host locale service only knows zh/en dictionaries (its type is
+  // fixed); ru rides the untyped single-locale registration instead.
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'dsh-imagegen: dictionaries')
+  // Russian ships as a language pack: the dictionary lands in this plugin's
+  // namespace, and Русский joins the shared DSH language catalog (Settings →
+  // General → Language) with per-key fallback to English for host copy.
+  // Registration order/aggregation between register(NS, 'ru', …) and
+  // addLanguage differs across host builds and a duplicate throws — these
+  // surfaces must degrade silently, never fail the GUI boot.
+  ctx.effect(() => {
+    try {
+      return ctx.locale.register(NS, 'ru', ru)
+    } catch (error) {
+      console.warn('[dsh-imagegen] ru dictionary not registered:', error)
+      return () => {}
+    }
+  }, 'dsh-imagegen: ru dictionary')
+  ctx.effect(() => {
+    try {
+      if (ctx.locale.getLocale().locales.some(locale => locale.id === 'ru')) return () => {}
+      return ctx.locale.addLanguage({ id: 'ru', label: 'Русский', fallback: 'en' })
+    } catch (error) {
+      console.warn('[dsh-imagegen] ru language not added to the catalog:', error)
+      return () => {}
+    }
+  }, 'dsh-imagegen: ru language pack')
+  // Every plugin surface renders through tt(); bridge DSH locale switches
+  // into it so the whole plugin follows the interface language.
+  ctx.effect(() => {
+    const applyLocale = (): void => { applyHostLocale(ctx.locale.getLocale().active) }
+    applyLocale()
+    return ctx.locale.subscribe(applyLocale)
+  }, 'dsh-imagegen: follow host locale')
   registerImageToolviews(ctx)
 
   const connection = ctx.get('connection') as ConnectionHandle | undefined
@@ -119,6 +151,26 @@ export function apply(ctx: ClientContext): void {
         tt('entry.tooltip'),
       ))
       disposers.push(mountPanel(controller, api, scope, { sessions, conversation }))
+      // The imperative sidebar tabs render their labels once; relabel them on
+      // every DSH language switch so the entry follows the interface too.
+      disposers.push(ctx.locale.subscribe(() => {
+        const root = document.querySelector('[data-dsh-imagegen-sidebar-root]')
+        if (root === null) return
+        const labels: Array<[string, string, string]> = [
+          ['new-session', tt('entry.newSession'), tt('entry.newSessionTooltip')],
+          ['image', tt('entry.image'), tt('entry.tooltip')],
+        ]
+        for (const [tab, label, tooltip] of labels) {
+          const button = root.querySelector<HTMLButtonElement>(`[data-dsh-imagegen-tab="${tab}"]`)
+          if (button === null) continue
+          button.setAttribute('aria-label', label)
+          button.setAttribute('title', tooltip)
+          const labelSpan = button.querySelector('span:nth-child(2)')
+          if (labelSpan !== null) labelSpan.textContent = label
+        }
+        const tablist = root.querySelector<HTMLDivElement>('[role="tablist"][data-dsh-imagegen-session-tabs]')
+        tablist?.setAttribute('aria-label', tt('entry.tooltip'))
+      }))
     } catch (error) {
       // DOM failures degrade the studio, never the GUI.
       console.warn('[dsh-imagegen] mount failed:', error)