From d41bcd3c0f205dc1c31fc79aee3908fdb0fa195b Mon Sep 17 00:00:00 2001 From: Kaj Schittecat Date: Wed, 12 Aug 2026 09:16:38 +0200 Subject: [PATCH] i18n: register the three new scope strings, and fix a key that could never match The #259 popup change introduced TR("Scope "), TR("my region") and TR("another region"). Two problems, both caught by re-running the audit rather than by eye: - none of the 13 language files had rows for them, which would have reopened the drift closed in d4ade2e. Added to all 13 as empty rows (the format's own untranslated marker), so translators see the gap and English falls through meanwhile. - the key was "Scope " with a trailing space. TR() strips icon-glyph prefixes, NOT trailing whitespace, so the lookup would never have matched a "Scope" row and that label was permanently English in every language. The space now lives in the format string where it belongs. audit-lang.py: 0 missing and 0 unsafe across all 13. Co-Authored-By: Claude Opus 5 --- deploy/apps/lang/bg.lang | 3 +++ deploy/apps/lang/de.lang | 3 +++ deploy/apps/lang/el.lang | 3 +++ deploy/apps/lang/es.lang | 3 +++ deploy/apps/lang/fr.lang | 3 +++ deploy/apps/lang/hu.lang | 3 +++ deploy/apps/lang/it.lang | 3 +++ deploy/apps/lang/nl.lang | 3 +++ deploy/apps/lang/pt-br.lang | 3 +++ deploy/apps/lang/ro.lang | 3 +++ deploy/apps/lang/ru.lang | 3 +++ deploy/apps/lang/sr.lang | 3 +++ deploy/apps/lang/uk.lang | 3 +++ src/ui-touch/UITask.cpp | 4 +++- 14 files changed, 42 insertions(+), 1 deletion(-) diff --git a/deploy/apps/lang/bg.lang b/deploy/apps/lang/bg.lang index 3a8c073..84ce45f 100644 --- a/deploy/apps/lang/bg.lang +++ b/deploy/apps/lang/bg.lang @@ -970,3 +970,6 @@ zoom %d мащаб %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. усилвател ~17 dB за тихи/отдалечени места; изключи в шумни. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/de.lang b/deploy/apps/lang/de.lang index cd87ceb..f5158af 100644 --- a/deploy/apps/lang/de.lang +++ b/deploy/apps/lang/de.lang @@ -970,3 +970,6 @@ zoom %d Zoom %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. ~17 dB Verstärker für ruhige/abgelegene Gebiete; in lauten Zonen aus. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/el.lang b/deploy/apps/lang/el.lang index f03bfa6..7f3c294 100644 --- a/deploy/apps/lang/el.lang +++ b/deploy/apps/lang/el.lang @@ -970,3 +970,6 @@ zoom %d ζουμ %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. ενισχυτής ~17 dB για ήσυχες/απομακρυσμένες περιοχές· κλείστε σε θορυβώδεις. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/es.lang b/deploy/apps/lang/es.lang index 5c12cca..a761116 100644 --- a/deploy/apps/lang/es.lang +++ b/deploy/apps/lang/es.lang @@ -970,3 +970,6 @@ zoom %d zoom %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. amplificador ~17 dB para zonas tranquilas/remotas; apaga en zonas ruidosas. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/fr.lang b/deploy/apps/lang/fr.lang index e784905..38f8d71 100644 --- a/deploy/apps/lang/fr.lang +++ b/deploy/apps/lang/fr.lang @@ -970,3 +970,6 @@ zoom %d zoom %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. ampli ~17 dB pour zones calmes/isolées ; désactiver en zone bruyante. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/hu.lang b/deploy/apps/lang/hu.lang index 297fdcd..d07eb2d 100644 --- a/deploy/apps/lang/hu.lang +++ b/deploy/apps/lang/hu.lang @@ -990,3 +990,6 @@ zoom %d zoom %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. ~17 dB erősítővel csendes/távoli helyeken; zajos helyeken kapcsold ki. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/it.lang b/deploy/apps/lang/it.lang index 1b4a309..095408f 100644 --- a/deploy/apps/lang/it.lang +++ b/deploy/apps/lang/it.lang @@ -970,3 +970,6 @@ zoom %d zoom %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. ampli ~17 dB per zone tranquille/remote; spegni in zone rumorose. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/nl.lang b/deploy/apps/lang/nl.lang index fc4c18c..9a05e19 100644 --- a/deploy/apps/lang/nl.lang +++ b/deploy/apps/lang/nl.lang @@ -970,3 +970,6 @@ zoom %d zoom %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. ~17 dB versterker voor stille/afgelegen gebieden; uit in drukke plekken. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/pt-br.lang b/deploy/apps/lang/pt-br.lang index c059f57..200c3bd 100644 --- a/deploy/apps/lang/pt-br.lang +++ b/deploy/apps/lang/pt-br.lang @@ -970,3 +970,6 @@ zoom %d zoom %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. amplificador ~17 dB para áreas silenciosas/remotas; desligue em locais ruidosos. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/ro.lang b/deploy/apps/lang/ro.lang index 7f5de4e..795e18e 100644 --- a/deploy/apps/lang/ro.lang +++ b/deploy/apps/lang/ro.lang @@ -970,3 +970,6 @@ zoom %d zoom %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. amplificator ~17 dB pentru zone liniştite/izolate; opreşte-l în locuri zgomotoase. © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/ru.lang b/deploy/apps/lang/ru.lang index bb3dd87..7c609b3 100644 --- a/deploy/apps/lang/ru.lang +++ b/deploy/apps/lang/ru.lang @@ -970,3 +970,6 @@ zoom %d масштаб %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. усилитель ~17 дБ для тихих/удалённых мест; выключайте в шумных. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/sr.lang b/deploy/apps/lang/sr.lang index 9b37a10..4c4126e 100644 --- a/deploy/apps/lang/sr.lang +++ b/deploy/apps/lang/sr.lang @@ -970,3 +970,6 @@ zoom %d зум %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. појачало ~17 dB за тиха/удаљена места; искључи у бучним. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/deploy/apps/lang/uk.lang b/deploy/apps/lang/uk.lang index 59645b3..5120213 100644 --- a/deploy/apps/lang/uk.lang +++ b/deploy/apps/lang/uk.lang @@ -970,3 +970,6 @@ zoom %d масштаб %d ~17 dB amp for quiet/remote areas; turn off in noisy spots. підсилювач ~17 дБ для тихих/віддалених місць; вимикайте в галасливих. © OpenStreetMap © OpenStreetMap © OpenTopoMap © OpenTopoMap +Scope +another region +my region diff --git a/src/ui-touch/UITask.cpp b/src/ui-touch/UITask.cpp index 39aec29..8779702 100644 --- a/src/ui-touch/UITask.cpp +++ b/src/ui-touch/UITask.cpp @@ -31090,8 +31090,10 @@ static void openMessageInfoPopup(int msg_idx) { } else { snprintf(region, sizeof region, "%s", TR("another region")); } + // Key is "Scope" with no trailing space: TR() strips icon prefixes, NOT + // trailing whitespace, so "Scope " would never match its .lang row. blen += snprintf(body + blen, sizeof(body) - blen, - "\n%s %s (%04X)", TR("Scope "), region, (unsigned)m.in_scope); + "\n%s %s (%04X)", TR("Scope"), region, (unsigned)m.in_scope); } // Full inbound route — the repeaters this flood traversed. Resolve each hop's // hash to its repeater name when that contact is known. EVERY hop is listed