Update date-fns to latest (#10545)

This commit is contained in:
Samuel Newman
2026-06-02 01:21:50 +03:00
committed by GitHub
parent db1c4dc6e3
commit 237232f96c
7 changed files with 212 additions and 221 deletions
-10
View File
@@ -317,16 +317,6 @@
"count": 1 "count": 1
} }
}, },
"src/locale/i18n.web.ts": {
"@typescript-eslint/no-explicit-any": {
"count": 1
}
},
"src/platform/polyfills.web.ts": {
"@typescript-eslint/no-explicit-any": {
"count": 1
}
},
"src/screens/Bookmarks/index.tsx": { "src/screens/Bookmarks/index.tsx": {
"@typescript-eslint/no-explicit-any": { "@typescript-eslint/no-explicit-any": {
"count": 1 "count": 1
+1 -1
View File
@@ -150,7 +150,7 @@
"babel-plugin-transform-remove-console": "^6.9.4", "babel-plugin-transform-remove-console": "^6.9.4",
"bcp-47": "^2.1.0", "bcp-47": "^2.1.0",
"bcp-47-match": "^2.0.3", "bcp-47-match": "^2.0.3",
"date-fns": "^2.30.0", "date-fns": "^4.4.0",
"email-validator": "^2.0.4", "email-validator": "^2.0.4",
"emoji-mart": "^5.6.0", "emoji-mart": "^5.6.0",
"emoji-regex": "^10.4.0", "emoji-regex": "^10.4.0",
+7 -10
View File
@@ -416,8 +416,8 @@ importers:
specifier: ^2.0.3 specifier: ^2.0.3
version: 2.0.3 version: 2.0.3
date-fns: date-fns:
specifier: ^2.30.0 specifier: ^4.4.0
version: 2.30.0 version: 4.4.0
email-validator: email-validator:
specifier: ^2.0.4 specifier: ^2.0.4
version: 2.0.4 version: 2.0.4
@@ -4788,13 +4788,12 @@ packages:
resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==} resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
date-fns@2.30.0:
resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
engines: {node: '>=0.11'}
date-fns@3.6.0: date-fns@3.6.0:
resolution: {integrity: sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==} resolution: {integrity: sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==}
date-fns@4.4.0:
resolution: {integrity: sha512-+1UMbeh68lH1SegH83CGWwpb6OHHbpSgr3+s5Eww5M4CAgswBpoWS0AjTOfEJ33HiYKz1hdj/KTFprzXHmq/6w==}
debounce@1.2.1: debounce@1.2.1:
resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==} resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
@@ -14216,12 +14215,10 @@ snapshots:
es-errors: 1.3.0 es-errors: 1.3.0
is-data-view: 1.0.2 is-data-view: 1.0.2
date-fns@2.30.0:
dependencies:
'@babel/runtime': 7.29.2
date-fns@3.6.0: {} date-fns@3.6.0: {}
date-fns@4.4.0: {}
debounce@1.2.1: {} debounce@1.2.1: {}
debug@2.6.9: debug@2.6.9:
+79 -77
View File
@@ -10,7 +10,7 @@ import '@formatjs/intl-displaynames/locale-data/en.js'
import {useEffect, useState} from 'react' import {useEffect, useState} from 'react'
import {i18n} from '@lingui/core' import {i18n} from '@lingui/core'
import defaultLocale from 'date-fns/locale/en-US' import {enUS as defaultLocale} from 'date-fns/locale/en-US'
import {sanitizeAppLanguageSetting} from '#/locale/helpers' import {sanitizeAppLanguageSetting} from '#/locale/helpers'
import {AppLanguage} from '#/locale/languages' import {AppLanguage} from '#/locale/languages'
@@ -64,8 +64,8 @@ export async function dynamicActivate(locale: AppLanguage) {
switch (locale) { switch (locale) {
case AppLanguage.an: { case AppLanguage.an: {
i18n.loadAndActivate({locale, messages: messagesAn}) i18n.loadAndActivate({locale, messages: messagesAn})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/es'), import('date-fns/locale/es').then(m => m.es),
import('@formatjs/intl-pluralrules/locale-data/an.js'), import('@formatjs/intl-pluralrules/locale-data/an.js'),
import('@formatjs/intl-numberformat/locale-data/an.js'), import('@formatjs/intl-numberformat/locale-data/an.js'),
import('@formatjs/intl-displaynames/locale-data/an.js'), import('@formatjs/intl-displaynames/locale-data/an.js'),
@@ -74,8 +74,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.ast: { case AppLanguage.ast: {
i18n.loadAndActivate({locale, messages: messagesAst}) i18n.loadAndActivate({locale, messages: messagesAst})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/es'), import('date-fns/locale/es').then(m => m.es),
import('@formatjs/intl-pluralrules/locale-data/ast.js'), import('@formatjs/intl-pluralrules/locale-data/ast.js'),
import('@formatjs/intl-numberformat/locale-data/ast.js'), import('@formatjs/intl-numberformat/locale-data/ast.js'),
import('@formatjs/intl-displaynames/locale-data/ast.js'), import('@formatjs/intl-displaynames/locale-data/ast.js'),
@@ -84,8 +84,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.ca: { case AppLanguage.ca: {
i18n.loadAndActivate({locale, messages: messagesCa}) i18n.loadAndActivate({locale, messages: messagesCa})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/ca'), import('date-fns/locale/ca').then(m => m.ca),
import('@formatjs/intl-pluralrules/locale-data/ca.js'), import('@formatjs/intl-pluralrules/locale-data/ca.js'),
import('@formatjs/intl-numberformat/locale-data/ca.js'), import('@formatjs/intl-numberformat/locale-data/ca.js'),
import('@formatjs/intl-displaynames/locale-data/ca.js'), import('@formatjs/intl-displaynames/locale-data/ca.js'),
@@ -94,8 +94,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.cy: { case AppLanguage.cy: {
i18n.loadAndActivate({locale, messages: messagesCy}) i18n.loadAndActivate({locale, messages: messagesCy})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/cy'), import('date-fns/locale/cy').then(m => m.cy),
import('@formatjs/intl-pluralrules/locale-data/cy.js'), import('@formatjs/intl-pluralrules/locale-data/cy.js'),
import('@formatjs/intl-numberformat/locale-data/cy.js'), import('@formatjs/intl-numberformat/locale-data/cy.js'),
import('@formatjs/intl-displaynames/locale-data/cy.js'), import('@formatjs/intl-displaynames/locale-data/cy.js'),
@@ -104,8 +104,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.da: { case AppLanguage.da: {
i18n.loadAndActivate({locale, messages: messagesDa}) i18n.loadAndActivate({locale, messages: messagesDa})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/da'), import('date-fns/locale/da').then(m => m.da),
import('@formatjs/intl-pluralrules/locale-data/da.js'), import('@formatjs/intl-pluralrules/locale-data/da.js'),
import('@formatjs/intl-numberformat/locale-data/da.js'), import('@formatjs/intl-numberformat/locale-data/da.js'),
import('@formatjs/intl-displaynames/locale-data/da.js'), import('@formatjs/intl-displaynames/locale-data/da.js'),
@@ -114,8 +114,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.de: { case AppLanguage.de: {
i18n.loadAndActivate({locale, messages: messagesDe}) i18n.loadAndActivate({locale, messages: messagesDe})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/de'), import('date-fns/locale/de').then(m => m.de),
import('@formatjs/intl-pluralrules/locale-data/de.js'), import('@formatjs/intl-pluralrules/locale-data/de.js'),
import('@formatjs/intl-numberformat/locale-data/de.js'), import('@formatjs/intl-numberformat/locale-data/de.js'),
import('@formatjs/intl-displaynames/locale-data/de.js'), import('@formatjs/intl-displaynames/locale-data/de.js'),
@@ -124,8 +124,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.el: { case AppLanguage.el: {
i18n.loadAndActivate({locale, messages: messagesEl}) i18n.loadAndActivate({locale, messages: messagesEl})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/el'), import('date-fns/locale/el').then(m => m.el),
import('@formatjs/intl-pluralrules/locale-data/el.js'), import('@formatjs/intl-pluralrules/locale-data/el.js'),
import('@formatjs/intl-numberformat/locale-data/el.js'), import('@formatjs/intl-numberformat/locale-data/el.js'),
import('@formatjs/intl-displaynames/locale-data/el.js'), import('@formatjs/intl-displaynames/locale-data/el.js'),
@@ -134,8 +134,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.en_GB: { case AppLanguage.en_GB: {
i18n.loadAndActivate({locale, messages: messagesEn_GB}) i18n.loadAndActivate({locale, messages: messagesEn_GB})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/en-GB'), import('date-fns/locale/en-GB').then(m => m.enGB),
import('@formatjs/intl-pluralrules/locale-data/en.js'), import('@formatjs/intl-pluralrules/locale-data/en.js'),
import('@formatjs/intl-numberformat/locale-data/en-GB.js'), import('@formatjs/intl-numberformat/locale-data/en-GB.js'),
import('@formatjs/intl-displaynames/locale-data/en-GB.js'), import('@formatjs/intl-displaynames/locale-data/en-GB.js'),
@@ -144,8 +144,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.eo: { case AppLanguage.eo: {
i18n.loadAndActivate({locale, messages: messagesEo}) i18n.loadAndActivate({locale, messages: messagesEo})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/eo'), import('date-fns/locale/eo').then(m => m.eo),
import('@formatjs/intl-pluralrules/locale-data/eo.js'), import('@formatjs/intl-pluralrules/locale-data/eo.js'),
import('@formatjs/intl-numberformat/locale-data/eo.js'), import('@formatjs/intl-numberformat/locale-data/eo.js'),
import('@formatjs/intl-displaynames/locale-data/eo.js'), import('@formatjs/intl-displaynames/locale-data/eo.js'),
@@ -154,8 +154,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.es: { case AppLanguage.es: {
i18n.loadAndActivate({locale, messages: messagesEs}) i18n.loadAndActivate({locale, messages: messagesEs})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/es'), import('date-fns/locale/es').then(m => m.es),
import('@formatjs/intl-pluralrules/locale-data/es.js'), import('@formatjs/intl-pluralrules/locale-data/es.js'),
import('@formatjs/intl-numberformat/locale-data/es.js'), import('@formatjs/intl-numberformat/locale-data/es.js'),
import('@formatjs/intl-displaynames/locale-data/es.js'), import('@formatjs/intl-displaynames/locale-data/es.js'),
@@ -164,8 +164,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.eu: { case AppLanguage.eu: {
i18n.loadAndActivate({locale, messages: messagesEu}) i18n.loadAndActivate({locale, messages: messagesEu})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/eu'), import('date-fns/locale/eu').then(m => m.eu),
import('@formatjs/intl-pluralrules/locale-data/eu.js'), import('@formatjs/intl-pluralrules/locale-data/eu.js'),
import('@formatjs/intl-numberformat/locale-data/eu.js'), import('@formatjs/intl-numberformat/locale-data/eu.js'),
import('@formatjs/intl-displaynames/locale-data/eu.js'), import('@formatjs/intl-displaynames/locale-data/eu.js'),
@@ -174,8 +174,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.fi: { case AppLanguage.fi: {
i18n.loadAndActivate({locale, messages: messagesFi}) i18n.loadAndActivate({locale, messages: messagesFi})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/fi'), import('date-fns/locale/fi').then(m => m.fi),
import('@formatjs/intl-pluralrules/locale-data/fi.js'), import('@formatjs/intl-pluralrules/locale-data/fi.js'),
import('@formatjs/intl-numberformat/locale-data/fi.js'), import('@formatjs/intl-numberformat/locale-data/fi.js'),
import('@formatjs/intl-displaynames/locale-data/fi.js'), import('@formatjs/intl-displaynames/locale-data/fi.js'),
@@ -184,8 +184,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.fr: { case AppLanguage.fr: {
i18n.loadAndActivate({locale, messages: messagesFr}) i18n.loadAndActivate({locale, messages: messagesFr})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/fr'), import('date-fns/locale/fr').then(m => m.fr),
import('@formatjs/intl-pluralrules/locale-data/fr.js'), import('@formatjs/intl-pluralrules/locale-data/fr.js'),
import('@formatjs/intl-numberformat/locale-data/fr.js'), import('@formatjs/intl-numberformat/locale-data/fr.js'),
import('@formatjs/intl-displaynames/locale-data/fr.js'), import('@formatjs/intl-displaynames/locale-data/fr.js'),
@@ -194,8 +194,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.fy: { case AppLanguage.fy: {
i18n.loadAndActivate({locale, messages: messagesFy}) i18n.loadAndActivate({locale, messages: messagesFy})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/fy'), import('date-fns/locale/fy').then(m => m.fy),
import('@formatjs/intl-pluralrules/locale-data/fy.js'), import('@formatjs/intl-pluralrules/locale-data/fy.js'),
import('@formatjs/intl-numberformat/locale-data/fy.js'), import('@formatjs/intl-numberformat/locale-data/fy.js'),
import('@formatjs/intl-displaynames/locale-data/fy.js'), import('@formatjs/intl-displaynames/locale-data/fy.js'),
@@ -213,8 +213,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.gd: { case AppLanguage.gd: {
i18n.loadAndActivate({locale, messages: messagesGd}) i18n.loadAndActivate({locale, messages: messagesGd})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/gd'), import('date-fns/locale/gd').then(m => m.gd),
import('@formatjs/intl-pluralrules/locale-data/gd.js'), import('@formatjs/intl-pluralrules/locale-data/gd.js'),
import('@formatjs/intl-numberformat/locale-data/gd.js'), import('@formatjs/intl-numberformat/locale-data/gd.js'),
import('@formatjs/intl-displaynames/locale-data/gd.js'), import('@formatjs/intl-displaynames/locale-data/gd.js'),
@@ -223,8 +223,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.gl: { case AppLanguage.gl: {
i18n.loadAndActivate({locale, messages: messagesGl}) i18n.loadAndActivate({locale, messages: messagesGl})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/gl'), import('date-fns/locale/gl').then(m => m.gl),
import('@formatjs/intl-pluralrules/locale-data/gl.js'), import('@formatjs/intl-pluralrules/locale-data/gl.js'),
import('@formatjs/intl-numberformat/locale-data/gl.js'), import('@formatjs/intl-numberformat/locale-data/gl.js'),
import('@formatjs/intl-displaynames/locale-data/gl.js'), import('@formatjs/intl-displaynames/locale-data/gl.js'),
@@ -233,8 +233,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.hi: { case AppLanguage.hi: {
i18n.loadAndActivate({locale, messages: messagesHi}) i18n.loadAndActivate({locale, messages: messagesHi})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/hi'), import('date-fns/locale/hi').then(m => m.hi),
import('@formatjs/intl-pluralrules/locale-data/hi.js'), import('@formatjs/intl-pluralrules/locale-data/hi.js'),
import('@formatjs/intl-numberformat/locale-data/hi.js'), import('@formatjs/intl-numberformat/locale-data/hi.js'),
import('@formatjs/intl-displaynames/locale-data/hi.js'), import('@formatjs/intl-displaynames/locale-data/hi.js'),
@@ -243,8 +243,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.hu: { case AppLanguage.hu: {
i18n.loadAndActivate({locale, messages: messagesHu}) i18n.loadAndActivate({locale, messages: messagesHu})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/hu'), import('date-fns/locale/hu').then(m => m.hu),
import('@formatjs/intl-pluralrules/locale-data/hu.js'), import('@formatjs/intl-pluralrules/locale-data/hu.js'),
import('@formatjs/intl-numberformat/locale-data/hu.js'), import('@formatjs/intl-numberformat/locale-data/hu.js'),
import('@formatjs/intl-displaynames/locale-data/hu.js'), import('@formatjs/intl-displaynames/locale-data/hu.js'),
@@ -262,8 +262,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.id: { case AppLanguage.id: {
i18n.loadAndActivate({locale, messages: messagesId}) i18n.loadAndActivate({locale, messages: messagesId})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/id'), import('date-fns/locale/id').then(m => m.id),
import('@formatjs/intl-pluralrules/locale-data/id.js'), import('@formatjs/intl-pluralrules/locale-data/id.js'),
import('@formatjs/intl-numberformat/locale-data/id.js'), import('@formatjs/intl-numberformat/locale-data/id.js'),
import('@formatjs/intl-displaynames/locale-data/id.js'), import('@formatjs/intl-displaynames/locale-data/id.js'),
@@ -272,8 +272,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.it: { case AppLanguage.it: {
i18n.loadAndActivate({locale, messages: messagesIt}) i18n.loadAndActivate({locale, messages: messagesIt})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/it'), import('date-fns/locale/it').then(m => m.it),
import('@formatjs/intl-pluralrules/locale-data/it.js'), import('@formatjs/intl-pluralrules/locale-data/it.js'),
import('@formatjs/intl-numberformat/locale-data/it.js'), import('@formatjs/intl-numberformat/locale-data/it.js'),
import('@formatjs/intl-displaynames/locale-data/it.js'), import('@formatjs/intl-displaynames/locale-data/it.js'),
@@ -282,8 +282,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.ja: { case AppLanguage.ja: {
i18n.loadAndActivate({locale, messages: messagesJa}) i18n.loadAndActivate({locale, messages: messagesJa})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/ja'), import('date-fns/locale/ja').then(m => m.ja),
import('@formatjs/intl-pluralrules/locale-data/ja.js'), import('@formatjs/intl-pluralrules/locale-data/ja.js'),
import('@formatjs/intl-numberformat/locale-data/ja.js'), import('@formatjs/intl-numberformat/locale-data/ja.js'),
import('@formatjs/intl-displaynames/locale-data/ja.js'), import('@formatjs/intl-displaynames/locale-data/ja.js'),
@@ -292,8 +292,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.km: { case AppLanguage.km: {
i18n.loadAndActivate({locale, messages: messagesKm}) i18n.loadAndActivate({locale, messages: messagesKm})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/km'), import('date-fns/locale/km').then(m => m.km),
import('@formatjs/intl-pluralrules/locale-data/km.js'), import('@formatjs/intl-pluralrules/locale-data/km.js'),
import('@formatjs/intl-numberformat/locale-data/km.js'), import('@formatjs/intl-numberformat/locale-data/km.js'),
import('@formatjs/intl-displaynames/locale-data/km.js'), import('@formatjs/intl-displaynames/locale-data/km.js'),
@@ -302,8 +302,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.ko: { case AppLanguage.ko: {
i18n.loadAndActivate({locale, messages: messagesKo}) i18n.loadAndActivate({locale, messages: messagesKo})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/ko'), import('date-fns/locale/ko').then(m => m.ko),
import('@formatjs/intl-pluralrules/locale-data/ko.js'), import('@formatjs/intl-pluralrules/locale-data/ko.js'),
import('@formatjs/intl-numberformat/locale-data/ko.js'), import('@formatjs/intl-numberformat/locale-data/ko.js'),
import('@formatjs/intl-displaynames/locale-data/ko.js'), import('@formatjs/intl-displaynames/locale-data/ko.js'),
@@ -321,8 +321,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.nl: { case AppLanguage.nl: {
i18n.loadAndActivate({locale, messages: messagesNl}) i18n.loadAndActivate({locale, messages: messagesNl})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/nl'), import('date-fns/locale/nl').then(m => m.nl),
import('@formatjs/intl-pluralrules/locale-data/nl.js'), import('@formatjs/intl-pluralrules/locale-data/nl.js'),
import('@formatjs/intl-numberformat/locale-data/nl.js'), import('@formatjs/intl-numberformat/locale-data/nl.js'),
import('@formatjs/intl-displaynames/locale-data/nl.js'), import('@formatjs/intl-displaynames/locale-data/nl.js'),
@@ -331,8 +331,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.pl: { case AppLanguage.pl: {
i18n.loadAndActivate({locale, messages: messagesPl}) i18n.loadAndActivate({locale, messages: messagesPl})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/pl'), import('date-fns/locale/pl').then(m => m.pl),
import('@formatjs/intl-pluralrules/locale-data/pl.js'), import('@formatjs/intl-pluralrules/locale-data/pl.js'),
import('@formatjs/intl-numberformat/locale-data/pl.js'), import('@formatjs/intl-numberformat/locale-data/pl.js'),
import('@formatjs/intl-displaynames/locale-data/pl.js'), import('@formatjs/intl-displaynames/locale-data/pl.js'),
@@ -341,8 +341,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.pt_BR: { case AppLanguage.pt_BR: {
i18n.loadAndActivate({locale, messages: messagesPt_BR}) i18n.loadAndActivate({locale, messages: messagesPt_BR})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/pt-BR'), import('date-fns/locale/pt-BR').then(m => m.ptBR),
import('@formatjs/intl-pluralrules/locale-data/pt.js'), import('@formatjs/intl-pluralrules/locale-data/pt.js'),
import('@formatjs/intl-numberformat/locale-data/pt.js'), import('@formatjs/intl-numberformat/locale-data/pt.js'),
import('@formatjs/intl-displaynames/locale-data/pt.js'), import('@formatjs/intl-displaynames/locale-data/pt.js'),
@@ -351,8 +351,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.pt_PT: { case AppLanguage.pt_PT: {
i18n.loadAndActivate({locale, messages: messagesPt_PT}) i18n.loadAndActivate({locale, messages: messagesPt_PT})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/pt'), import('date-fns/locale/pt').then(m => m.pt),
import('@formatjs/intl-pluralrules/locale-data/pt-PT.js'), import('@formatjs/intl-pluralrules/locale-data/pt-PT.js'),
import('@formatjs/intl-numberformat/locale-data/pt-PT.js'), import('@formatjs/intl-numberformat/locale-data/pt-PT.js'),
import('@formatjs/intl-displaynames/locale-data/pt-PT.js'), import('@formatjs/intl-displaynames/locale-data/pt-PT.js'),
@@ -361,8 +361,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.ro: { case AppLanguage.ro: {
i18n.loadAndActivate({locale, messages: messagesRo}) i18n.loadAndActivate({locale, messages: messagesRo})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/ro'), import('date-fns/locale/ro').then(m => m.ro),
import('@formatjs/intl-pluralrules/locale-data/ro.js'), import('@formatjs/intl-pluralrules/locale-data/ro.js'),
import('@formatjs/intl-numberformat/locale-data/ro.js'), import('@formatjs/intl-numberformat/locale-data/ro.js'),
import('@formatjs/intl-displaynames/locale-data/ro.js'), import('@formatjs/intl-displaynames/locale-data/ro.js'),
@@ -371,8 +371,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.ru: { case AppLanguage.ru: {
i18n.loadAndActivate({locale, messages: messagesRu}) i18n.loadAndActivate({locale, messages: messagesRu})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/ru'), import('date-fns/locale/ru').then(m => m.ru),
import('@formatjs/intl-pluralrules/locale-data/ru.js'), import('@formatjs/intl-pluralrules/locale-data/ru.js'),
import('@formatjs/intl-numberformat/locale-data/ru.js'), import('@formatjs/intl-numberformat/locale-data/ru.js'),
import('@formatjs/intl-displaynames/locale-data/ru.js'), import('@formatjs/intl-displaynames/locale-data/ru.js'),
@@ -381,8 +381,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.sv: { case AppLanguage.sv: {
i18n.loadAndActivate({locale, messages: messagesSv}) i18n.loadAndActivate({locale, messages: messagesSv})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/sv'), import('date-fns/locale/sv').then(m => m.sv),
import('@formatjs/intl-pluralrules/locale-data/sv.js'), import('@formatjs/intl-pluralrules/locale-data/sv.js'),
import('@formatjs/intl-numberformat/locale-data/sv.js'), import('@formatjs/intl-numberformat/locale-data/sv.js'),
import('@formatjs/intl-displaynames/locale-data/sv.js'), import('@formatjs/intl-displaynames/locale-data/sv.js'),
@@ -391,8 +391,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.th: { case AppLanguage.th: {
i18n.loadAndActivate({locale, messages: messagesTh}) i18n.loadAndActivate({locale, messages: messagesTh})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/th'), import('date-fns/locale/th').then(m => m.th),
import('@formatjs/intl-pluralrules/locale-data/th.js'), import('@formatjs/intl-pluralrules/locale-data/th.js'),
import('@formatjs/intl-numberformat/locale-data/th.js'), import('@formatjs/intl-numberformat/locale-data/th.js'),
import('@formatjs/intl-displaynames/locale-data/th.js'), import('@formatjs/intl-displaynames/locale-data/th.js'),
@@ -401,8 +401,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.tr: { case AppLanguage.tr: {
i18n.loadAndActivate({locale, messages: messagesTr}) i18n.loadAndActivate({locale, messages: messagesTr})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/tr'), import('date-fns/locale/tr').then(m => m.tr),
import('@formatjs/intl-pluralrules/locale-data/tr.js'), import('@formatjs/intl-pluralrules/locale-data/tr.js'),
import('@formatjs/intl-numberformat/locale-data/tr.js'), import('@formatjs/intl-numberformat/locale-data/tr.js'),
import('@formatjs/intl-displaynames/locale-data/tr.js'), import('@formatjs/intl-displaynames/locale-data/tr.js'),
@@ -411,8 +411,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.uk: { case AppLanguage.uk: {
i18n.loadAndActivate({locale, messages: messagesUk}) i18n.loadAndActivate({locale, messages: messagesUk})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/uk'), import('date-fns/locale/uk').then(m => m.uk),
import('@formatjs/intl-pluralrules/locale-data/uk.js'), import('@formatjs/intl-pluralrules/locale-data/uk.js'),
import('@formatjs/intl-numberformat/locale-data/uk.js'), import('@formatjs/intl-numberformat/locale-data/uk.js'),
import('@formatjs/intl-displaynames/locale-data/uk.js'), import('@formatjs/intl-displaynames/locale-data/uk.js'),
@@ -421,8 +421,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.vi: { case AppLanguage.vi: {
i18n.loadAndActivate({locale, messages: messagesVi}) i18n.loadAndActivate({locale, messages: messagesVi})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/vi'), import('date-fns/locale/vi').then(m => m.vi),
import('@formatjs/intl-pluralrules/locale-data/vi.js'), import('@formatjs/intl-pluralrules/locale-data/vi.js'),
import('@formatjs/intl-numberformat/locale-data/vi.js'), import('@formatjs/intl-numberformat/locale-data/vi.js'),
import('@formatjs/intl-displaynames/locale-data/vi.js'), import('@formatjs/intl-displaynames/locale-data/vi.js'),
@@ -431,8 +431,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.zh_CN: { case AppLanguage.zh_CN: {
i18n.loadAndActivate({locale, messages: messagesZh_CN}) i18n.loadAndActivate({locale, messages: messagesZh_CN})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/zh-CN'), import('date-fns/locale/zh-CN').then(m => m.zhCN),
import('@formatjs/intl-pluralrules/locale-data/zh.js'), import('@formatjs/intl-pluralrules/locale-data/zh.js'),
import('@formatjs/intl-numberformat/locale-data/zh.js'), import('@formatjs/intl-numberformat/locale-data/zh.js'),
import('@formatjs/intl-displaynames/locale-data/zh.js'), import('@formatjs/intl-displaynames/locale-data/zh.js'),
@@ -441,8 +441,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.zh_HK: { case AppLanguage.zh_HK: {
i18n.loadAndActivate({locale, messages: messagesZh_HK}) i18n.loadAndActivate({locale, messages: messagesZh_HK})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/zh-HK'), import('date-fns/locale/zh-HK').then(m => m.zhHK),
import('@formatjs/intl-pluralrules/locale-data/zh.js'), import('@formatjs/intl-pluralrules/locale-data/zh.js'),
import('@formatjs/intl-numberformat/locale-data/yue-Hant.js'), import('@formatjs/intl-numberformat/locale-data/yue-Hant.js'),
import('@formatjs/intl-displaynames/locale-data/yue-Hant.js'), import('@formatjs/intl-displaynames/locale-data/yue-Hant.js'),
@@ -451,8 +451,8 @@ export async function dynamicActivate(locale: AppLanguage) {
} }
case AppLanguage.zh_TW: { case AppLanguage.zh_TW: {
i18n.loadAndActivate({locale, messages: messagesZh_TW}) i18n.loadAndActivate({locale, messages: messagesZh_TW})
const [{default: dateLocale}] = await Promise.all([ const [dateLocale] = await Promise.all([
import('date-fns/locale/zh-TW'), import('date-fns/locale/zh-TW').then(m => m.zhTW),
import('@formatjs/intl-pluralrules/locale-data/zh.js'), import('@formatjs/intl-pluralrules/locale-data/zh.js'),
import('@formatjs/intl-numberformat/locale-data/zh-Hant.js'), import('@formatjs/intl-numberformat/locale-data/zh-Hant.js'),
import('@formatjs/intl-displaynames/locale-data/zh-Hant.js'), import('@formatjs/intl-displaynames/locale-data/zh-Hant.js'),
@@ -471,9 +471,11 @@ export function useLocaleLanguage() {
const [dateLocale, setDateLocale] = useState(defaultLocale) const [dateLocale, setDateLocale] = useState(defaultLocale)
useEffect(() => { useEffect(() => {
dynamicActivate(sanitizeAppLanguageSetting(appLanguage)).then(locale => { void dynamicActivate(sanitizeAppLanguageSetting(appLanguage)).then(
locale => {
setDateLocale(locale ?? defaultLocale) setDateLocale(locale ?? defaultLocale)
}) },
)
}, [appLanguage]) }, [appLanguage])
return dateLocale return dateLocale
+121 -120
View File
@@ -1,6 +1,7 @@
import {useEffect, useState} from 'react' import {useEffect, useState} from 'react'
import {i18n} from '@lingui/core' import {i18n, type Messages} from '@lingui/core'
import defaultLocale from 'date-fns/locale/en-US' import {type Locale} from 'date-fns/locale'
import {enUS as defaultLocale} from 'date-fns/locale/en-US'
import {sanitizeAppLanguageSetting} from '#/locale/helpers' import {sanitizeAppLanguageSetting} from '#/locale/helpers'
import {AppLanguage} from '#/locale/languages' import {AppLanguage} from '#/locale/languages'
@@ -10,288 +11,288 @@ import {useLanguagePrefs} from '#/state/preferences'
* We do a dynamic import of just the catalog that we need * We do a dynamic import of just the catalog that we need
*/ */
export async function dynamicActivate(locale: AppLanguage) { export async function dynamicActivate(locale: AppLanguage) {
let mod: any let messages: Messages
let dateLocale: Locale = defaultLocale let dateLocale: Locale = defaultLocale
switch (locale) { switch (locale) {
case AppLanguage.an: { case AppLanguage.an: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/an/messages`), import(`./locales/an/messages`).then(m => m.messages),
import('date-fns/locale/es'), import('date-fns/locale/es').then(m => m.es),
]) ])
break break
} }
case AppLanguage.ast: { case AppLanguage.ast: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/ast/messages`), import(`./locales/ast/messages`).then(m => m.messages),
import('date-fns/locale/es'), import('date-fns/locale/es').then(m => m.es),
]) ])
break break
} }
case AppLanguage.ca: { case AppLanguage.ca: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/ca/messages`), import(`./locales/ca/messages`).then(m => m.messages),
import('date-fns/locale/ca'), import('date-fns/locale/ca').then(m => m.ca),
]) ])
break break
} }
case AppLanguage.cy: { case AppLanguage.cy: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/cy/messages`), import(`./locales/cy/messages`).then(m => m.messages),
import('date-fns/locale/cy'), import('date-fns/locale/cy').then(m => m.cy),
]) ])
break break
} }
case AppLanguage.da: { case AppLanguage.da: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/da/messages`), import(`./locales/da/messages`).then(m => m.messages),
import('date-fns/locale/da'), import('date-fns/locale/da').then(m => m.da),
]) ])
break break
} }
case AppLanguage.de: { case AppLanguage.de: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/de/messages`), import(`./locales/de/messages`).then(m => m.messages),
import('date-fns/locale/de'), import('date-fns/locale/de').then(m => m.de),
]) ])
break break
} }
case AppLanguage.el: { case AppLanguage.el: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/el/messages`), import(`./locales/el/messages`).then(m => m.messages),
import('date-fns/locale/el'), import('date-fns/locale/el').then(m => m.el),
]) ])
break break
} }
case AppLanguage.en_GB: { case AppLanguage.en_GB: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/en-GB/messages`), import(`./locales/en-GB/messages`).then(m => m.messages),
import('date-fns/locale/en-GB'), import('date-fns/locale/en-GB').then(m => m.enGB),
]) ])
break break
} }
case AppLanguage.eo: { case AppLanguage.eo: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/eo/messages`), import(`./locales/eo/messages`).then(m => m.messages),
import('date-fns/locale/eo'), import('date-fns/locale/eo').then(m => m.eo),
]) ])
break break
} }
case AppLanguage.es: { case AppLanguage.es: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/es/messages`), import(`./locales/es/messages`).then(m => m.messages),
import('date-fns/locale/es'), import('date-fns/locale/es').then(m => m.es),
]) ])
break break
} }
case AppLanguage.eu: { case AppLanguage.eu: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/eu/messages`), import(`./locales/eu/messages`).then(m => m.messages),
import('date-fns/locale/eu'), import('date-fns/locale/eu').then(m => m.eu),
]) ])
break break
} }
case AppLanguage.fi: { case AppLanguage.fi: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/fi/messages`), import(`./locales/fi/messages`).then(m => m.messages),
import('date-fns/locale/fi'), import('date-fns/locale/fi').then(m => m.fi),
]) ])
break break
} }
case AppLanguage.fr: { case AppLanguage.fr: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/fr/messages`), import(`./locales/fr/messages`).then(m => m.messages),
import('date-fns/locale/fr'), import('date-fns/locale/fr').then(m => m.fr),
]) ])
break break
} }
case AppLanguage.fy: { case AppLanguage.fy: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/fy/messages`), import(`./locales/fy/messages`).then(m => m.messages),
import('date-fns/locale/fy'), import('date-fns/locale/fy').then(m => m.fy),
]) ])
break break
} }
case AppLanguage.ga: { case AppLanguage.ga: {
mod = await import(`./locales/ga/messages`) messages = await import(`./locales/ga/messages`).then(m => m.messages)
break break
} }
case AppLanguage.gd: { case AppLanguage.gd: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/gd/messages`), import(`./locales/gd/messages`).then(m => m.messages),
import('date-fns/locale/gd'), import('date-fns/locale/gd').then(m => m.gd),
]) ])
break break
} }
case AppLanguage.gl: { case AppLanguage.gl: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/gl/messages`), import(`./locales/gl/messages`).then(m => m.messages),
import('date-fns/locale/gl'), import('date-fns/locale/gl').then(m => m.gl),
]) ])
break break
} }
case AppLanguage.hi: { case AppLanguage.hi: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/hi/messages`), import(`./locales/hi/messages`).then(m => m.messages),
import('date-fns/locale/hi'), import('date-fns/locale/hi').then(m => m.hi),
]) ])
break break
} }
case AppLanguage.hu: { case AppLanguage.hu: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/hu/messages`), import(`./locales/hu/messages`).then(m => m.messages),
import('date-fns/locale/hu'), import('date-fns/locale/hu').then(m => m.hu),
]) ])
break break
} }
case AppLanguage.ia: { case AppLanguage.ia: {
mod = await import(`./locales/ia/messages`) messages = await import(`./locales/ia/messages`).then(m => m.messages)
break break
} }
case AppLanguage.id: { case AppLanguage.id: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/id/messages`), import(`./locales/id/messages`).then(m => m.messages),
import('date-fns/locale/id'), import('date-fns/locale/id').then(m => m.id),
]) ])
break break
} }
case AppLanguage.it: { case AppLanguage.it: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/it/messages`), import(`./locales/it/messages`).then(m => m.messages),
import('date-fns/locale/it'), import('date-fns/locale/it').then(m => m.it),
]) ])
break break
} }
case AppLanguage.ja: { case AppLanguage.ja: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/ja/messages`), import(`./locales/ja/messages`).then(m => m.messages),
import('date-fns/locale/ja'), import('date-fns/locale/ja').then(m => m.ja),
]) ])
break break
} }
case AppLanguage.km: { case AppLanguage.km: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/km/messages`), import(`./locales/km/messages`).then(m => m.messages),
import('date-fns/locale/km'), import('date-fns/locale/km').then(m => m.km),
]) ])
break break
} }
case AppLanguage.ko: { case AppLanguage.ko: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/ko/messages`), import(`./locales/ko/messages`).then(m => m.messages),
import('date-fns/locale/ko'), import('date-fns/locale/ko').then(m => m.ko),
]) ])
break break
} }
case AppLanguage.ne: { case AppLanguage.ne: {
mod = await import(`./locales/ne/messages`) messages = await import(`./locales/ne/messages`).then(m => m.messages)
break break
} }
case AppLanguage.nl: { case AppLanguage.nl: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/nl/messages`), import(`./locales/nl/messages`).then(m => m.messages),
import('date-fns/locale/nl'), import('date-fns/locale/nl').then(m => m.nl),
]) ])
break break
} }
case AppLanguage.pl: { case AppLanguage.pl: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/pl/messages`), import(`./locales/pl/messages`).then(m => m.messages),
import('date-fns/locale/pl'), import('date-fns/locale/pl').then(m => m.pl),
]) ])
break break
} }
case AppLanguage.pt_BR: { case AppLanguage.pt_BR: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/pt-BR/messages`), import(`./locales/pt-BR/messages`).then(m => m.messages),
import('date-fns/locale/pt-BR'), import('date-fns/locale/pt-BR').then(m => m.ptBR),
]) ])
break break
} }
case AppLanguage.pt_PT: { case AppLanguage.pt_PT: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/pt-PT/messages`), import(`./locales/pt-PT/messages`).then(m => m.messages),
import('date-fns/locale/pt'), import('date-fns/locale/pt').then(m => m.pt),
]) ])
break break
} }
case AppLanguage.ro: { case AppLanguage.ro: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/ro/messages`), import(`./locales/ro/messages`).then(m => m.messages),
import('date-fns/locale/ro'), import('date-fns/locale/ro').then(m => m.ro),
]) ])
break break
} }
case AppLanguage.ru: { case AppLanguage.ru: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/ru/messages`), import(`./locales/ru/messages`).then(m => m.messages),
import('date-fns/locale/ru'), import('date-fns/locale/ru').then(m => m.ru),
]) ])
break break
} }
case AppLanguage.sv: { case AppLanguage.sv: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/sv/messages`), import(`./locales/sv/messages`).then(m => m.messages),
import('date-fns/locale/sv'), import('date-fns/locale/sv').then(m => m.sv),
]) ])
break break
} }
case AppLanguage.th: { case AppLanguage.th: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/th/messages`), import(`./locales/th/messages`).then(m => m.messages),
import('date-fns/locale/th'), import('date-fns/locale/th').then(m => m.th),
]) ])
break break
} }
case AppLanguage.tr: { case AppLanguage.tr: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/tr/messages`), import(`./locales/tr/messages`).then(m => m.messages),
import('date-fns/locale/tr'), import('date-fns/locale/tr').then(m => m.tr),
]) ])
break break
} }
case AppLanguage.uk: { case AppLanguage.uk: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/uk/messages`), import(`./locales/uk/messages`).then(m => m.messages),
import('date-fns/locale/uk'), import('date-fns/locale/uk').then(m => m.uk),
]) ])
break break
} }
case AppLanguage.vi: { case AppLanguage.vi: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/vi/messages`), import(`./locales/vi/messages`).then(m => m.messages),
import('date-fns/locale/vi'), import('date-fns/locale/vi').then(m => m.vi),
]) ])
break break
} }
case AppLanguage.zh_CN: { case AppLanguage.zh_CN: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/zh-CN/messages`), import(`./locales/zh-CN/messages`).then(m => m.messages),
import('date-fns/locale/zh-CN'), import('date-fns/locale/zh-CN').then(m => m.zhCN),
]) ])
break break
} }
case AppLanguage.zh_HK: { case AppLanguage.zh_HK: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/zh-HK/messages`), import(`./locales/zh-HK/messages`).then(m => m.messages),
import('date-fns/locale/zh-HK'), import('date-fns/locale/zh-HK').then(m => m.zhHK),
]) ])
break break
} }
case AppLanguage.zh_TW: { case AppLanguage.zh_TW: {
;[mod, {default: dateLocale}] = await Promise.all([ ;[messages, dateLocale] = await Promise.all([
import(`./locales/zh-TW/messages`), import(`./locales/zh-TW/messages`).then(m => m.messages),
import('date-fns/locale/zh-TW'), import('date-fns/locale/zh-TW').then(m => m.zhTW),
]) ])
break break
} }
default: { default: {
mod = await import(`./locales/en/messages`) messages = await import(`./locales/en/messages`).then(m => m.messages)
break break
} }
} }
i18n.load(locale, mod.messages) i18n.load(locale, messages)
i18n.activate(locale) i18n.activate(locale)
return dateLocale return dateLocale
@@ -305,7 +306,7 @@ export function useLocaleLanguage() {
const sanitizedLanguage = sanitizeAppLanguageSetting(appLanguage) const sanitizedLanguage = sanitizeAppLanguageSetting(appLanguage)
document.documentElement.lang = sanitizedLanguage document.documentElement.lang = sanitizedLanguage
dynamicActivate(sanitizedLanguage).then(locale => { void dynamicActivate(sanitizedLanguage).then(locale => {
setDateLocale(locale) setDateLocale(locale)
}) })
}, [appLanguage]) }, [appLanguage])
+1 -1
View File
@@ -1,4 +1,4 @@
import format from 'date-fns/format' import {format} from 'date-fns/format'
import {LogLevel, type Transport} from '#/logger/types' import {LogLevel, type Transport} from '#/logger/types'
import {prepareMetadata} from '#/logger/util' import {prepareMetadata} from '#/logger/util'
+2 -1
View File
@@ -25,7 +25,8 @@ if (process.env.NODE_ENV !== 'production') {
thrownErrors.add(err) thrownErrors.add(err)
throw err throw err
} else if (!thrownErrors.has(msgOrError)) { } else if (!thrownErrors.has(msgOrError)) {
return realConsoleError.apply(this, arguments as any) // @ts-expect-error
return realConsoleError.apply(this, arguments)
} }
} }
} }