From d4b0213a55834b2f976ac76c1adbf99b3bb0783a Mon Sep 17 00:00:00 2001 From: Chili Palmer Date: Fri, 24 Apr 2026 18:34:01 +0200 Subject: [PATCH] feat: more UI cleanup --- lib/bds/ui/shell_page.ex | 7 +- lib/bds/ui/workbench.ex | 4 +- priv/i18n/locales/de.json | 119 +++++++++++++++++++- priv/i18n/locales/en.json | 119 +++++++++++++++++++- priv/ui/app.js | 223 ++++++++++++++++++++----------------- test/bds/ui/shell_test.exs | 40 +++++++ 6 files changed, 407 insertions(+), 105 deletions(-) diff --git a/lib/bds/ui/shell_page.ex b/lib/bds/ui/shell_page.ex index af942a7..148c148 100644 --- a/lib/bds/ui/shell_page.ex +++ b/lib/bds/ui/shell_page.ex @@ -10,10 +10,11 @@ defmodule BDS.UI.ShellPage do def render do bootstrap = bootstrap() + ui_language = get_in(bootstrap, [:i18n, :ui_language]) || "en" [ "", - "", + "", "", " ", " ", @@ -58,6 +59,10 @@ defmodule BDS.UI.ShellPage do title: Application.get_env(:bds, :desktop)[:title] || "Blogging Desktop Server", i18n: %{ ui_language: ui_language, + catalogs: + Enum.into(I18n.supported_languages(), %{}, fn language -> + {language.code, I18n.get_ui_translations(language.code)} + end), supported_ui_languages: Enum.map(I18n.supported_languages(), fn language -> %{ diff --git a/lib/bds/ui/workbench.ex b/lib/bds/ui/workbench.ex index 2a44a52..c97026d 100644 --- a/lib/bds/ui/workbench.ex +++ b/lib/bds/ui/workbench.ex @@ -183,7 +183,9 @@ defmodule BDS.UI.Workbench do right: %{ post_status: post_status(state, Keyword.get(opts, :active_post_status)), post_count: "#{Keyword.get(opts, :post_count, 0)} posts", + post_count_value: Keyword.get(opts, :post_count, 0), media_count: "#{Keyword.get(opts, :media_count, 0)} media", + media_count_value: Keyword.get(opts, :media_count, 0), token_usage: token_usage(state, Keyword.get(opts, :token_usage)), theme_badge: Keyword.get(opts, :theme_badge, "default"), offline_mode: Keyword.get(opts, :offline_mode, false), @@ -265,4 +267,4 @@ defmodule BDS.UI.Workbench do defp clamp_sidebar_width(width), do: max(200, min(width, 500)) defp clamp_assistant_sidebar_width(width), do: max(280, min(width, 640)) -end \ No newline at end of file +end diff --git a/priv/i18n/locales/de.json b/priv/i18n/locales/de.json index e6d968b..212dcec 100644 --- a/priv/i18n/locales/de.json +++ b/priv/i18n/locales/de.json @@ -44,5 +44,122 @@ "render.taxonomy.ariaLabel": "Taxonomie", "render.video.vimeoTitle": "Vimeo-Video", "render.video.youtubeTitle": "YouTube-Video", - "sidebar.chat.yesterday": "Gestern" + "sidebar.chat.yesterday": "Gestern", + "%{count} media": "%{count} Medien", + "%{count} posts": "%{count} Beiträge", + "2 langs": "2 Sprachen", + "AI Assistant": "KI-Assistent", + "Across draft, published, and archive": "Über Entwürfe, veröffentlichte Beiträge und Archiv verteilt", + "Activated %{name}": "%{name} aktiviert", + "Archived": "Archiviert", + "Archived Jan 12, 2026": "Archiviert am 12. Jan. 2026", + "Assistant": "Assistent", + "Automatic AI actions stay gated by airplane mode.": "Automatische KI-Aktionen bleiben durch den Flugmodus gesperrt.", + "Automation can boot the shell in a separate process and capture screenshots": "Die Automatisierung kann die Shell in einem separaten Prozess starten und Screenshots aufnehmen", + "Blog": "Blog", + "Calendar regeneration is not wired yet, but the base shell now surfaces the command and keeps the Output tab selectable.": "Die Kalender-Neuerstellung ist noch nicht verdrahtet, aber die Basisshell zeigt den Befehl jetzt an und hält den Ausgabe-Tab auswählbar.", + "Chat": "Chat", + "Close %{title}": "%{title} schließen", + "Close tab": "Tab schließen", + "Command completed": "Befehl abgeschlossen", + "Command failed": "Befehl fehlgeschlagen", + "Command failed with HTTP %{status}": "Befehl mit HTTP %{status} fehlgeschlagen", + "Create Project": "Projekt erstellen", + "Dashboard": "Instrumententafel", + "Desktop Runtime": "Desktop-Laufzeit", + "Desktop workbench content routed through the Elixir shell.": "Desktop-Arbeitsbereichsinhalte werden durch die Elixir-Shell geleitet.", + "Desktop workbench shell wired through Elixir": "Desktop-Workbench-Shell über Elixir verdrahtet", + "Diff Reports": "Diff-Berichte", + "Diffs": "Differenzen", + "Documentation": "Dokumentation", + "Drafts": "Entwürfe", + "Drafts, published entries, and archive history": "Entwürfe, veröffentlichte Einträge und Archivverlauf", + "Edit": "Bearbeiten", + "Extra": "Zusätzlich", + "Extra Pages": "Zusätzliche Seiten", + "File": "Datei", + "Filesystem Sync": "Dateisystem-Abgleich", + "Fill Missing Translations": "Fehlende Übersetzungen ergänzen", + "Find Duplicates": "Duplikate finden", + "Git": "Git", + "Git Log": "Git-Protokoll", + "Help": "Hilfe", + "Idle": "Leerlauf", + "Images and documents indexed": "Bilder und Dokumente indexiert", + "Import": "Importieren", + "Launch plan": "Startplan", + "Main Language": "Hauptsprache", + "Media": "Medien", + "Menu": "Menü", + "Metadata": "Metadaten", + "Metadata Diff": "Metadaten-Diff", + "Metadata flush, diffing, and rebuild hooks still need editor wiring.": "Metadaten-Schreiben, Diffing und Rebuild-Hooks brauchen noch die Editor-Anbindung.", + "Missing": "Fehlend", + "Missing Pages": "Fehlende Seiten", + "Missing Translations": "Fehlende Übersetzungen", + "Mode": "Modus", + "Native menu groups mirror the old application shell": "Native Menügruppen spiegeln die alte Anwendungsshell wider", + "New Project": "Neues Projekt", + "New project name": "Neuer Projektname", + "No active background tasks": "Keine aktiven Hintergrundaufgaben", + "No background tasks running": "Keine Hintergrundaufgaben aktiv", + "No items": "Keine Einträge", + "No missing pages": "Keine fehlenden Seiten", + "No orphan translation files": "Keine verwaisten Übersetzungsdateien", + "No shell output yet": "Noch keine Shell-Ausgabe", + "Offline": "Offline", + "Offline Gate": "Offline-Sperre", + "Open": "Öffnen", + "Open Data Folder": "Datenordner öffnen", + "Open in Browser": "Im Browser öffnen", + "Opened URL": "URL geöffnet", + "Orphan Files": "Verwaiste Dateien", + "Orphan Reports": "Berichte zu verwaisten Dateien", + "Orphans": "Verwaiste", + "Output": "Ausgabe", + "Pages": "Seiten", + "Pairs": "Paare", + "Post": "Beitrag", + "Posts": "Beiträge", + "Preview": "Vorschau", + "Projects": "Projekte", + "Published": "Veröffentlicht", + "Published Feb 10, 2026": "Veröffentlicht am 10. Feb. 2026", + "Queued": "In Warteschlange", + "Regenerate Calendar": "Kalender neu erzeugen", + "Retrospective": "Rückblick", + "Roadmap": "Fahrplan", + "Running": "Läuft", + "Script": "Skript", + "Scripts": "Skripte", + "Select Project": "Projekt auswählen", + "Settings": "Einstellungen", + "Sidebar, tabs, panel, and assistant panes are inspectable DOM regions": "Seitenleiste, Tabs, Panel und Assistentenbereiche sind als DOM-Regionen inspizierbar", + "Site Validation": "Website-Validierung", + "Source Control": "Quellcodeverwaltung", + "Stale": "Veraltet", + "Stale Pages": "Veraltete Seiten", + "Status": "Status", + "Style": "Stil", + "Switch project": "Projekt wechseln", + "Tags": "Tags", + "Tasks": "Aufgaben", + "Template": "Vorlage", + "Templates": "Vorlagen", + "The app window is now served from the Elixir shell renderer.": "Das App-Fenster wird jetzt vom Elixir-Shell-Renderer ausgeliefert.", + "The shared lower panel is available for tasks, output, git details, and editor-specific diagnostics.": "Das gemeinsame untere Panel steht für Aufgaben, Ausgabe, Git-Details und editorbezogene Diagnosen bereit.", + "Toggle assistant": "Assistent umschalten", + "Toggle offline mode": "Offline-Modus umschalten", + "Toggle panel": "Panel umschalten", + "Toggle sidebar": "Seitenleiste umschalten", + "Translation fill is not wired yet, but the command is now routed into Output instead of being ignored.": "Das Ergänzen fehlender Übersetzungen ist noch nicht verdrahtet, aber der Befehl wird jetzt in die Ausgabe geleitet statt ignoriert zu werden.", + "Translations": "Übersetzungen", + "UI": "UI", + "Updated today": "Heute aktualisiert", + "Updated yesterday": "Gestern aktualisiert", + "Upload Site": "Website hochladen", + "View": "Ansicht", + "Welcome to bDS2": "Willkommen bei bDS2", + "Workbench Notes": "Workbench-Hinweise", + "Working tree integration is not wired yet in the shell, but the tab is selectable and ready for command output.": "Die Integration des Arbeitsverzeichnisses ist in der Shell noch nicht verdrahtet, aber der Tab ist auswählbar und bereit für Befehlsausgaben." } \ No newline at end of file diff --git a/priv/i18n/locales/en.json b/priv/i18n/locales/en.json index e42134f..7e13be0 100644 --- a/priv/i18n/locales/en.json +++ b/priv/i18n/locales/en.json @@ -44,5 +44,122 @@ "render.taxonomy.ariaLabel": "Taxonomy", "render.video.vimeoTitle": "Vimeo video", "render.video.youtubeTitle": "YouTube video", - "sidebar.chat.yesterday": "Yesterday" + "sidebar.chat.yesterday": "Yesterday", + "%{count} media": "%{count} media", + "%{count} posts": "%{count} posts", + "2 langs": "2 langs", + "AI Assistant": "AI Assistant", + "Across draft, published, and archive": "Across draft, published, and archive", + "Activated %{name}": "Activated %{name}", + "Archived": "Archived", + "Archived Jan 12, 2026": "Archived Jan 12, 2026", + "Assistant": "Assistant", + "Automatic AI actions stay gated by airplane mode.": "Automatic AI actions stay gated by airplane mode.", + "Automation can boot the shell in a separate process and capture screenshots": "Automation can boot the shell in a separate process and capture screenshots", + "Blog": "Blog", + "Calendar regeneration is not wired yet, but the base shell now surfaces the command and keeps the Output tab selectable.": "Calendar regeneration is not wired yet, but the base shell now surfaces the command and keeps the Output tab selectable.", + "Chat": "Chat", + "Close %{title}": "Close %{title}", + "Close tab": "Close tab", + "Command completed": "Command completed", + "Command failed": "Command failed", + "Command failed with HTTP %{status}": "Command failed with HTTP %{status}", + "Create Project": "Create Project", + "Dashboard": "Dashboard", + "Desktop Runtime": "Desktop Runtime", + "Desktop workbench content routed through the Elixir shell.": "Desktop workbench content routed through the Elixir shell.", + "Desktop workbench shell wired through Elixir": "Desktop workbench shell wired through Elixir", + "Diff Reports": "Diff Reports", + "Diffs": "Diffs", + "Documentation": "Documentation", + "Drafts": "Drafts", + "Drafts, published entries, and archive history": "Drafts, published entries, and archive history", + "Edit": "Edit", + "Extra": "Extra", + "Extra Pages": "Extra Pages", + "File": "File", + "Filesystem Sync": "Filesystem Sync", + "Fill Missing Translations": "Fill Missing Translations", + "Find Duplicates": "Find Duplicates", + "Git": "Git", + "Git Log": "Git Log", + "Help": "Help", + "Idle": "Idle", + "Images and documents indexed": "Images and documents indexed", + "Import": "Import", + "Launch plan": "Launch plan", + "Main Language": "Main Language", + "Media": "Media", + "Menu": "Menu", + "Metadata": "Metadata", + "Metadata Diff": "Metadata Diff", + "Metadata flush, diffing, and rebuild hooks still need editor wiring.": "Metadata flush, diffing, and rebuild hooks still need editor wiring.", + "Missing": "Missing", + "Missing Pages": "Missing Pages", + "Missing Translations": "Missing Translations", + "Mode": "Mode", + "Native menu groups mirror the old application shell": "Native menu groups mirror the old application shell", + "New Project": "New Project", + "New project name": "New project name", + "No active background tasks": "No active background tasks", + "No background tasks running": "No background tasks running", + "No items": "No items", + "No missing pages": "No missing pages", + "No orphan translation files": "No orphan translation files", + "No shell output yet": "No shell output yet", + "Offline": "Offline", + "Offline Gate": "Offline Gate", + "Open": "Open", + "Open Data Folder": "Open Data Folder", + "Open in Browser": "Open in Browser", + "Opened URL": "Opened URL", + "Orphan Files": "Orphan Files", + "Orphan Reports": "Orphan Reports", + "Orphans": "Orphans", + "Output": "Output", + "Pages": "Pages", + "Pairs": "Pairs", + "Post": "Post", + "Posts": "Posts", + "Preview": "Preview", + "Projects": "Projects", + "Published": "Published", + "Published Feb 10, 2026": "Published Feb 10, 2026", + "Queued": "Queued", + "Regenerate Calendar": "Regenerate Calendar", + "Retrospective": "Retrospective", + "Roadmap": "Roadmap", + "Running": "Running", + "Script": "Script", + "Scripts": "Scripts", + "Select Project": "Select Project", + "Settings": "Settings", + "Sidebar, tabs, panel, and assistant panes are inspectable DOM regions": "Sidebar, tabs, panel, and assistant panes are inspectable DOM regions", + "Site Validation": "Site Validation", + "Source Control": "Source Control", + "Stale": "Stale", + "Stale Pages": "Stale Pages", + "Status": "Status", + "Style": "Style", + "Switch project": "Switch project", + "Tags": "Tags", + "Tasks": "Tasks", + "Template": "Template", + "Templates": "Templates", + "The app window is now served from the Elixir shell renderer.": "The app window is now served from the Elixir shell renderer.", + "The shared lower panel is available for tasks, output, git details, and editor-specific diagnostics.": "The shared lower panel is available for tasks, output, git details, and editor-specific diagnostics.", + "Toggle assistant": "Toggle assistant", + "Toggle offline mode": "Toggle offline mode", + "Toggle panel": "Toggle panel", + "Toggle sidebar": "Toggle sidebar", + "Translation fill is not wired yet, but the command is now routed into Output instead of being ignored.": "Translation fill is not wired yet, but the command is now routed into Output instead of being ignored.", + "Translations": "Translations", + "UI": "UI", + "Updated today": "Updated today", + "Updated yesterday": "Updated yesterday", + "Upload Site": "Upload Site", + "View": "View", + "Welcome to bDS2": "Welcome to bDS2", + "Workbench Notes": "Workbench Notes", + "Working tree integration is not wired yet in the shell, but the tab is selectable and ready for command output.": "Working tree integration is not wired yet in the shell, but the tab is selectable and ready for command output." } \ No newline at end of file diff --git a/priv/ui/app.js b/priv/ui/app.js index 83c4c12..6d6ce35 100644 --- a/priv/ui/app.js +++ b/priv/ui/app.js @@ -23,6 +23,25 @@ const state = { tabMeta: {}, }; +function translationsForLanguage(language) { + return bootstrap.i18n?.catalogs?.[language] || bootstrap.i18n?.catalogs?.en || {}; +} + +function t(key, bindings = {}) { + const catalog = translationsForLanguage(state.uiLanguage); + let text = catalog[key] || key; + + Object.entries(bindings).forEach(([binding, value]) => { + text = text.replaceAll(`%{${binding}}`, String(value)); + }); + + return text; +} + +function tText(value, bindings = {}) { + return t(String(value), bindings); +} + bindNativeMenuBridge(); bindGlobalHotkeys(); scheduleTaskPolling(); @@ -51,23 +70,23 @@ function renderTitlebar() { root.querySelector(".window-titlebar").innerHTML = `
${bootstrap.menu_groups - .map((group) => ``) + .map((group) => ``) .join("")}
${escapeHtml(bootstrap.title)}
- ${renderTitlebarAction("toggle-sidebar", "toggle-sidebar", "Toggle sidebar", ` + ${renderTitlebarAction("toggle-sidebar", "toggle-sidebar", t("Toggle sidebar"), ` `)} - ${renderTitlebarAction("toggle-panel", "toggle-panel", "Toggle panel", ` + ${renderTitlebarAction("toggle-panel", "toggle-panel", t("Toggle panel"), ` `)} - ${renderTitlebarAction("toggle-assistant-sidebar", "toggle-assistant", "Toggle assistant", ` + ${renderTitlebarAction("toggle-assistant-sidebar", "toggle-assistant", t("Toggle assistant"), ` @@ -104,8 +123,8 @@ function renderActivityButton(view) { data-active="${String(active)}" data-testid="activity-button" type="button" - aria-label="${escapeHtml(view.label)}" - title="${escapeHtml(view.label)}" + aria-label="${escapeHtml(tText(view.label))}" + title="${escapeHtml(tText(view.label))}" > ${activityIcon(view.id)} @@ -119,8 +138,8 @@ function renderSidebar() { root.querySelector(".sidebar").innerHTML = `
- ${escapeHtml(data.title)} - ${escapeHtml(data.subtitle)} + ${escapeHtml(tText(data.title))} + ${escapeHtml(tText(data.subtitle))}
@@ -129,7 +148,7 @@ function renderSidebar() { (section) => `
- ${escapeHtml(section.title)} + ${escapeHtml(tText(section.title))}
${section.items.map((item) => renderSidebarItem(item, view)).join("")} @@ -153,12 +172,12 @@ function renderSidebarItem(item, view) { class="sidebar-item ${active ? "active" : ""}" data-open-tab="${tabId}" data-open-route="${itemRoute}" - data-open-title="${escapeHtmlAttribute(item.title)}" + data-open-title="${escapeHtmlAttribute(tText(item.title))}" type="button" > - ${escapeHtml(item.title)} - ${escapeHtml(item.meta || view.label)} - ${item.badge ? `${escapeHtml(item.badge)}` : ""} + ${escapeHtml(tText(item.title))} + ${escapeHtml(tText(item.meta || view.label))} + ${item.badge ? `${escapeHtml(tText(item.badge))}` : ""} `; } @@ -168,7 +187,7 @@ function renderTabs() { const node = root.querySelector(".tab-bar"); if (tabs.length === 0) { - node.innerHTML = `
Dashboard
`; + node.innerHTML = `
${escapeHtml(t("Dashboard"))}
`; return; } @@ -186,8 +205,8 @@ function renderTab(tab) { return ` `; } @@ -210,8 +229,8 @@ function renderEditor() { .map( (item) => `
- ${escapeHtml(item.label)} - ${escapeHtml(item.value)} + ${escapeHtml(tText(item.label))} + ${escapeHtml(tText(item.value))}
` ) @@ -230,14 +249,14 @@ function renderEditorBody(route) {
    ${dashboard.summary_cards - .map((card) => `
  • ${escapeHtml(card.label)}: ${escapeHtml(card.value)} ${escapeHtml(card.detail)}
    • `) + .map((card) => `
  • ${escapeHtml(tText(card.label))}: ${escapeHtml(card.value)} ${escapeHtml(tText(card.detail))}
    • `) .join("")}
-

Workbench Notes

+

${escapeHtml(t("Workbench Notes"))}

    - ${dashboard.checklist.map((entry) => `
  • ${escapeHtml(entry)}
    • `).join("")} + ${dashboard.checklist.map((entry) => `
  • ${escapeHtml(tText(entry))}
    • `).join("")}
`; @@ -250,13 +269,13 @@ function renderEditorBody(route) { const active = activeItem(); return `
- - - + + +
-

${escapeHtml(active?.title || routeLabel(route))}

-

${escapeHtml(active?.meta || "Desktop workbench content routed through the Elixir shell.")}

+

${escapeHtml(tText(active?.title || routeLabel(route)))}

+

${escapeHtml(tText(active?.meta || "Desktop workbench content routed through the Elixir shell."))}

`; } @@ -292,7 +311,7 @@ function renderPanelBody() { return `
${escapeHtml(routeLabel(state.session.panel.active_tab))} - The shared lower panel is available for tasks, output, git details, and editor-specific diagnostics. + ${escapeHtml(t("The shared lower panel is available for tasks, output, git details, and editor-specific diagnostics."))}
`; } @@ -301,8 +320,8 @@ function renderTaskPanelEntries() { if (!state.taskStatus.tasks.length) { return `
- Tasks - No background tasks running + ${escapeHtml(t("Tasks"))} + ${escapeHtml(t("No background tasks running"))}
`; } @@ -335,8 +354,8 @@ function renderOutputEntries() { if (!state.outputEntries.length) { return `
- Output - No shell output yet + ${escapeHtml(t("Output"))} + ${escapeHtml(t("No shell output yet"))}
`; } @@ -362,8 +381,8 @@ function renderGitLogEntries() { return `
- Git Log - Working tree integration is not wired yet in the shell, but the tab is selectable and ready for command output. + ${escapeHtml(t("Git Log"))} + ${escapeHtml(t("Working tree integration is not wired yet in the shell, but the tab is selectable and ready for command output."))}
`; @@ -372,15 +391,15 @@ function renderGitLogEntries() { function renderAssistant() { root.querySelector(".assistant-sidebar").innerHTML = `
- Assistant + ${escapeHtml(t("Assistant"))}
${bootstrap.content.assistant_cards .map( (card) => `
- ${escapeHtml(card.label)} - ${escapeHtml(card.text)} + ${escapeHtml(tText(card.label))} + ${escapeHtml(tText(card.text))}
` ) @@ -392,23 +411,25 @@ function renderAssistant() { function renderStatusBar() { const status = state.status; const taskOverflow = state.taskStatus.running_task_overflow; - const taskMessage = state.taskStatus.running_task_message || "Idle"; + const taskMessage = state.taskStatus.running_task_message || t("Idle"); + const postCount = status.right.post_count_value ?? status.right.post_count; + const mediaCount = status.right.media_count_value ?? status.right.media_count; root.querySelector(".status-bar").innerHTML = `
${renderProjectSelector()}
- ${escapeHtml(status.right.post_count)} - ${escapeHtml(status.right.media_count)} + ${escapeHtml(typeof postCount === "number" ? t("%{count} posts", { count: postCount }) : tText(postCount))} + ${escapeHtml(typeof mediaCount === "number" ? t("%{count} media", { count: mediaCount }) : tText(mediaCount))} ${escapeHtml(status.right.theme_badge)} - + ${escapeHtml(status.right.brand)} @@ -657,7 +678,7 @@ async function fetchProjects() { } async function createProject() { - const name = window.prompt("New project name", "New Project"); + const name = window.prompt(t("New project name"), t("New Project")); if (!name || !name.trim()) { return; } @@ -677,17 +698,17 @@ async function createProject() { const payload = await response.json(); if (!response.ok || payload.status !== "ok") { - appendOutputEntry("Create Project", payload.error?.message || `Command failed with HTTP ${response.status}`); + appendOutputEntry(t("Create Project"), payload.error?.message || t("Command failed with HTTP %{status}", { status: response.status })); setPanelTab("output"); render(); return; } await fetchProjects(); - appendOutputEntry("Create Project", `Activated ${payload.project.name}`); + appendOutputEntry(t("Create Project"), t("Activated %{name}", { name: payload.project.name })); render(); } catch (error) { - appendOutputEntry("Create Project", error?.message || String(error)); + appendOutputEntry(t("Create Project"), error?.message || String(error)); setPanelTab("output"); render(); } @@ -714,17 +735,17 @@ async function selectProject(projectId) { const payload = await response.json(); if (!response.ok || payload.status !== "ok") { - appendOutputEntry("Select Project", payload.error?.message || `Command failed with HTTP ${response.status}`); + appendOutputEntry(t("Select Project"), payload.error?.message || t("Command failed with HTTP %{status}", { status: response.status })); setPanelTab("output"); render(); return; } await fetchProjects(); - appendOutputEntry("Select Project", `Activated ${payload.project.name}`); + appendOutputEntry(t("Select Project"), t("Activated %{name}", { name: payload.project.name })); render(); } catch (error) { - appendOutputEntry("Select Project", error?.message || String(error)); + appendOutputEntry(t("Select Project"), error?.message || String(error)); setPanelTab("output"); render(); } @@ -792,11 +813,11 @@ function executeLocalShellCommand(action) { openSingletonTab("api_documentation"); return true; case "regenerate_calendar": - appendOutputEntry("Regenerate Calendar", "Calendar regeneration is not wired yet, but the base shell now surfaces the command and keeps the Output tab selectable."); + appendOutputEntry(t("Regenerate Calendar"), t("Calendar regeneration is not wired yet, but the base shell now surfaces the command and keeps the Output tab selectable.")); setPanelTab("output"); return true; case "fill_missing_translations": - appendOutputEntry("Fill Missing Translations", "Translation fill is not wired yet, but the command is now routed into Output instead of being ignored."); + appendOutputEntry(t("Fill Missing Translations"), t("Translation fill is not wired yet, but the command is now routed into Output instead of being ignored.")); setPanelTab("output"); return true; case "toggle_offline_mode": @@ -819,7 +840,7 @@ async function executeBackendShellCommand(action) { }); if (!response.ok) { - appendOutputEntry(routeLabel(action), `Command failed with HTTP ${response.status}`); + appendOutputEntry(routeLabel(action), t("Command failed with HTTP %{status}", { status: response.status })); setPanelTab("output"); render(); return; @@ -850,7 +871,7 @@ function applyShellCommandResult(result) { void fetchTaskStatus(); break; case "open_url": - appendOutputEntry(result.title, result.url || result.message || "Opened URL"); + appendOutputEntry(tText(result.title), tText(result.url || result.message || "Opened URL")); setPanelTab("output"); if (result.url) { @@ -867,11 +888,11 @@ function applyShellCommandResult(result) { }); return; case "output": - appendOutputEntry(result.title, result.message, result.details); + appendOutputEntry(tText(result.title), tText(result.message), result.details); setPanelTab(result.panel_tab || "output"); break; default: - appendOutputEntry(routeLabel(result.action || "output"), result.message || "Command completed"); + appendOutputEntry(routeLabel(result.action || "output"), tText(result.message || "Command completed")); setPanelTab("output"); break; } @@ -880,7 +901,7 @@ function applyShellCommandResult(result) { } function applyShellCommandError(action, error) { - appendOutputEntry(routeLabel(action), error?.message || "Command failed"); + appendOutputEntry(routeLabel(action), error?.message || t("Command failed")); setPanelTab("output"); render(); } @@ -996,7 +1017,7 @@ function tabMetadata(tab) { const item = activeItem(); if (item && tab.id === tabIdForItem(item, item.route)) { - return { title: item.title }; + return { title: tText(item.title) }; } return { title: routeLabel(tab.type) }; @@ -1026,53 +1047,53 @@ function currentEditorMeta() { function editorTitle() { const meta = currentTabMeta(); if (meta?.title) { - return meta.title; + return tText(meta.title); } const item = activeItem(); - return item?.title || bootstrap.content.dashboard.title; + return tText(item?.title || bootstrap.content.dashboard.title); } function editorSubtitle(route) { const meta = currentTabMeta(); if (meta?.subtitle) { - return meta.subtitle; + return tText(meta.subtitle); } if (route === "dashboard") { - return bootstrap.content.dashboard.subtitle; + return tText(bootstrap.content.dashboard.subtitle); } const item = activeItem(); - return item?.meta || `${routeLabel(route)} content loaded through the desktop shell.`; + return tText(item?.meta || "Desktop workbench content routed through the Elixir shell."); } function routeLabel(route) { if (!route) { - return "Dashboard"; + return t("Dashboard"); } if (route === "output") { - return "Output"; + return t("Output"); } if (route === "git_log") { - return "Git Log"; + return t("Git Log"); } if (route === "open_in_browser") { - return "Open in Browser"; + return t("Open in Browser"); } if (route === "open_data_folder") { - return "Open Data Folder"; + return t("Open Data Folder"); } if (route === "upload_site") { - return "Upload Site"; + return t("Upload Site"); } - return ( + return tText( bootstrap.registry.editor_routes.find((item) => item.id === route)?.title || sidebarViews().find((item) => item.id === route)?.label || titleCase(route) @@ -1085,16 +1106,16 @@ function renderCommandPayload(route, payload) { return `
    -
  • Diffs: ${escapeHtml(String(payload.summary?.diff_count || 0))}
    • -
  • Orphans: ${escapeHtml(String(payload.summary?.orphan_count || 0))}
    • +
  • ${escapeHtml(t("Diffs"))}: ${escapeHtml(String(payload.summary?.diff_count || 0))}
    • +
  • ${escapeHtml(t("Orphans"))}: ${escapeHtml(String(payload.summary?.orphan_count || 0))}
-

Diff Reports

+

${escapeHtml(t("Diff Reports"))}

${renderKeyedEntries(payload.diff_reports, ["entity_type", "entity_id", "differences"])}
-

Orphan Reports

+

${escapeHtml(t("Orphan Reports"))}

${renderKeyedEntries(payload.orphan_reports, ["entity_type", "path"])}
`; @@ -1102,51 +1123,51 @@ function renderCommandPayload(route, payload) { return `
    -
  • Missing: ${escapeHtml(String(payload.summary?.missing_count || 0))}
    • -
  • Extra: ${escapeHtml(String(payload.summary?.extra_count || 0))}
    • -
  • Stale: ${escapeHtml(String(payload.summary?.stale_count || 0))}
    • +
  • ${escapeHtml(t("Missing"))}: ${escapeHtml(String(payload.summary?.missing_count || 0))}
    • +
  • ${escapeHtml(t("Extra"))}: ${escapeHtml(String(payload.summary?.extra_count || 0))}
    • +
  • ${escapeHtml(t("Stale"))}: ${escapeHtml(String(payload.summary?.stale_count || 0))}
-

Missing Pages

- ${renderStringList(payload.missing_pages, "No missing pages")} +

${escapeHtml(t("Missing Pages"))}

+ ${renderStringList(payload.missing_pages, t("No missing pages"))}
-

Extra Pages

- ${renderStringList(payload.extra_pages, "No extra pages")} +

${escapeHtml(t("Extra Pages"))}

+ ${renderStringList(payload.extra_pages, t("No extra pages"))}
-

Stale Pages

- ${renderStringList(payload.stale_pages, "No stale pages")} +

${escapeHtml(t("Stale Pages"))}

+ ${renderStringList(payload.stale_pages, t("No stale pages"))}
`; case "translation_validation": return `
    -
  • Missing: ${escapeHtml(String(payload.summary?.missing_count || 0))}
    • -
  • Orphan Files: ${escapeHtml(String(payload.summary?.orphan_count || 0))}
    • -
  • Do Not Translate: ${escapeHtml(String(payload.summary?.do_not_translate_count || 0))}
    • +
  • ${escapeHtml(t("Missing"))}: ${escapeHtml(String(payload.summary?.missing_count || 0))}
    • +
  • ${escapeHtml(t("Orphan Files"))}: ${escapeHtml(String(payload.summary?.orphan_count || 0))}
    • +
  • ${escapeHtml(t("Do Not Translate"))}: ${escapeHtml(String(payload.summary?.do_not_translate_count || 0))}
-

Missing Translations

+

${escapeHtml(t("Missing Translations"))}

${renderKeyedEntries(payload.missing, ["post_id", "language"])}
-

Orphan Files

- ${renderStringList(payload.orphan_files, "No orphan translation files")} +

${escapeHtml(t("Orphan Files"))}

+ ${renderStringList(payload.orphan_files, t("No orphan translation files"))}
`; case "find_duplicates": return `
    -
  • Pairs: ${escapeHtml(String(payload.summary?.pair_count || 0))}
    • +
  • ${escapeHtml(t("Pairs"))}: ${escapeHtml(String(payload.summary?.pair_count || 0))}
-

Duplicate Candidates

+

${escapeHtml(t("Duplicate Candidates"))}

${renderKeyedEntries(payload.pairs, ["title_a", "title_b", "score"])}
`; @@ -1169,7 +1190,7 @@ function renderStringList(items, emptyMessage) { function renderKeyedEntries(items, keys) { if (!items || !items.length) { - return `

No items

`; + return `

${escapeHtml(t("No items"))}

`; } return ` @@ -1330,20 +1351,20 @@ function normalizeProjects(projectsPayload) { } function panelTabs() { - return ["tasks", state.session.panel.active_tab, "output", "git_log"].filter(uniqueValue); + return ["tasks", "output", "git_log", state.session.panel.active_tab].filter(uniqueValue); } function renderPanelTab(tab) { if (tab === "tasks") { - return ``; + return ``; } if (tab === "output") { - return ``; + return ``; } if (tab === "git_log") { - return ``; + return ``; } return ``; @@ -1363,7 +1384,7 @@ function renderProjectSelector() { return `
-
@@ -1459,11 +1480,11 @@ function readStoredUiLanguage(fallback) { function statusLabel(status) { switch (status) { case "running": - return "Running"; + return t("Running"); case "pending": - return "Queued"; + return t("Queued"); default: - return titleCase(status || "task"); + return tText(titleCase(status || "task")); } } diff --git a/test/bds/ui/shell_test.exs b/test/bds/ui/shell_test.exs index 7336271..efe0f63 100644 --- a/test/bds/ui/shell_test.exs +++ b/test/bds/ui/shell_test.exs @@ -115,6 +115,27 @@ defmodule BDS.UI.ShellTest do assert html =~ ~s("name":"My Blog") end + test "shell page localizes bootstrap content for german ui locale" do + previous_lang = System.get_env("LANG") + previous_lc_all = System.get_env("LC_ALL") + + on_exit(fn -> + restore_env("LANG", previous_lang) + restore_env("LC_ALL", previous_lc_all) + end) + + System.put_env("LANG", "de_DE.UTF-8") + System.delete_env("LC_ALL") + + html = ShellPage.render() + + assert html =~ ~s("ui_language":"de") + assert html =~ ~s("catalogs") + assert html =~ ~s("File":"Datei") + assert html =~ ~s("Dashboard":"Instrumententafel") + assert html =~ ~s("Assistant":"Assistent") + end + test "static shell bundle exists for direct browser inspection" do assert File.exists?("/Users/gb/Projects/bDS2/priv/ui/index.html") assert File.exists?("/Users/gb/Projects/bDS2/priv/ui/app.css") @@ -185,6 +206,12 @@ defmodule BDS.UI.ShellTest do assert js =~ "data-panel-tab=\"git_log\"" end + test "static shell bundle keeps bottom panel tabs in a stable order" do + js = File.read!("/Users/gb/Projects/bDS2/priv/ui/app.js") + + assert js =~ "return [\"tasks\", \"output\", \"git_log\", state.session.panel.active_tab].filter(uniqueValue);" + end + test "static shell bundle renders a left-side project field with selection and create affordances" do css = File.read!("/Users/gb/Projects/bDS2/priv/ui/app.css") js = File.read!("/Users/gb/Projects/bDS2/priv/ui/app.js") @@ -203,6 +230,16 @@ defmodule BDS.UI.ShellTest do assert css =~ ".create-project-btn" end + test "static shell bundle uses translation catalogs for visible shell chrome" do + js = File.read!("/Users/gb/Projects/bDS2/priv/ui/app.js") + + assert js =~ "translationsForLanguage" + assert js =~ "function t(" + assert js =~ "New Project" + assert js =~ "No background tasks running" + assert js =~ "Idle" + end + test "static shell bundle binds base shell hotkeys and menu actions to existing shell functionality" do js = File.read!("/Users/gb/Projects/bDS2/priv/ui/app.js") @@ -222,4 +259,7 @@ defmodule BDS.UI.ShellTest do assert js =~ "[data-close-tab]" assert js =~ "language.flag" end + + defp restore_env(key, nil), do: System.delete_env(key) + defp restore_env(key, value), do: System.put_env(key, value) end