Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
⚡️ Load i18n resources on server (#2206)
Luke Vella6678ffe31814
diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsxindex 4c9b521e7..c0931c070 100644--- a/apps/web/src/app/[locale]/layout.tsx+++ b/apps/web/src/app/[locale]/layout.tsx@@ -17,6 +17,7 @@ import { getInstanceBrandingConfig } from "@/features/branding/queries";import { ThemeProvider } from "@/features/theme/client";import type { UserDTO } from "@/features/user/schema";import { I18nProvider } from "@/i18n/client";+import { initI18next } from "@/i18n/i18n";import { getSession } from "@/lib/auth";import { FeatureFlagsProvider } from "@/lib/feature-flags/client";import { featureFlagConfig } from "@/lib/feature-flags/config";@@ -37,12 +38,15 @@ export const viewport: Viewport = {maximumScale: 1,};-async function loadData() {- const [session, brandingConfig] = await Promise.all([+async function loadData(locale: string) {+ const [session, brandingConfig, { i18n }] = await Promise.all([getSession(),getInstanceBrandingConfig(),+ initI18next({ lng: locale }),]);+ const resources = i18n.store.data;+const user = session?.user? !session.user.isGuest? await requireUser()@@ -60,6 +64,7 @@ async function loadData() {: null;return {+ resources,session,user,brandingConfig,@@ -74,7 +79,7 @@ export default async function Root({params: Promise<Params>;}) {const { locale } = await params;- const { user, brandingConfig } = await loadData();+ const { user, brandingConfig, resources } = await loadData(locale);const brandingStyles = {"--primary-light": brandingConfig.primaryColor.light,@@ -99,7 +104,7 @@ export default async function Root({<FeatureFlagsProvider value={featureFlagConfig}><BrandingProvider value={brandingConfig}><Toaster />- <I18nProvider locale={locale}>+ <I18nProvider locale={locale} resources={resources}><TRPCProvider><LazyMotion features={domAnimation}><PostHogProvider>diff --git a/apps/web/src/i18n/client.tsx b/apps/web/src/i18n/client.tsxindex 967777213..c72e373a2 100644--- a/apps/web/src/i18n/client.tsx+++ b/apps/web/src/i18n/client.tsx@@ -1,14 +1,17 @@"use client";+import type { Resource } from "i18next";+import { createInstance } from "i18next";+import ICU from "i18next-icu";import type React from "react";+import { useMemo } from "react";import {Trans as BaseTrans,I18nextProvider,useTranslation as useTranslationOrg,} from "react-i18next";-import useAsync from "react-use/lib/useAsync";-import { initI18next } from "./i18n";-import { defaultNS } from "./settings";+import { initReactI18next } from "react-i18next/initReactI18next";+import { defaultNS, getOptions } from "./settings";import type { TxKeyPath } from "./types";export function useTranslation() {@@ -18,22 +21,23 @@ export function useTranslation() {export function I18nProvider({children,locale,+ resources,}: {children: React.ReactNode;locale: string;+ resources: Resource;}) {- const res = useAsync(async () => {- return await initI18next({- lng: locale,+ const i18n = useMemo(() => {+ const instance = createInstance().use(initReactI18next).use(ICU);+ instance.init({+ ...getOptions(locale),+ resources,});- });-- if (!res.value) {- return null;- }+ return instance;+ }, [locale, resources]);return (- <I18nextProvider i18n={res.value.i18n} defaultNS={defaultNS}>+ <I18nextProvider i18n={i18n} defaultNS={defaultNS}>{children}</I18nextProvider>);