Merge remote-tracking branch 'origin/main' into german/hal-644-ar

# Conflicts:
#	docs/CURRENT-STATE.md
#	docs/TRANSLATORS.md
#	scripts/package-boundaries.json
#	src/hudLocalityFormat.js
#	src/i18n/index.js
#	src/i18n/locale.js
#	src/i18n/same-as-english.json
#	src/layers/cctv/presentation.js
#	src/scenes/recipes.js
#	src/ui/localePicker.test.mjs
#	src/ui/unitLabels.js

src/ui/localePicker.test.mjs

@@ -31,6 +31,9 @@ const MANY = Object.keys(NAMES);
 
 const codes = (rows) => rows.map((row) => row.code);
 
+// Few enough languages that the picker has no search field.
+const UNSEARCHED = ['en', 'es', 'ru', 'uk', 'zh-CN', 'zh-Hant'];
+
 test('the current language comes first, the rest by their own names', () => {
   assert.deepEqual(
     codes(
@@ -40,7 +43,20 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['ru', 'en', 'es', 'ar', 'zh-CN', 'zh-Hant'],
+    [
+      'ru',
+      'uk',
+      'de',
+      'en',
+      'es',
+      'fr',
+      'it',
+      'pt',
+      'ar',
+      'zh-CN',
+      'zh-Hant',
+      'ja',
+    ],
   );
   assert.deepEqual(
     codes(
@@ -50,7 +66,20 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['es', 'en', 'ru', 'ar', 'zh-CN', 'zh-Hant'],
+    [
+      'es',
+      'de',
+      'en',
+      'fr',
+      'it',
+      'pt',
+      'ru',
+      'uk',
+      'ar',
+      'zh-CN',
+      'zh-Hant',
+      'ja',
+    ],
   );
   assert.deepEqual(
     codes(
@@ -60,7 +89,20 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['en', 'es', 'ru', 'ar', 'zh-CN', 'zh-Hant'],
+    [
+      'en',
+      'de',
+      'es',
+      'fr',
+      'it',
+      'pt',
+      'ru',
+      'uk',
+      'ar',
+      'zh-CN',
+      'zh-Hant',
+      'ja',
+    ],
   );
   assert.deepEqual(
     codes(
@@ -70,7 +112,20 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['ar', 'en', 'es', 'ru', 'zh-CN', 'zh-Hant'],
+    [
+      'ar',
+      'de',
+      'en',
+      'es',
+      'fr',
+      'it',
+      'pt',
+      'ru',
+      'uk',
+      'zh-CN',
+      'zh-Hant',
+      'ja',
+    ],
   );
   const rows = buildLocaleOptions({
     locales: MANY,
@@ -105,6 +160,8 @@ 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({
     locales: LOCALES,
@@ -113,6 +170,7 @@ test('each row gets the interface-language name for search, unless it only repea
     localName: createLocalNameReader('en'),
   });
   assert.equal(english.find((row) => row.code === 'es').localName, 'Spanish');
+  assert.equal(english.find((row) => row.code === 'fr').localName, 'French');
 });
 
 test('without Intl.DisplayNames the interface-language name is simply left out', () => {
@@ -175,7 +233,10 @@ test('search folds case and diacritics, and matches either name or the code', ()
 
 test('the search field appears only above the threshold', () => {
   assert.equal(LOCALE_SEARCH_THRESHOLD, 8);
-  assert.equal(createLocalePickerModel({ current: 'en' }).searchable, false);
+  assert.equal(
+    createLocalePickerModel({ current: 'en' }).searchable,
+    LOCALES.length > LOCALE_SEARCH_THRESHOLD,
+  );
   const eight = MANY.slice(0, 8);
   assert.equal(
     createLocalePickerModel({
@@ -260,6 +321,7 @@ test('type-ahead cycles by first letter and refines with more letters', () => {
 
 test('keyboard model: open on the current language, move, choose, close', () => {
   const model = createLocalePickerModel({
+    locales: UNSEARCHED,
     current: 'ru',
     localName: createLocalNameReader('ru'),
   });
@@ -271,7 +333,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' });
@@ -285,7 +348,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,
@@ -302,7 +365,11 @@ test('keyboard model: open on the current language, move, choose, close', () =>
 
 test('keyboard model: type-ahead resets after a pause and ignores shortcuts', () => {
   let clock = 0;
-  const model = createLocalePickerModel({ current: 'en', now: () => clock });
+  const model = createLocalePickerModel({
+    locales: UNSEARCHED,
+    current: 'en',
+    now: () => clock,
+  });
   model.openList();
   assert.deepEqual(model.keydown({ key: 'e' }), { handled: true });
   assert.equal(model.activeOption.code, 'es');