Merge branch 'main' into fix/remove-snow-preset

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",