From d6c05aaec4d3ae257887d4fce420d1aae81f5f18 Mon Sep 17 00:00:00 2001 From: Dmitry Shutov Date: Fri, 7 Feb 2025 20:47:48 +0700 Subject: [PATCH 1/3] Pass locale property to ANTD config provider component --- src/services/i18n.ts | 11 +++++++++++ src/theme/ThemeProvider.tsx | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/services/i18n.ts b/src/services/i18n.ts index 67d168e1..3094806f 100644 --- a/src/services/i18n.ts +++ b/src/services/i18n.ts @@ -1,4 +1,9 @@ import { i18n } from '@lingui/core'; +import { Locale } from 'antd/es/locale'; +import enAntdLocale from 'antd/es/locale/en_US'; +import esAntdLocale from 'antd/es/locale/es_ES'; +import ruAntdLocale from 'antd/es/locale/ru_RU'; + import { en, es, ru } from 'make-plural/plurals'; import { messages as enMessages } from 'src/locale/en/messages'; @@ -42,3 +47,9 @@ export function dynamicActivate(locale: LocaleCode) { i18n.activate(locale); } + +export const antdLocaleMap: { [localeCode in LocaleCode]: Locale } = { + en: enAntdLocale, + es: esAntdLocale, + ru: ruAntdLocale, +}; diff --git a/src/theme/ThemeProvider.tsx b/src/theme/ThemeProvider.tsx index 7be1ff61..c149e8f4 100644 --- a/src/theme/ThemeProvider.tsx +++ b/src/theme/ThemeProvider.tsx @@ -4,6 +4,7 @@ import { ThemeProvider as StyledComponentsThemeProvider, createGlobalStyle } fro import { getAppTheme, getANTDTheme } from './'; import { useTheme } from '../utils/theme'; +import { antdLocaleMap, getCurrentLocale } from 'src/services/i18n'; interface Props { theme?: 'dark' | 'light'; @@ -36,7 +37,7 @@ export function ThemeProvider(props: Props) { }; return ( - + {children} From c11e179df41dbf23d92304473c086eabc6743ad1 Mon Sep 17 00:00:00 2001 From: Dmitry Shutov Date: Sat, 8 Feb 2025 14:02:52 +0700 Subject: [PATCH 2/3] Fix ESLint import sorting warning --- src/services/i18n.ts | 1 - src/theme/ThemeProvider.tsx | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/i18n.ts b/src/services/i18n.ts index 3094806f..da994af1 100644 --- a/src/services/i18n.ts +++ b/src/services/i18n.ts @@ -3,7 +3,6 @@ import { Locale } from 'antd/es/locale'; import enAntdLocale from 'antd/es/locale/en_US'; import esAntdLocale from 'antd/es/locale/es_ES'; import ruAntdLocale from 'antd/es/locale/ru_RU'; - import { en, es, ru } from 'make-plural/plurals'; import { messages as enMessages } from 'src/locale/en/messages'; diff --git a/src/theme/ThemeProvider.tsx b/src/theme/ThemeProvider.tsx index c149e8f4..86453ebc 100644 --- a/src/theme/ThemeProvider.tsx +++ b/src/theme/ThemeProvider.tsx @@ -2,9 +2,10 @@ import { ConfigProvider as ANTDConfigProvider } from 'antd'; import { ReactNode } from 'react'; import { ThemeProvider as StyledComponentsThemeProvider, createGlobalStyle } from 'styled-components'; +import { antdLocaleMap, getCurrentLocale } from 'src/services/i18n'; + import { getAppTheme, getANTDTheme } from './'; import { useTheme } from '../utils/theme'; -import { antdLocaleMap, getCurrentLocale } from 'src/services/i18n'; interface Props { theme?: 'dark' | 'light'; From 0557ebf129359d9e093621905269708ef85c0a27 Mon Sep 17 00:00:00 2001 From: Dmitry Shutov Date: Mon, 10 Feb 2025 13:04:26 +0700 Subject: [PATCH 3/3] Import antd Locale type explicitly --- src/services/i18n.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/i18n.ts b/src/services/i18n.ts index da994af1..d325b6e5 100644 --- a/src/services/i18n.ts +++ b/src/services/i18n.ts @@ -1,5 +1,5 @@ import { i18n } from '@lingui/core'; -import { Locale } from 'antd/es/locale'; +import type { Locale } from 'antd/es/locale'; import enAntdLocale from 'antd/es/locale/en_US'; import esAntdLocale from 'antd/es/locale/es_ES'; import ruAntdLocale from 'antd/es/locale/ru_RU';