Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Move locale sync (#2208)

Luke Vellabfdc403e2dca
diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsx
index 24386c7d4..4c9b521e7 100644
--- a/apps/web/src/app/[locale]/layout.tsx
+++ b/apps/web/src/app/[locale]/layout.tsx
@@ -20,7 +20,6 @@ import { I18nProvider } from "@/i18n/client";
import { getSession } from "@/lib/auth";
import { FeatureFlagsProvider } from "@/lib/feature-flags/client";
import { featureFlagConfig } from "@/lib/feature-flags/config";
-import { LocaleSync } from "@/lib/locale/client";
import { TimezoneProvider } from "@/lib/timezone/client/context";
import { TRPCProvider } from "@/trpc/client/provider";
import { getForegroundColor } from "@/utils/color";
@@ -107,7 +106,6 @@ export default async function Root({
<PostHogPageView />
<TooltipProvider>
<UserProvider user={user ?? undefined}>
- <LocaleSync userLocale={user?.locale ?? locale} />
<PreferencesProvider
initialValue={{
timeFormat: user?.timeFormat,
diff --git a/apps/web/src/components/user-provider.tsx b/apps/web/src/components/user-provider.tsx
index 795cf49e3..5982e3fa5 100644
--- a/apps/web/src/components/user-provider.tsx
+++ b/apps/web/src/components/user-provider.tsx
@@ -6,6 +6,7 @@ import type { UserAbility } from "@/features/user/ability";
import { defineAbilityFor } from "@/features/user/ability";
import type { UserDTO } from "@/features/user/schema";
import { authClient } from "@/lib/auth-client";
+import { LocaleSync } from "@/lib/locale/client";
import { isOwner } from "@/utils/permissions";
import { useRequiredContext } from "./use-required-context";
@@ -65,5 +66,10 @@ export const UserProvider = ({
},
};
}, [user, router]);
- return <UserContext.Provider value={value}>{children}</UserContext.Provider>;
+ return (
+ <UserContext.Provider value={value}>
+ <LocaleSync userLocale={user?.locale} />
+ {children}
+ </UserContext.Provider>
+ );
};
diff --git a/apps/web/src/lib/locale/client.tsx b/apps/web/src/lib/locale/client.tsx
index c7dcffd8f..ed90a4dc9 100644
--- a/apps/web/src/lib/locale/client.tsx
+++ b/apps/web/src/lib/locale/client.tsx
@@ -6,14 +6,14 @@ import React from "react";
import { useTranslation } from "@/i18n/client";
import { LOCALE_COOKIE_NAME } from "@/lib/locale/constants";
-export function LocaleSync({ userLocale }: { userLocale: string }) {
- const { locale } = useParams();
+export function LocaleSync({ userLocale }: { userLocale?: string }) {
+ const { locale } = useLocale();
const router = useRouter();
const { t } = useTranslation();
React.useEffect(() => {
// update the cookie with the user locale if it's different from the current locale
- if (locale !== userLocale) {
+ if (userLocale && locale !== userLocale) {
setLocaleCookie(userLocale);
toast.info(
t("localeSyncToast", {
@@ -37,3 +37,16 @@ export function LocaleSync({ userLocale }: { userLocale: string }) {
export function setLocaleCookie(locale: string) {
Cookies.set(LOCALE_COOKIE_NAME, locale, { path: "/" });
}
+
+export function useLocale() {
+ const { locale } = useParams();
+ const router = useRouter();
+
+ return {
+ locale: locale as string,
+ changeLocale: (locale: string) => {
+ setLocaleCookie(locale);
+ router.refresh();
+ },
+ };
+}