diff --git a/ui/src/i18n/vendors/antd.ts b/ui/src/i18n/vendors/antd.ts index d236afef1..db698e7c1 100644 --- a/ui/src/i18n/vendors/antd.ts +++ b/ui/src/i18n/vendors/antd.ts @@ -1,5 +1,4 @@ -import { useEffect, useState } from "react"; -import { useTranslation } from "react-i18next"; +import { useTranslation } from "react-i18next"; import { type Locale } from "antd/es/locale"; import AntdLocaleEnUS from "antd/locale/en_US"; import AntdLocaleZhCN from "antd/locale/zh_CN"; @@ -13,12 +12,5 @@ const localesMap: Record = { export const useAntdLocale = () => { const { i18n } = useTranslation(); - - const [antdLocale, setAntdLocale] = useState(localesMap[i18n.language]); - - useEffect(() => { - setAntdLocale(localesMap[i18n.language]); - }, [i18n.language]); - - return antdLocale; + return localesMap[i18n.resolvedLanguage ?? i18n.language]; }; diff --git a/ui/src/i18n/vendors/dayjs.ts b/ui/src/i18n/vendors/dayjs.ts index bd8b96493..a67b650c1 100644 --- a/ui/src/i18n/vendors/dayjs.ts +++ b/ui/src/i18n/vendors/dayjs.ts @@ -1,4 +1,4 @@ -import { useEffect, useState } from "react"; +import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import dayjs from "dayjs"; import { type Locale as ILocale } from "dayjs/locale/en"; @@ -15,12 +15,7 @@ const localesMap: Record = { export const useDayjsLocale = () => { const { i18n } = useTranslation(); - - const [dayjsLocale, setDayjsLocale] = useState(localesMap[i18n.language]); - - useEffect(() => { - setDayjsLocale(localesMap[i18n.language]); - }, [i18n.language]); + const dayjsLocale = localesMap[i18n.resolvedLanguage ?? i18n.language]; useEffect(() => { dayjs.locale(dayjsLocale); diff --git a/ui/src/i18n/vendors/zod.ts b/ui/src/i18n/vendors/zod.ts index df063bf82..d9cd01d4e 100644 --- a/ui/src/i18n/vendors/zod.ts +++ b/ui/src/i18n/vendors/zod.ts @@ -1,4 +1,4 @@ -import { useEffect, useState } from "react"; +import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { config as zconfig } from "zod"; import { en as ZodLocaleEnUs, zhCN as ZodLocaleZhCN } from "zod/locales"; @@ -89,12 +89,7 @@ const localesMap: Record = { export const useZodLocale = () => { const { i18n } = useTranslation(); - - const [zodLocale, setZodLocale] = useState(localesMap[i18n.language]); - - useEffect(() => { - setZodLocale(localesMap[i18n.language]); - }, [i18n.language]); + const zodLocale = localesMap[i18n.resolvedLanguage ?? i18n.language]; useEffect(() => { zconfig(zodLocale);