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

src/i18n/i18n.test.mjs

@@ -33,8 +33,12 @@ function memoryStorage(initial = {}) {
 test('normalizeLocale folds regional variants and rejects unshipped tags', () => {
   assert.equal(normalizeLocale('ru-RU'), 'ru');
   assert.equal(normalizeLocale(' RU '), 'ru');
+  assert.equal(normalizeLocale('uk'), 'uk');
+  assert.equal(normalizeLocale('uk-UA'), 'uk');
   assert.equal(normalizeLocale('en_GB'), 'en');
   assert.equal(normalizeLocale('xx'), null);
+  assert.equal(normalizeLocale('it-IT'), 'it');
+  assert.equal(normalizeLocale('it_CH'), 'it');
   // Explicit script tags take precedence over regional defaults.
   assert.equal(normalizeLocale('zh'), 'zh-CN');
   assert.equal(normalizeLocale('zh-CN'), 'zh-CN');
@@ -142,6 +146,22 @@ test('tn() picks English and Russian plural forms', () => {
   assert.match(label(21), / 21 КЛЮЧ(?![А-ЯЁ])/);
 });
 
+test('tn() picks the four Ukrainian plural forms', () => {
+  const label = (count) =>
+    tn(
+      count,
+      'POWER UP · {count} KEY WAITING',
+      'POWER UP · {count} KEYS WAITING',
+    );
+  setLocale('uk');
+  assert.match(label(1), / 1 КЛЮЧ(?![А-ЯҐЄІЇ])/);
+  assert.match(label(3), / 3 КЛЮЧІ(?![А-ЯҐЄІЇ])/);
+  assert.match(label(5), / 5 КЛЮЧІВ(?![А-ЯҐЄІЇ])/);
+  assert.match(label(11), / 11 КЛЮЧІВ(?![А-ЯҐЄІЇ])/);
+  assert.match(label(21), / 21 КЛЮЧ(?![А-ЯҐЄІЇ])/);
+  assert.match(label(1.5), / 1\.5 КЛЮЧА(?![А-ЯҐЄІЇ])/);
+});
+
 test('t() context separates identical English with different meanings', () => {
   assert.equal(t('CLEAR', { context: 'action' }), 'CLEAR');
   setLocale('ru');

src/i18n/index.js

@@ -17,11 +17,20 @@ import {
   writeStoredLocale,
 } from './locale.js';
 import es from './locales/es.json' with { type: 'json' };
+import it from './locales/it.json' with { type: 'json' };
 import ru from './locales/ru.json' with { type: 'json' };
+import uk from './locales/uk.json' with { type: 'json' };
 import zhCN from './locales/zh-CN.json' with { type: 'json' };
 import zhHant from './locales/zh-Hant.json' with { type: 'json' };
 
-const CATALOGS = Object.freeze({ es, ru, 'zh-CN': zhCN, 'zh-Hant': zhHant });
+const CATALOGS = Object.freeze({
+  es,
+  it,
+  ru,
+  uk,
+  'zh-CN': zhCN,
+  'zh-Hant': zhHant,
+});
 
 let currentLocale = DEFAULT_LOCALE;
 

src/i18n/locale.js

@@ -8,13 +8,23 @@ export const LOCALE_STORAGE_KEY = 'gev:locale:v1';
 export const DEFAULT_LOCALE = 'en';
 
 /** Shipped locales; order does not matter. Adding one: docs/TRANSLATORS.md. */
-export const LOCALES = Object.freeze(['en', 'es', 'ru', 'zh-CN', 'zh-Hant']);
+export const LOCALES = Object.freeze([
+  'en',
+  'es',
+  'it',
+  'ru',
+  'uk',
+  'zh-CN',
+  'zh-Hant',
+]);
 
 /** Each locale named in its own language, for the selector. */
 export const LOCALE_NAMES = Object.freeze({
   en: 'English',
   es: 'Español',
+  it: 'Italiano',
   ru: 'Русский',
+  uk: 'Українська',
   'zh-CN': '中文（简体）',
   'zh-Hant': '中文（繁體）',
 });

src/i18n/same-as-english.json

@@ -124,6 +124,175 @@
     "ΔN",
     "▲ {frp} MW"
   ],
+  "it": [
+    "1090 MHz",
+    "978 MHz UAT",
+    "AFRICA",
+    "AIS: --",
+    "AIS: {name}",
+    "ALT {altitude} FT · GS {speed} KT · TRK {track}",
+    "ANIME",
+    "ASIA",
+    "AUTO",
+    "AUTO HOP OFF",
+    "AUTO HOP ON",
+    "Alternative",
+    "Ambient",
+    "Anime",
+    "Area",
+    "Austin",
+    "BRG {value}°",
+    "BRG —",
+    "Bloom",
+    "Blues",
+    "Business jet",
+    "CAL {value}",
+    "CAL · {badge}",
+    "CARGO",
+    "CCTV",
+    "CCTV OFF",
+    "CCTV ON",
+    "CH {index} / {total}",
+    "COCKPIT",
+    "CRS {value}°",
+    "CRT",
+    "Country",
+    "Cyber",
+    "DEST ---°",
+    "DEST {bearing}",
+    "DISPLAY",
+    "Dance",
+    "Drone",
+    "Dubai",
+    "ENE",
+    "ESE",
+    "FLIR",
+    "FM MHZ",
+    "FOCUS",
+    "FOV",
+    "FOV {value}°",
+    "FT",
+    "Folk",
+    "Funk",
+    "GEO",
+    "GOOGLE STREET VIEW",
+    "Google Street View",
+    "HDG",
+    "HDG {value}°",
+    "Hip-Hop",
+    "House",
+    "Indie",
+    "Ironbow",
+    "Jazz",
+    "KTS",
+    "LIVE",
+    "Landsat 8/9",
+    "Layout",
+    "Los Angeles",
+    "MIC",
+    "MIL",
+    "MINI",
+    "MM",
+    "MONITOR",
+    "MSG/S",
+    "Metal",
+    "NASA FIRMS · LIVE",
+    "NAV",
+    "NE",
+    "NNE",
+    "NOIR",
+    "NVG",
+    "New York",
+    "Noir",
+    "OCEANIA",
+    "OFF",
+    "OK",
+    "ON",
+    "ON/OFF",
+    "Oldies",
+    "PAYLOAD",
+    "PLAY",
+    "POS: LIVE",
+    "POS: {time}Z",
+    "PRECIP",
+    "Pop",
+    "Punk",
+    "RADIO",
+    "REC",
+    "RESET",
+    "RESET CAL",
+    "Radio",
+    "Reggae",
+    "Rock",
+    "S2 GhostMaps",
+    "SAR",
+    "SE",
+    "SIG",
+    "SNAPSHOT",
+    "SQUAWK {code} · {status}",
+    "SSE",
+    "STANDARD",
+    "STD",
+    "STOP",
+    "SYNC",
+    "San Francisco",
+    "Scope",
+    "Sentinel-2",
+    "Sonar",
+    "Soul",
+    "TEMP",
+    "TIMEOUT",
+    "Talk",
+    "Tallinn",
+    "Techno",
+    "Tokyo",
+    "Tram",
+    "Trance",
+    "UPSTREAM",
+    "USB {rate} msg/s",
+    "Upstream HTTP {status}",
+    "V/S {rate} FPM",
+    "VIEWSHED",
+    "VIEWSHED ON",
+    "VOLUME",
+    "VS",
+    "WHOT/BHOT",
+    "Washington DC",
+    "World",
+    "audio {state}",
+    "dB",
+    "feed status|live",
+    "ft",
+    "hPa",
+    "installation class|BASE",
+    "km",
+    "km/h",
+    "max {value} MW",
+    "min",
+    "mini",
+    "mph",
+    "radio|TALK",
+    "satellite",
+    "standard",
+    "view band|METRO",
+    "voice|OFF",
+    "{count} MSGS",
+    "{count} feeds live",
+    "{count} scenes",
+    "{rate} msg/s",
+    "{scene} / {pack}: {status}. File: {path}. {attribution} · {license}",
+    "{source} HTTP {status}",
+    "{speed} kn",
+    "{speed}KT",
+    "{value} KM",
+    "{value} KM DOWNRANGE",
+    "{value} KM/H",
+    "{value} KM/S",
+    "{value} conf",
+    "ΔE",
+    "ΔN",
+    "▲ {frp} MW"
+  ],
   "ru": [
     "AIS: --",
     "AIS: {name}",
@@ -142,6 +311,19 @@
     "VS",
     "WHOT/BHOT"
   ],
+  "uk": [
+    "AIS: --",
+    "AIS: {name}",
+    "CCTV",
+    "CRT",
+    "FLIR",
+    "Ironbow",
+    "Landsat 8/9",
+    "NVG",
+    "REC",
+    "S2 GhostMaps",
+    "WHOT/BHOT"
+  ],
   "zh-CN": [
     "1090 MHz",
     "978 MHz UAT",

src/scenes/bootstrapTitleProvenance.test.mjs

@@ -0,0 +1,20 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { SCENE_RECIPES, displayShotTitle } from './recipes.js';
+import { setLocale } from '../i18n/index.js';
+
+test('an operator-typed title in the built-in Nepal scene stays as typed', () => {
+  const scene = SCENE_RECIPES.find((r) => r.id === 'bhote-koshi-nepal-scene');
+  assert.ok(scene, 'built-in bootstrap scene exists');
+  for (const locale of ['ru', 'es', 'it', 'zh-CN', 'zh-Hant']) {
+    setLocale(locale);
+    const title = 'Global Incident Context';
+    // A shot captured by the operator: no sourcePackId, renamed to this title.
+    const shown = displayShotTitle(
+      title,
+      { id: 'shot-user', title },
+      { id: scene.id },
+    );
+    assert.equal(shown, title, `${locale}: got ${shown}`);
+  }
+});

src/scenes/director.test.mjs

@@ -712,6 +712,10 @@ test('a legacy three-shot Nepal browser project bootstraps to the current 25-sho
     assert.deepEqual(scene.shots.slice(0, 3).map(({ camera }) => camera), originalCameras);
     assert.equal(scene.appliedShotPacks[0].id, 'bhote-koshi-nepal-evidence-pack');
     assert.equal(scene.appliedShotPacks[0].version, 18);
+    // displayShotTitle trusts these bindings to localize the bootstrap shots.
+    for (const shot of scene.shots.slice(0, 8)) {
+      assert.equal(scene.appliedShotPacks[0].shotBindings[shot.title], shot.id);
+    }
     assert.equal(director._selectedSceneId, scene.id);
     assert.equal(director._selectedShotId, scene.shots[0].id);
   } finally {

src/scenes/recipes.js

@@ -1061,25 +1061,44 @@ export function displaySceneTitle(scene) {
  * (`sourcePackId`), so a typed title that matches a built-in one stays as
  * typed. Without `shot`, the title alone decides.
  * @param {string} title
- * @param {{sourcePackId?: string}} [shot]
- * @param {{id?: string}} [scene] The shot's scene, for projects saved before
- *   shots recorded their source pack.
+ * @param {{id?: string, sourcePackId?: string}} [shot]
+ * @param {{id?: string, appliedShotPacks?: Array<{id?: string, shotBindings?: Object<string, string>}>}} [scene]
+ *   The shot's scene, for projects saved before shots recorded their source
+ *   pack.
  * @returns {string}
  */
 export function displayShotTitle(title, shot = undefined, scene = undefined) {
   const text = typeof title === 'string' ? title : '';
   const fromRecipe = shot
-    ? Boolean(shot.sourcePackId) || recipeDeclaresShotTitle(scene?.id, text)
+    ? Boolean(shot.sourcePackId) || recipeDeclaresShotTitle(scene, shot, text)
     : true;
   if (fromRecipe && BUILTIN_SHOT_TITLES.has(text)) return t(text);
   const numbered = /^Shot ([1-9]\d*)$/.exec(text);
   return numbered ? t('Shot {n}', { n: numbered[1] }) : text;
 }
 
-/** Whether the built-in recipe behind a scene declares a shot with this title. */
-function recipeDeclaresShotTitle(sceneId, title) {
-  const recipe = sceneId ? getSceneRecipeById(sceneId) : null;
-  return Boolean(
-    recipe?.cameraPath?.some((keyframe) => keyframe?.title === title),
+/** Whether the built-in recipe behind a scene declares this shot's title. */
+function recipeDeclaresShotTitle(scene, shot, title) {
+  const recipe = scene?.id ? getSceneRecipeById(scene.id) : null;
+  if (!recipe) return false;
+  const declares = (path) =>
+    Array.isArray(path) && path.some((keyframe) => keyframe?.title === title);
+  if (declares(recipe.cameraPath)) return true;
+  // A bootstrap recipe seeds legacy "Shot N" keyframes; the upgrade replaces
+  // them with the append recipe's bootstrap shots, which carry no source pack.
+  // The pack marker binds each of those titles to its shot id, so a shot the
+  // operator later gave the same title stays as typed.
+  return SCENE_APPEND_RECIPES.some(
+    (append) =>
+      append.legacySceneBootstrap?.targetSceneTitle === recipe.title &&
+      declares(append.legacySceneBootstrap.cameraPath) &&
+      Boolean(shot?.id) &&
+      (Array.isArray(scene.appliedShotPacks)
+        ? scene.appliedShotPacks
+        : []
+      ).some(
+        (marker) =>
+          marker?.id === append.id && marker.shotBindings?.[title] === shot.id,
+      ),
   );
 }

src/scenes/sceneTitleDisplay.test.mjs

@@ -4,6 +4,7 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
 import {
+  SCENE_APPEND_RECIPES,
   SCENE_RECIPES,
   displaySceneTitle,
   displayShotTitle,
@@ -141,3 +142,40 @@ test('the scene context of a shot carries its display title by provenance', asyn
     title,
   );
 });
+
+test('bootstrap shots of a built-in scene localize without a source pack', () => {
+  setLocale('ru');
+  const append = SCENE_APPEND_RECIPES.find(
+    (recipe) => recipe.legacySceneBootstrap?.cameraPath?.length,
+  );
+  if (!append) return;
+  const bootstrap = append.legacySceneBootstrap;
+  const scene = SCENE_RECIPES.find(
+    (recipe) => recipe.title === bootstrap.targetSceneTitle,
+  );
+  if (!scene) return;
+  for (const { title } of bootstrap.cameraPath) {
+    // The upgrade copies these keyframes into the scene without sourcePackId
+    // and binds each title to its shot in the pack marker.
+    const upgraded = {
+      id: scene.id,
+      appliedShotPacks: [
+        { id: append.id, version: 1, shotBindings: { [title]: 'shot-old' } },
+      ],
+    };
+    assert.equal(
+      displayShotTitle(title, { id: 'shot-old', title }, upgraded),
+      displayShotTitle(title),
+    );
+    // Another shot the operator gave the same title stays as typed.
+    assert.equal(
+      displayShotTitle(title, { id: 'shot-user', title }, upgraded),
+      title,
+    );
+    // The same title in an operator's own scene stays as typed.
+    assert.equal(
+      displayShotTitle(title, { id: 'shot-user', title }, { id: 'scene-user' }),
+      title,
+    );
+  }
+});

src/ui/localePicker.test.mjs

@@ -40,7 +40,7 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['ru', 'en', 'es', 'zh-CN', 'zh-Hant'],
+    ['ru', 'uk', 'en', 'es', 'it', 'zh-CN', 'zh-Hant'],
   );
   assert.deepEqual(
     codes(
@@ -50,7 +50,7 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['es', 'en', 'ru', 'zh-CN', 'zh-Hant'],
+    ['es', 'en', 'it', 'ru', 'uk', 'zh-CN', 'zh-Hant'],
   );
   assert.deepEqual(
     codes(
@@ -60,7 +60,7 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['en', 'es', 'ru', 'zh-CN', 'zh-Hant'],
+    ['en', 'es', 'it', 'ru', 'uk', 'zh-CN', 'zh-Hant'],
   );
   const rows = buildLocaleOptions({
     locales: MANY,
@@ -261,7 +261,8 @@ test('keyboard model: open on the current language, move, choose, close', () =>
   model.openList();
   assert.equal(model.activeOption.code, 'ru');
   assert.deepEqual(model.keydown({ key: 'ArrowDown' }), { handled: true });
-  assert.equal(model.activeOption.code, 'en');
+  // Russian collation puts the other Cyrillic name next.
+  assert.equal(model.activeOption.code, 'uk');
   model.keydown({ key: 'End' });
   assert.equal(model.activeOption.code, 'zh-Hant');
   model.keydown({ key: 'Home' });
@@ -275,7 +276,7 @@ test('keyboard model: open on the current language, move, choose, close', () =>
   model.keydown({ key: 'ArrowDown' });
   assert.deepEqual(model.keydown({ key: ' ' }), {
     handled: true,
-    choose: 'en',
+    choose: 'uk',
   });
   assert.deepEqual(model.keydown({ key: 'Escape' }), {
     handled: true,

src/ui/styles/cockpit.css

@@ -730,7 +730,8 @@ html:not([lang='en']) .cockpit-roll-token.is-separator {
 }
 .cockpit-vision-controls {
   display: grid;
-  grid-template-columns: 48px 58px 48px;
+  /* The current style grows for a long translated name (ЗВИЧАЙНИЙ). */
+  grid-template-columns: 48px minmax(58px, max-content) 48px;
   align-items: stretch;
   gap: 2px;
   margin-top: 2px;