Merge branch 'main' into fix/remove-operator-hud-layout

src/data/directions.test.mjs

@@ -919,3 +919,19 @@ test('ramp and lane wording stays localized after choosing the maneuver form', (
     );
   }
 });
+
+test('the reroute tooltip keeps German mode nouns capitalized', (t) => {
+  t.after(() => setLocale('en'));
+  const title = (id) =>
+    directionsRowControls(idle).chips.find((chip) => chip.id === id).title;
+  assert.equal(title('mode-foot'), 'Walk — reroute for walk');
+  setLocale('de');
+  assert.equal(
+    title('mode-foot'),
+    'Zu Fuß – Route im Modus „Zu Fuß“ neu berechnen',
+  );
+  assert.equal(
+    title('mode-bike'),
+    'Fahrrad – Route im Modus „Fahrrad“ neu berechnen',
+  );
+});

src/i18n/i18n.test.mjs

@@ -36,6 +36,9 @@ test('normalizeLocale folds regional variants and rejects unshipped tags', () =>
   assert.equal(normalizeLocale('uk'), 'uk');
   assert.equal(normalizeLocale('uk-UA'), 'uk');
   assert.equal(normalizeLocale('en_GB'), 'en');
+  assert.equal(normalizeLocale('de'), 'de');
+  assert.equal(normalizeLocale('de-AT'), 'de');
+  assert.equal(normalizeLocale('de_CH'), 'de');
   assert.equal(normalizeLocale('fr'), 'fr');
   assert.equal(normalizeLocale('fr-CA'), 'fr');
   assert.equal(normalizeLocale('FR_be'), 'fr');
@@ -77,7 +80,7 @@ test('resolveLocale: ?lang= wins, then the stored choice, then browser languages
     resolveLocale({
       location: { search: '?lang=xx' },
       storage: memoryStorage(),
-      languages: ['de-DE', 'ru-RU'],
+      languages: ['ko-KR', 'ru-RU'],
     }),
     'ru',
   );
@@ -85,7 +88,15 @@ test('resolveLocale: ?lang= wins, then the stored choice, then browser languages
     resolveLocale({
       location: { search: '' },
       storage: memoryStorage(),
-      languages: ['de'],
+      languages: ['de-DE', 'ru-RU'],
+    }),
+    'de',
+  );
+  assert.equal(
+    resolveLocale({
+      location: { search: '' },
+      storage: memoryStorage(),
+      languages: ['ko'],
     }),
     'en',
   );

src/i18n/index.js

@@ -16,6 +16,7 @@ import {
   normalizeLocale,
   writeStoredLocale,
 } from './locale.js';
+import de from './locales/de.json' with { type: 'json' };
 import es from './locales/es.json' with { type: 'json' };
 import fr from './locales/fr.json' with { type: 'json' };
 import it from './locales/it.json' with { type: 'json' };
@@ -26,6 +27,7 @@ import zhCN from './locales/zh-CN.json' with { type: 'json' };
 import zhHant from './locales/zh-Hant.json' with { type: 'json' };
 
 const CATALOGS = Object.freeze({
+  de,
   es,
   fr,
   it,

src/i18n/locale.js

@@ -10,6 +10,7 @@ export const DEFAULT_LOCALE = 'en';
 /** Shipped locales; order does not matter. Adding one: docs/TRANSLATORS.md. */
 export const LOCALES = Object.freeze([
   'en',
+  'de',
   'es',
   'fr',
   'it',
@@ -23,6 +24,7 @@ export const LOCALES = Object.freeze([
 /** Each locale named in its own language, for the selector. */
 export const LOCALE_NAMES = Object.freeze({
   en: 'English',
+  de: 'Deutsch',
   es: 'Español',
   fr: 'Français',
   it: 'Italiano',
@@ -38,6 +40,7 @@ const RTL_LOCALES = Object.freeze([]);
 
 /**
  * Map any language tag to a shipped locale: 'ru-RU' and 'RU' → 'ru',
+  'de',
  * 'pt-BR' and 'pt-PT' → 'pt' (Brazilian Portuguese),
  * 'zh', 'zh-CN' and 'zh-Hans-SG' → 'zh-CN';
  * 'zh-Hant', 'zh-TW', 'zh-HK' and 'zh-MO' → 'zh-Hant'.

src/i18n/locales/it.json

@@ -63,7 +63,7 @@
   "Gyirong border gate": "Valico di frontiera di Gyirong",
   "Border gate": "Valico di frontiera",
   "Timure evidence cluster": "Gruppo di prove di Timure",
-  "Mailung / Upper Trishuli bridge": "Ponte di Mailung / Alto Trishuli",
+  "Mailung / Upper Trishuli bridge": "Ponte di Mailung / Upper Trishuli",
   "Dandagaun viewpoint restaurant": "Ristorante panoramico di Dandagaun",
   "Dandagaun viewpoint": "Punto panoramico di Dandagaun",
   "Bidur - Trishuli bridge": "Ponte di Bidur - Trishuli",

src/i18n/same-as-english.json

@@ -1,4 +1,170 @@
 {
+  "de": [
+    "1090 MHz",
+    "978 MHz UAT",
+    "AIS: --",
+    "AIS: {name}",
+    "ANIME",
+    "AUTO",
+    "Alternative",
+    "Ambient",
+    "Anime",
+    "Austin",
+    "BRG {value}°",
+    "BRG —",
+    "Bloom",
+    "Blues",
+    "Bus",
+    "CCTV",
+    "COCKPIT",
+    "CRS {value}°",
+    "CRT",
+    "Country",
+    "Cyan",
+    "Cyber",
+    "DEST ---°",
+    "DEST {bearing}",
+    "Dance",
+    "Details",
+    "Dubai",
+    "EXPORT",
+    "EXPORT {slot}",
+    "FALLBACK",
+    "FILTER",
+    "FLIR",
+    "FOV",
+    "FOV {value}°",
+    "FT",
+    "Folk",
+    "Funk",
+    "GEO",
+    "GOOGLE STREET VIEW",
+    "Global",
+    "Global · 60°S–60°N",
+    "Google Street View",
+    "HDG",
+    "HDG {value}°",
+    "Hip-Hop",
+    "House",
+    "Hybrid",
+    "Indie",
+    "Ironbow",
+    "Jazz",
+    "LIVE",
+    "Landsat 8/9",
+    "Latin",
+    "Layout",
+    "London",
+    "Los Angeles",
+    "MIL",
+    "MINI",
+    "MISSION",
+    "MM",
+    "MONITOR",
+    "Metal",
+    "Minimal",
+    "NAME",
+    "NASA FIRMS · LIVE",
+    "NAV",
+    "NEWS",
+    "NNW",
+    "NOIR",
+    "NORMAL",
+    "NVG",
+    "NW",
+    "New York",
+    "Noir",
+    "Normal",
+    "OK",
+    "ORBIT",
+    "ORBIT · ",
+    "Oldies",
+    "OpenStreetMap + optional Google Maps Places",
+    "Operator",
+    "PAUSE",
+    "PLAY",
+    "POS: LIVE",
+    "POS: {time}Z",
+    "POSITION {age}",
+    "PROJ MONITOR",
+    "Paris",
+    "Pause",
+    "Pin",
+    "Plan",
+    "Pop",
+    "Punk",
+    "RADIO",
+    "REC",
+    "REGION",
+    "RESET",
+    "Radio",
+    "Reggae",
+    "Rock",
+    "S2 GhostMaps",
+    "SAR",
+    "SIG",
+    "SNAPSHOT",
+    "SQUAWK {code} · {status}",
+    "SSW",
+    "STANDARD",
+    "START",
+    "STATION",
+    "STATUS",
+    "STATUS · ",
+    "STD",
+    "SW",
+    "SYNC",
+    "San Francisco",
+    "Scanlines",
+    "Scope",
+    "Sentinel-2",
+    "Sonar",
+    "Soul",
+    "Station",
+    "Station {id}",
+    "T minus {seconds}",
+    "TAGS · {tags}",
+    "TANKER",
+    "TEMP",
+    "Talk",
+    "Tallinn",
+    "Techno",
+    "Trance",
+    "Turboprop",
+    "UPSTREAM",
+    "Upstream HTTP {status}",
+    "Vignette",
+    "WHOT/BHOT",
+    "WIND",
+    "WNW",
+    "WSW",
+    "Washington DC",
+    "Wind",
+    "dB",
+    "feed status|live",
+    "fire behavior|Minimal",
+    "ft",
+    "hPa",
+    "km",
+    "km/h",
+    "min",
+    "mph",
+    "radio|NEWS",
+    "radio|TALK",
+    "view band|GLOBAL",
+    "{city} CCTV",
+    "{county} County",
+    "{source} HTTP {status}",
+    "{speed} kn",
+    "{type}  SPD: {speed}  HDG: {heading}",
+    "{value} KM",
+    "{value} KM DOWNRANGE",
+    "{value} KM/H",
+    "{value} KM/S",
+    "ΔN",
+    "Ⅱ PAUSE",
+    "▲ {frp} MW"
+  ],
   "es": [
     "1090 MHz",
     "978 MHz UAT",

src/layers/directions/index.js

@@ -18,7 +18,13 @@
 
 import * as Cesium from 'cesium';
 import { roadLabel } from '../../data/routeSteps.js';
-import { t, msg, formatNumber, translateKnown } from '../../i18n/index.js';
+import {
+  t,
+  msg,
+  formatNumber,
+  getLocale,
+  translateKnown,
+} from '../../i18n/index.js';
 import { pointerOwnerName } from '../../data/pointerOwnerNames.js';
 import { formatQuantity } from '../../ui/unitLabels.js';
 
@@ -394,6 +400,16 @@ export function normalizeDirectionsParams(params = {}) {
   return out;
 }
 
+/**
+ * A travel-mode word inside a sentence: lower case, except in German, where
+ * the words are nouns and keep their capital ("Auto", "Fahrrad").
+ * @param {string} word Translated mode word.
+ * @returns {string}
+ */
+function modeWordInSentence(word) {
+  return getLocale() === 'de' ? word : word.toLowerCase();
+}
+
 /**
  * Row chips for a given state. Pure so the chip logic is testable without a DOM.
  * @param {{mode:string, armed:null|'a'|'b', a:object|null, b:object|null, status:string, route:object|null}} state
@@ -409,7 +425,7 @@ export function directionsRowControls(state) {
     state: mode === id ? 'active' : 'idle',
     title: t('{mode} — reroute for {modeLower}', {
       mode: t(spec.word),
-      modeLower: t(spec.word).toLowerCase(),
+      modeLower: modeWordInSentence(t(spec.word)),
     }),
     params: { mode: id },
   }));

src/ui/layerPanel.js

@@ -136,9 +136,11 @@ export function layerKeyRequirementTooltip(layer = {}) {
 
 const ROW_TEXT_SEPARATOR = ' · ';
 
-// A short Latin code joined by hyphens. Longer runs (a URL, a token in an
-// error) keep their break opportunities so they cannot overflow the rail.
-const HYPHENATED_CODE = /[A-Za-z0-9]+(?:-[A-Za-z0-9]+)+/g;
+// A short Latin code joined by hyphens: every part after a hyphen is capitals
+// or digits (ADS-B, RTL-SDR, GTFS-RT). A compound such as "ALPR-Kameras" is a
+// word, not a code, and may break at its hyphen. Longer runs (a URL, a token
+// in an error) keep their break opportunities so they cannot overflow the rail.
+const HYPHENATED_CODE = /\b[A-Za-z0-9]+(?:-[A-Z0-9]+)+(?![A-Za-z0-9])/g;
 const HYPHENATED_CODE_MAX = 16;
 
 /** A span for one run of row text; `keep` stops the browser breaking inside it. */

src/ui/layerPanel.test.mjs

@@ -324,6 +324,15 @@ test('row text keeps a hyphenated code whole and never starts a line with the se
     assert.equal(plain.textContent, 'Satellites');
     assert.equal(plain.children.length, 0);
 
+    const compound = element();
+    setRowText(compound, 'Kartierte ALPR-Kameras · ADS-B-Flüge');
+    assert.equal(text(compound), 'Kartierte ALPR-Kameras · ADS-B-Flüge');
+    assert.deepEqual(
+      kept(compound),
+      [' ·', 'ADS-B'],
+      'a compound may break at its hyphen; the code inside it stays whole',
+    );
+
     const long = element();
     setRowText(long, 'see https-proxy-endpoint-config-x');
     assert.deepEqual(kept(long), [], 'a long hyphenated run may still wrap');

src/ui/localePicker.test.mjs

@@ -43,7 +43,7 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['ru', 'uk', 'en', 'es', 'fr', 'it', 'pt', 'zh-CN', 'zh-Hant'],
+    ['ru', 'uk', 'de', 'en', 'es', 'fr', 'it', 'pt', 'zh-CN', 'zh-Hant'],
   );
   assert.deepEqual(
     codes(
@@ -53,7 +53,7 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['es', 'en', 'fr', 'it', 'pt', 'ru', 'uk', 'zh-CN', 'zh-Hant'],
+    ['es', 'de', 'en', 'fr', 'it', 'pt', 'ru', 'uk', 'zh-CN', 'zh-Hant'],
   );
   assert.deepEqual(
     codes(
@@ -63,7 +63,7 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['en', 'es', 'fr', 'it', 'pt', 'ru', 'uk', 'zh-CN', 'zh-Hant'],
+    ['en', 'de', 'es', 'fr', 'it', 'pt', 'ru', 'uk', 'zh-CN', 'zh-Hant'],
   );
   const rows = buildLocaleOptions({
     locales: MANY,
@@ -98,6 +98,7 @@ test('each row gets the interface-language name for search, unless it only repea
   const byCode = Object.fromEntries(rows.map((row) => [row.code, row]));
   assert.equal(byCode.en.localName, 'английский');
   assert.equal(byCode.es.localName, 'испанский');
+  assert.equal(byCode.de.localName, 'немецкий');
   assert.equal(byCode.fr.localName, 'французский');
   assert.equal(byCode.ru.localName, '', 'русский only repeats Русский');
   const english = buildLocaleOptions({

src/ui/styles/bhote-koshi.css

@@ -518,14 +518,15 @@ html:not([lang='en']) .bhote-event-story-current strong {
   -webkit-line-clamp: 2;
 }
 
-/* Phase / time / sources run long in translation: allow a second line. */
+/* Phase / time / sources / imagery note run long in translation: allow up to
+   three lines so the last status is not cut off. */
 html:not([lang='en']) .bhote-event-story-current small {
   display: -webkit-box;
   margin-top: 3px;
   text-overflow: clip;
   white-space: normal;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
+  -webkit-line-clamp: 3;
 }
 
 .bhote-event-actions {

src/ui/styles/radio.css

@@ -688,6 +688,12 @@ html:not([lang='en']) .data-count {
   text-wrap: balance;
 }
 
+/* The status column keeps its width, so a wide chip (WIRD AKTIVIERT) never
+   overlaps the name; the name wraps in the room left beside it. */
+html:not([lang='en']) .data-toggle-right {
+  flex: none;
+}
+
 /* Row text pieces that must not break inside: a hyphenated code (ADS-B) and
    the space before a " · " separator (see setRowText in layerPanel.js). */
 html:not([lang='en']) .data-keep {