From e11debbda44905bc451fe943cc5f320469b9a8a7 Mon Sep 17 00:00:00 2001 From: MarekWo Date: Sat, 1 Aug 2026 09:39:52 +0200 Subject: [PATCH] feat(i18n): translate the app chrome and main chat window (stage 7a) Covers the navbar, the offcanvas main menu, and index.html: the channel sidebar, filter bar, composer, status bar and the FAB column, plus the six fullscreen panel modals, whose headers now reuse each panel's own title key (dm.title, contacts.title, console.title, repeaters.title, pa.title, logs.title) instead of repeating the words. The Settings modal (base.html ~458-1147) and the other modals in base.html are untouched - stages 8 and 7b. Also translated in app.js: updateStatus(), updateLastRefresh(), the FAB collapse toggle, the filter bar's "no matches" panel and updateRegionIndicator(). The rest of app.js stays for stage 9; the line drawn here is "does it overwrite a string index.html just got a key for". Without them the status bar renders Polish server-side and flips back to English a second later, which would make the slice impossible to verify - a miss and a stage-9 leftover look identical. "Filter messages" (menu) and "Filter Messages" (FAB) keep separate keys even though the Polish is identical, so this commit changes no English text, only where it lives. Catalog: 526 -> 573 keys, pl at 100%. Verified with i18n-diff.js and a new i18n-stage7a-chrome.js that opens the offcanvas menu at both viewports - like the DM modals, a closed offcanvas is invisible to the plain diff. Two tooling fixes came out of it, both in F:\tmp\pwverify: - i18n-diff.js checked visibility on the text node's parent only, so every closed modal's contents landed in the report: 275 flagged lines on the main chat, 13 after walking the ancestor chain. It was noise, never a false pass, but it is the kind of noise that trains you to skim the list. - browser.js now centralises the Chrome launch. The translate bubble was held off by one flag copy-pasted into each script; it is now flags plus a persistent profile with translation disabled in Preferences, which is the part that survives Chrome renaming the feature. Co-Authored-By: Claude Opus 5 --- app/static/js/app.js | 20 ++++----- app/templates/base.html | 96 ++++++++++++++++++++-------------------- app/templates/index.html | 80 ++++++++++++++++----------------- app/translations/en.json | 47 ++++++++++++++++++++ app/translations/pl.json | 47 ++++++++++++++++++++ 5 files changed, 192 insertions(+), 98 deletions(-) diff --git a/app/static/js/app.js b/app/static/js/app.js index f1e48d3..9ba540d 100644 --- a/app/static/js/app.js +++ b/app/static/js/app.js @@ -4146,12 +4146,12 @@ function updateRegionIndicator() { nameEl.textContent = scope.name; el.classList.remove('bg-light', 'text-secondary', 'border'); el.classList.add('bg-info', 'text-dark'); - el.title = 'Click to change region for this channel'; + el.title = t('chat.region_title'); } else { - nameEl.textContent = 'No region'; + nameEl.textContent = t('chat.region_none'); el.classList.remove('bg-info', 'text-dark'); el.classList.add('bg-light', 'text-secondary', 'border'); - el.title = 'Click to set a region for this channel'; + el.title = t('chat.region_set_title'); } } @@ -4334,9 +4334,9 @@ function updateStatus(status) { const statusEl = document.getElementById('statusText'); const icons = { - connected: ' Connected', - disconnected: ' Disconnected', - connecting: ' Connecting...' + connected: ` ${tHtml('common.connected')}`, + disconnected: ` ${tHtml('common.disconnected')}`, + connecting: ` ${tHtml('common.connecting')}` }; statusEl.innerHTML = icons[status] || icons.connecting; @@ -4348,7 +4348,7 @@ function updateStatus(status) { function updateLastRefresh() { const now = new Date(); const timeStr = now.toLocaleTimeString(); - document.getElementById('lastRefresh').textContent = `Updated: ${timeStr}`; + document.getElementById('lastRefresh').textContent = t('chat.updated', { time: timeStr }); } /** @@ -6339,13 +6339,13 @@ function initializeFabToggle() { // Restore collapsed state if (localStorage.getItem('mc-webui-fab-collapsed') === '1') { container.classList.add('collapsed'); - toggle.title = 'Show buttons'; + toggle.title = t('chat.fab.show'); } toggle.addEventListener('click', () => { container.classList.toggle('collapsed'); const isCollapsed = container.classList.contains('collapsed'); - toggle.title = isCollapsed ? 'Show buttons' : 'Hide buttons'; + toggle.title = isCollapsed ? t('chat.fab.show') : t('chat.fab.hide'); localStorage.setItem('mc-webui-fab-collapsed', isCollapsed ? '1' : '0'); }); @@ -6620,7 +6620,7 @@ function applyFilter(query) { noMatchesDiv.className = 'filter-no-matches'; noMatchesDiv.innerHTML = ` -

No messages match "${escapeHtml(currentFilterQuery)}"

+

${tHtml('chat.filter.no_matches', { query: currentFilterQuery })}

`; container.appendChild(noMatchesDiv); } diff --git a/app/templates/base.html b/app/templates/base.html index 4cc8c7a..d238fdb 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -63,13 +63,13 @@ - {{ device_name }} {% endif %} {% if transport_type == 'ble' %} - BLE + BLE {% elif transport_type == 'tcp' %} - TCP + TCP {% endif %}
- @@ -92,7 +92,7 @@ diff --git a/app/templates/index.html b/app/templates/index.html index 03aa6a4..f4b45c4 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Chat - mc-webui{% endblock %} +{% block title %}{{ t('chat.title') }} - mc-webui{% endblock %} {% block extra_head %} @@ -14,7 +14,7 @@
- Channels + {{ t('chat.channels') }}
@@ -28,20 +28,20 @@
- +
- - -
@@ -51,14 +51,14 @@
-

Loading messages...

+

{{ t('chat.loading_messages') }}

-
@@ -70,12 +70,12 @@ -
@@ -115,46 +115,46 @@
- - - - - - - - - - - - - -
@@ -164,9 +164,9 @@
-
Direct Messages
+
{{ t('dm.title') }}
@@ -181,9 +181,9 @@
-
Contact Management
+
{{ t('contacts.title') }}
@@ -198,9 +198,9 @@
-
mc-webui Console
+
mc-webui {{ t('console.title') }}
@@ -215,9 +215,9 @@
-
My Repeaters
+
{{ t('repeaters.title') }}
@@ -232,9 +232,9 @@
-
Path Analyzer
+
{{ t('pa.title') }}
@@ -249,9 +249,9 @@
-
System Log
+
{{ t('logs.title') }}
diff --git a/app/translations/en.json b/app/translations/en.json index 552471a..64cbfe0 100644 --- a/app/translations/en.json +++ b/app/translations/en.json @@ -1,15 +1,23 @@ { + "chat.channels": "Channels", "chat.copy_route_title": "Tap to copy route", "chat.emoji_title": "Insert emoji", "chat.fab.hide": "Hide buttons", + "chat.fab.search_title": "Search Messages", "chat.fab.show": "Show buttons", "chat.filter.clear_title": "Clear", "chat.filter.fab_title": "Filter Messages", + "chat.filter.me_title": "Filter my messages", "chat.filter.no_matches": "No messages match \"{query}\"", "chat.filter.ph": "Filter messages...", "chat.input_ph": "Type a message...", + "chat.loading_messages": "Loading messages...", + "chat.region_none": "No region", + "chat.region_set_title": "Click to set a region for this channel", + "chat.region_title": "Click to change region for this channel", "chat.route_hops": "Hops: {count}", "chat.scroll_bottom_title": "Scroll to bottom", + "chat.title": "Chat", "chat.updated": "Updated: {time}", "common.add": "Add", "common.back": "Back", @@ -267,9 +275,48 @@ "logs.loading": "Loading logs...", "logs.pause_title": "Pause/Resume", "logs.title": "System Log", + "menu.advert": "Send Advert", + "menu.advert_desc": "Announce presence (normal)", + "menu.advert_title": "Send single advertisement (recommended for normal operation)", + "menu.backup": "Backup", + "menu.backup_desc": "Database backup & restore", + "menu.channels": "Manage Channels", + "menu.check_updates_title": "Check for updates", + "menu.console_desc": "Direct meshcli commands", + "menu.contacts_desc": "Manage known contacts", + "menu.device_info": "Device Info", + "menu.dm_desc": "Private conversations", + "menu.exact_build_title": "Exact build", + "menu.filter": "Filter messages", + "menu.filter_desc": "Filter current chat", + "menu.flood_advert": "Flood Advert", + "menu.flood_advert_desc": "Network recovery only!", + "menu.flood_advert_title": "Flood advertisement - use sparingly! High airtime usage.", + "menu.history": "Message History", + "menu.logs_desc": "Real-time application logs", + "menu.map": "Map", + "menu.map_desc": "All contacts with GPS", + "menu.map_title": "Show all contacts with GPS on map", + "menu.pa_desc": "Routing path analysis", + "menu.refresh_desc": "Reload messages from server", + "menu.refresh_title": "Reload messages from the server", + "menu.repeaters_desc": "Repeater administration", + "menu.search": "Search messages", + "menu.search_desc": "Search all messages", + "menu.section.network": "Network", + "menu.section.system": "System", + "menu.section.tools": "Tools", + "menu.select_date_title": "Select date", + "menu.settings_desc": "Application settings", + "menu.title": "Menu", + "menu.today_live": "Today (Live)", "meta.language_english_name": "English", "meta.language_name": "English", "meta.translator": "mc-webui", + "nav.ble_title": "Bluetooth Low Energy", + "nav.mark_all_read_title": "Mark all as read", + "nav.select_channel_title": "Select channel", + "nav.tcp_title": "TCP connection", "pa.any_hb": "Any HB", "pa.any_hops": "Any hops", "pa.byte_2_3": "2/3-byte", diff --git a/app/translations/pl.json b/app/translations/pl.json index 03d1e88..51145dd 100644 --- a/app/translations/pl.json +++ b/app/translations/pl.json @@ -1,15 +1,23 @@ { + "chat.channels": "Kanały", "chat.copy_route_title": "Dotknij, aby skopiować trasę", "chat.emoji_title": "Wstaw emoji", "chat.fab.hide": "Ukryj przyciski", + "chat.fab.search_title": "Szukaj w wiadomościach", "chat.fab.show": "Pokaż przyciski", "chat.filter.clear_title": "Wyczyść", "chat.filter.fab_title": "Filtruj wiadomości", + "chat.filter.me_title": "Filtruj moje wiadomości", "chat.filter.no_matches": "Brak wiadomości pasujących do „{query}”", "chat.filter.ph": "Filtruj wiadomości...", "chat.input_ph": "Napisz wiadomość...", + "chat.loading_messages": "Wczytywanie wiadomości...", + "chat.region_none": "Bez regionu", + "chat.region_set_title": "Kliknij, aby ustawić region dla tego kanału", + "chat.region_title": "Kliknij, aby zmienić region dla tego kanału", "chat.route_hops": "Hopy: {count}", "chat.scroll_bottom_title": "Przewiń na dół", + "chat.title": "Czat", "chat.updated": "Aktualizacja: {time}", "common.add": "Dodaj", "common.back": "Wstecz", @@ -291,9 +299,48 @@ "logs.loading": "Ładowanie dziennika...", "logs.pause_title": "Wstrzymaj/Wznów", "logs.title": "Dziennik systemowy", + "menu.advert": "Wyślij advert", + "menu.advert_desc": "Ogłoś obecność (normalnie)", + "menu.advert_title": "Wyślij pojedynczy advert (zalecane przy normalnej pracy)", + "menu.backup": "Kopia zapasowa", + "menu.backup_desc": "Kopia i przywracanie bazy danych", + "menu.channels": "Zarządzaj kanałami", + "menu.check_updates_title": "Sprawdź aktualizacje", + "menu.console_desc": "Bezpośrednie komendy meshcli", + "menu.contacts_desc": "Zarządzaj znanymi kontaktami", + "menu.device_info": "Informacje o urządzeniu", + "menu.dm_desc": "Rozmowy prywatne", + "menu.exact_build_title": "Dokładny build", + "menu.filter": "Filtruj wiadomości", + "menu.filter_desc": "Filtruj bieżący czat", + "menu.flood_advert": "Flood advert", + "menu.flood_advert_desc": "Tylko do odbudowy sieci!", + "menu.flood_advert_title": "Flood advert — używaj oszczędnie! Duże zużycie czasu antenowego.", + "menu.history": "Historia wiadomości", + "menu.logs_desc": "Logi aplikacji w czasie rzeczywistym", + "menu.map": "Mapa", + "menu.map_desc": "Wszystkie kontakty z GPS", + "menu.map_title": "Pokaż na mapie wszystkie kontakty z GPS", + "menu.pa_desc": "Analiza ścieżek routingu", + "menu.refresh_desc": "Wczytaj wiadomości ponownie z serwera", + "menu.refresh_title": "Wczytaj wiadomości ponownie z serwera", + "menu.repeaters_desc": "Administracja repeaterami", + "menu.search": "Szukaj w wiadomościach", + "menu.search_desc": "Przeszukaj wszystkie wiadomości", + "menu.section.network": "Sieć", + "menu.section.system": "System", + "menu.section.tools": "Narzędzia", + "menu.select_date_title": "Wybierz datę", + "menu.settings_desc": "Ustawienia aplikacji", + "menu.title": "Menu", + "menu.today_live": "Dziś (na żywo)", "meta.language_english_name": "Polish", "meta.language_name": "Polski", "meta.translator": "mc-webui", + "nav.ble_title": "Bluetooth Low Energy", + "nav.mark_all_read_title": "Oznacz wszystko jako przeczytane", + "nav.select_channel_title": "Wybierz kanał", + "nav.tcp_title": "Połączenie TCP", "pa.any_hb": "Dowolne HB", "pa.any_hops": "Dowolne hopy", "pa.byte_2_3": "2/3 bajty",