diff options
Diffstat (limited to 'src/locale')
-rw-r--r-- | src/locale/__tests__/helpers.test.ts | 2 | ||||
-rw-r--r-- | src/locale/helpers.ts | 3 | ||||
-rw-r--r-- | src/locale/i18n.ts | 17 | ||||
-rw-r--r-- | src/locale/i18n.web.ts | 4 | ||||
-rw-r--r-- | src/locale/i18nProvider.tsx | 5 |
5 files changed, 15 insertions, 16 deletions
diff --git a/src/locale/__tests__/helpers.test.ts b/src/locale/__tests__/helpers.test.ts index 0cc0b7816..5e924c9fe 100644 --- a/src/locale/__tests__/helpers.test.ts +++ b/src/locale/__tests__/helpers.test.ts @@ -1,4 +1,4 @@ -import {expect, test} from '@jest/globals' +import {test, expect} from '@jest/globals' import {sanitizeAppLanguageSetting} from '#/locale/helpers' import {AppLanguage} from '#/locale/languages' diff --git a/src/locale/helpers.ts b/src/locale/helpers.ts index 54b05cb68..c73242e70 100644 --- a/src/locale/helpers.ts +++ b/src/locale/helpers.ts @@ -1,8 +1,7 @@ import {AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api' -import * as bcp47Match from 'bcp-47-match' import lande from 'lande' import {hasProp} from 'lib/type-guards' - +import * as bcp47Match from 'bcp-47-match' import { AppLanguage, LANGUAGES_MAP_CODE2, diff --git a/src/locale/i18n.ts b/src/locale/i18n.ts index 310f17a10..e8addb0b4 100644 --- a/src/locale/i18n.ts +++ b/src/locale/i18n.ts @@ -1,22 +1,23 @@ -import {i18n} from '@lingui/core' import {useEffect} from 'react' +import {i18n} from '@lingui/core' -import {sanitizeAppLanguageSetting} from '#/locale/helpers' -import {AppLanguage} from '#/locale/languages' -import {messages as messagesCa} from '#/locale/locales/ca/messages' -import {messages as messagesDe} from '#/locale/locales/de/messages' +import {useLanguagePrefs} from '#/state/preferences' import {messages as messagesEn} from '#/locale/locales/en/messages' +import {messages as messagesDe} from '#/locale/locales/de/messages' +import {messages as messagesId} from '#/locale/locales/id/messages' import {messages as messagesEs} from '#/locale/locales/es/messages' import {messages as messagesFr} from '#/locale/locales/fr/messages' import {messages as messagesHi} from '#/locale/locales/hi/messages' -import {messages as messagesId} from '#/locale/locales/id/messages' -import {messages as messagesIt} from '#/locale/locales/it/messages' import {messages as messagesJa} from '#/locale/locales/ja/messages' import {messages as messagesKo} from '#/locale/locales/ko/messages' import {messages as messagesPt_BR} from '#/locale/locales/pt-BR/messages' import {messages as messagesUk} from '#/locale/locales/uk/messages' +import {messages as messagesCa} from '#/locale/locales/ca/messages' import {messages as messagesZh_CN} from '#/locale/locales/zh-CN/messages' -import {useLanguagePrefs} from '#/state/preferences' +import {messages as messagesIt} from '#/locale/locales/it/messages' + +import {sanitizeAppLanguageSetting} from '#/locale/helpers' +import {AppLanguage} from '#/locale/languages' /** * We do a dynamic import of just the catalog that we need diff --git a/src/locale/i18n.web.ts b/src/locale/i18n.web.ts index ce0c640fe..d8e51723f 100644 --- a/src/locale/i18n.web.ts +++ b/src/locale/i18n.web.ts @@ -1,9 +1,9 @@ -import {i18n} from '@lingui/core' import {useEffect} from 'react' +import {i18n} from '@lingui/core' +import {useLanguagePrefs} from '#/state/preferences' import {sanitizeAppLanguageSetting} from '#/locale/helpers' import {AppLanguage} from '#/locale/languages' -import {useLanguagePrefs} from '#/state/preferences' /** * We do a dynamic import of just the catalog that we need diff --git a/src/locale/i18nProvider.tsx b/src/locale/i18nProvider.tsx index 645c0fc6a..3766f5b71 100644 --- a/src/locale/i18nProvider.tsx +++ b/src/locale/i18nProvider.tsx @@ -1,7 +1,6 @@ -import {i18n} from '@lingui/core' -import {I18nProvider as DefaultI18nProvider} from '@lingui/react' import React from 'react' - +import {I18nProvider as DefaultI18nProvider} from '@lingui/react' +import {i18n} from '@lingui/core' import {useLocaleLanguage} from './i18n' export default function I18nProvider({children}: {children: React.ReactNode}) { |