Merge branch 'main' into hailey/upgrade-clean

app.config.js

@@ -93,27 +93,32 @@ module.exports = function (config) {
           CFBundleSpokenName: 'Blue Sky',
           CFBundleLocalizations: [
             'en',
+            'an',
+            'ast',
             'ca',
             'de',
             'es',
             'fi',
             'fr',
             'ga',
+            'gl',
             'hi',
             'hu',
             'id',
             'it',
             'ja',
             'ko',
+            'nl',
             'pl',
-            'pt',
+            'pt-BR',
             'ru',
             'th',
             'tr',
             'uk',
-            'zh_CN',
+            'vi',
-            'zh_HK',
+            'yue-Hant',
-            'zh_TW',
+            'zh-Hans',
+            'zh-Hant',
           ],
         },
         associatedDomains: ASSOCIATED_DOMAINS,

lingui.config.js

@@ -2,8 +2,8 @@
 module.exports = {
   locales: [
     'en',
-    'ast',
     'an',
+    'ast',
     'ca',
     'de',
     'en-GB',

src/components/hooks/dates.ts

@@ -44,8 +44,8 @@ import {useLanguagePrefs} from '#/state/preferences'
  */
 const locales: Record<AppLanguage, Locale | undefined> = {
   en: undefined,
-  ast: undefined,
   an: undefined,
+  ast: undefined,
   ca,
   de,
   ['en-GB']: enGB,

src/locale/languages.ts

@@ -43,7 +43,7 @@ interface AppLanguageConfig {
 export const APP_LANGUAGES: AppLanguageConfig[] = [
   {code2: AppLanguage.en, name: 'English'},
   {code2: AppLanguage.an, name: 'Aragonés – Aragonese'},
-  {code2: AppLanguage.ast, name: 'Asturianu - Asturian'},
+  {code2: AppLanguage.ast, name: 'Asturianu – Asturian'},
   {code2: AppLanguage.ca, name: 'Català – Catalan'},
   {code2: AppLanguage.de, name: 'Deutsch – German'},
   {code2: AppLanguage.en_GB, name: 'English (UK)'},
@@ -51,7 +51,7 @@ export const APP_LANGUAGES: AppLanguageConfig[] = [
   {code2: AppLanguage.fi, name: 'Suomi – Finnish'},
   {code2: AppLanguage.fr, name: 'Français – French'},
   {code2: AppLanguage.ga, name: 'Gaeilge – Irish'},
-  {code2: AppLanguage.gl, name: 'Galego - Galician'},
+  {code2: AppLanguage.gl, name: 'Galego – Galician'},
   {code2: AppLanguage.hi, name: 'हिंदी – Hindi'},
   {code2: AppLanguage.hu, name: 'magyar – Hungarian'},
   {code2: AppLanguage.id, name: 'Bahasa Indonesia – Indonesian'},