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

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('fr'), 'fr');
+  assert.equal(normalizeLocale('fr-CA'), 'fr');
+  assert.equal(normalizeLocale('FR_be'), 'fr');
   assert.equal(normalizeLocale('pt-BR'), 'pt');
   assert.equal(normalizeLocale('pt_PT'), 'pt');
   assert.equal(normalizeLocale('xx'), null);

src/i18n/index.js

@@ -17,6 +17,7 @@ import {
   writeStoredLocale,
 } from './locale.js';
 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' };
 import pt from './locales/pt.json' with { type: 'json' };
 import ru from './locales/ru.json' with { type: 'json' };
@@ -26,6 +27,7 @@ import zhHant from './locales/zh-Hant.json' with { type: 'json' };
 
 const CATALOGS = Object.freeze({
   es,
+  fr,
   it,
   pt,
   ru,

src/i18n/locale.js

@@ -11,6 +11,7 @@ export const DEFAULT_LOCALE = 'en';
 export const LOCALES = Object.freeze([
   'en',
   'es',
+  'fr',
   'it',
   'pt',
   'ru',
@@ -23,6 +24,7 @@ export const LOCALES = Object.freeze([
 export const LOCALE_NAMES = Object.freeze({
   en: 'English',
   es: 'Español',
+  fr: 'Français',
   it: 'Italiano',
   pt: 'Português (Brasil)',
   ru: 'Русский',

src/i18n/same-as-english.json

@@ -124,6 +124,185 @@
     "ΔN",
     "▲ {frp} MW"
   ],
+  "fr": [
+    "1090 MHz",
+    "978 MHz UAT",
+    "ALTITUDE",
+    "ALTITUDE · FT",
+    "ANIME",
+    "AUTO",
+    "Action",
+    "Allocation",
+    "Altitude {altitude}",
+    "Ambient",
+    "Anime",
+    "Austin",
+    "Aviation / Marine",
+    "BRG {value}°",
+    "BRG —",
+    "Bloom",
+    "Blues",
+    "Bus",
+    "CAL {value}",
+    "CAL · {badge}",
+    "CALIBRATION",
+    "CARGO",
+    "CAUSE",
+    "CCTV",
+    "CCTV OFF",
+    "CCTV ON",
+    "COCKPIT",
+    "COMMERCIAL",
+    "CONTACT",
+    "CONTACTS",
+    "CONTACTS · 250 KM",
+    "CRS {value}°",
+    "CRT",
+    "Country",
+    "Cyan",
+    "Cyber",
+    "Cyclones · NHC / CPHC",
+    "DENSE",
+    "DENSE ···",
+    "DENSE ✕",
+    "DEST ---°",
+    "DEST {bearing}",
+    "DESTINATION",
+    "Dance",
+    "Drone",
+    "ENE",
+    "ESE",
+    "EUROPE",
+    "FLIR",
+    "FM MHZ",
+    "FOV",
+    "FOV {value}°",
+    "FT",
+    "Ferry",
+    "Folk",
+    "Funk",
+    "GAIN",
+    "GEO",
+    "GOOGLE STREET VIEW",
+    "Gain",
+    "Google Street View",
+    "Grain",
+    "HDG",
+    "HDG {value}°",
+    "Hip-Hop",
+    "House",
+    "IMAGE",
+    "Indie",
+    "Ironbow",
+    "Jazz",
+    "LOCAL",
+    "Landsat 8/9",
+    "Landsat 8/9 via HLS",
+    "Los Angeles",
+    "MIC",
+    "MIL",
+    "MINI",
+    "MISSION",
+    "MM",
+    "MSG/S",
+    "Metal",
+    "Minimal",
+    "Minutes",
+    "Mode",
+    "NAV",
+    "NE",
+    "NNE",
+    "NOIR",
+    "NORMAL",
+    "NVG",
+    "New York",
+    "Noir",
+    "Normal",
+    "OFF",
+    "OK",
+    "ON",
+    "ON/OFF",
+    "Oldies",
+    "PAUSE",
+    "POSITION {age}",
+    "PROJ OFF",
+    "PROJECTION OFF",
+    "PROJECTION ON",
+    "PROPAGATION",
+    "Paris",
+    "Pause",
+    "Plan",
+    "Pop",
+    "Punk",
+    "RADIO",
+    "REC",
+    "Radio",
+    "Reggae",
+    "Rock",
+    "S2 GhostMaps",
+    "SAR",
+    "SE",
+    "SIG",
+    "SOURCE",
+    "SQUAWK {code} · {status}",
+    "SRC {value}",
+    "SSE",
+    "STANDARD",
+    "STATION",
+    "STD",
+    "San Francisco",
+    "Satellites",
+    "Saturation",
+    "Sonar",
+    "Soul",
+    "Source",
+    "Station",
+    "Station {id}",
+    "Style",
+    "TAGS · {tags}",
+    "TEMP",
+    "TYPE",
+    "Tallinn",
+    "Techno",
+    "Tokyo",
+    "Train",
+    "Trance",
+    "USB {rate} msg/s",
+    "VOLUME",
+    "VS",
+    "WHOT/BHOT",
+    "audio {state}",
+    "dB",
+    "ft",
+    "hPa",
+    "image",
+    "installation class|BASE",
+    "installation class|INSTALLATION",
+    "km",
+    "km/h",
+    "max {value} MW",
+    "min",
+    "mini",
+    "mph",
+    "nominal",
+    "satellite",
+    "standard",
+    "station",
+    "voice|OFF",
+    "{count} MSGS",
+    "{count} SOURCES",
+    "{count} messages",
+    "{n} cyclones",
+    "{n} satellites",
+    "{rate} msg/s",
+    "{value} KM",
+    "{value} KM/H",
+    "{value} KM/S",
+    "ΔE",
+    "ΔN",
+    "Ⅱ PAUSE",
+    "▲ {frp} MW"
+  ],
   "it": [
     "1090 MHz",
     "978 MHz UAT",