diff --git a/apps/exhibition-live/components/i18n/getStaticPage.tsx b/apps/exhibition-live/components/i18n/getStaticPage.tsx index e3a01264..a876d9f5 100644 --- a/apps/exhibition-live/components/i18n/getStaticPage.tsx +++ b/apps/exhibition-live/components/i18n/getStaticPage.tsx @@ -1,5 +1,8 @@ import { serverSideTranslations } from "next-i18next/serverSideTranslations"; const locales = ["en", "de"]; +import 'dayjs/locale/de'; +import 'dayjs/locale/en'; +import dayjs from "dayjs"; export const getI18nPaths = () => locales.map((lng) => ({ params: { @@ -22,7 +25,8 @@ export const mixinStaticPathsParams = (paths) => .flat(); export async function getI18nProps(ctx, ns = ["translation", "table"]) { - const locale = ctx?.params?.locale; + const locale = ctx?.params?.locale || "en"; + dayjs.locale(locale); let props = { ...(await serverSideTranslations(locale, ns)), }; diff --git a/apps/exhibition-live/pages/[locale]/list/[typeName].tsx b/apps/exhibition-live/pages/[locale]/list/[typeName].tsx index b9b0dab5..0995c268 100644 --- a/apps/exhibition-live/pages/[locale]/list/[typeName].tsx +++ b/apps/exhibition-live/pages/[locale]/list/[typeName].tsx @@ -32,7 +32,6 @@ export async function getStaticProps(ctx) { }; } export default (props: Props) => { - const router = useRouter(); const { t } = useTranslation(); const { typeName } = props; const title = `${t(typeName)} - ${t("list")}` diff --git a/apps/exhibition-live/pages/_app.tsx b/apps/exhibition-live/pages/_app.tsx index 1a362470..09171ffc 100644 --- a/apps/exhibition-live/pages/_app.tsx +++ b/apps/exhibition-live/pages/_app.tsx @@ -15,12 +15,17 @@ import ThemeComponent from "../components/theme/ThemeComponent"; import NiceModal from "@ebay/nice-modal-react"; import { SnackbarProvider } from "notistack"; import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; -import { appWithTranslation, UserConfig } from "next-i18next"; +import {appWithTranslation, UserConfig, useTranslation} from "next-i18next"; import nextI18NextConfig from "../next-i18next.config"; import { GoogleOAuthProvider } from "@react-oauth/google"; import { AdbProvider } from "../components/provider/adbContext"; import {LocalizationProvider} from "@mui/x-date-pickers"; import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'; +import dayjs from "dayjs"; +import 'dayjs/locale/de'; +import 'dayjs/locale/en'; +import {useEffect} from "react"; + export const queryClient = new QueryClient(); const QueryClientProviderWrapper = ({ @@ -33,6 +38,10 @@ const QueryClientProviderWrapper = ({ ); }; function App({ Component, pageProps }: AppProps) { + const { i18n } = useTranslation() + useEffect(() => { + dayjs.locale(i18n.language in ["en", "de"] ? i18n.language : "en") + }, [i18n.language]); return (