A full-featured CRM built with React, shadcn/ui, and Supabase.
feat(i18n): support en/fr locale switching in user menus
Anibal Svarcas9734921165e2
diff --git a/src/components/atomic-crm/layout/Header.tsx b/src/components/atomic-crm/layout/Header.tsxindex 146e159b..e76b1f11 100644--- a/src/components/atomic-crm/layout/Header.tsx+++ b/src/components/atomic-crm/layout/Header.tsx@@ -1,10 +1,19 @@-import { Import, Settings, User, Users } from "lucide-react";-import { CanAccess, useUserMenu } from "ra-core";+import { Check, Import, Settings, User, Users } from "lucide-react";+import {+ CanAccess,+ useLocaleState,+ useLocales,+ useTranslate,+ useUserMenu,+} from "ra-core";import { Link, matchPath, useLocation } from "react-router";import { RefreshButton } from "@/components/admin/refresh-button";import { ThemeModeToggle } from "@/components/admin/theme-mode-toggle";import { UserMenu } from "@/components/admin/user-menu";-import { DropdownMenuItem } from "@/components/ui/dropdown-menu";+import {+ DropdownMenuItem,+ DropdownMenuLabel,+} from "@/components/ui/dropdown-menu";import { useConfigurationContext } from "../root/ConfigurationContext";import { ImportPage } from "../misc/ImportPage";@@ -77,6 +86,7 @@ const Header = () => {<RefreshButton /><UserMenu><ProfileMenu />+ <LanguageMenu /><CanAccess resource="sales" action="list"><UsersMenu /></CanAccess>@@ -116,6 +126,7 @@ const NavigationTab = ({);const UsersMenu = () => {+ const translate = useTranslate();const userMenuContext = useUserMenu();if (!userMenuContext) {throw new Error("<UsersMenu> must be used inside <UserMenu?");@@ -123,13 +134,15 @@ const UsersMenu = () => {return (<DropdownMenuItem asChild onClick={userMenuContext.onClose}><Link to="/sales" className="flex items-center gap-2">- <Users /> Users+ <Users />+ {translate("resources.sales.name", { smart_count: 2, _: "Users" })}</Link></DropdownMenuItem>);};const ProfileMenu = () => {+ const translate = useTranslate();const userMenuContext = useUserMenu();if (!userMenuContext) {throw new Error("<ProfileMenu> must be used inside <UserMenu?");@@ -138,13 +151,48 @@ const ProfileMenu = () => {<DropdownMenuItem asChild onClick={userMenuContext.onClose}><Link to="/profile" className="flex items-center gap-2"><User />- Profile+ {translate("crm.profile.title", { _: "Profile" })}</Link></DropdownMenuItem>);};+const LanguageMenu = () => {+ const translate = useTranslate();+ const languages = useLocales();+ const [locale, setLocale] = useLocaleState();+ const userMenuContext = useUserMenu();+ if (!userMenuContext) {+ throw new Error("<LanguageMenu> must be used inside <UserMenu>");+ }+ if (languages.length <= 1) {+ return null;+ }+ const changeLocale = (nextLocale: string) => () => {+ setLocale(nextLocale);+ userMenuContext.onClose();+ };++ return (+ <>+ <DropdownMenuLabel>+ {translate("crm.language", { _: "Language" })}+ </DropdownMenuLabel>+ {languages.map((language) => (+ <DropdownMenuItem+ key={language.locale}+ onSelect={changeLocale(language.locale)}+ >+ {language.name}+ {locale === language.locale ? <Check className="ml-auto" /> : null}+ </DropdownMenuItem>+ ))}+ </>+ );+};+const SettingsMenu = () => {+ const translate = useTranslate();const userMenuContext = useUserMenu();if (!userMenuContext) {throw new Error("<SettingsMenu> must be used inside <UserMenu>");@@ -152,13 +200,15 @@ const SettingsMenu = () => {return (<DropdownMenuItem asChild onClick={userMenuContext.onClose}><Link to="/settings" className="flex items-center gap-2">- <Settings /> Settings+ <Settings />+ {translate("crm.settings.title", { _: "Settings" })}</Link></DropdownMenuItem>);};const ImportFromJsonMenuItem = () => {+ const translate = useTranslate();const userMenuContext = useUserMenu();if (!userMenuContext) {throw new Error("<ImportFromJsonMenuItem> must be used inside <UserMenu>");@@ -166,7 +216,8 @@ const ImportFromJsonMenuItem = () => {return (<DropdownMenuItem asChild onClick={userMenuContext.onClose}><Link to={ImportPage.path} className="flex items-center gap-2">- <Import /> Import data+ <Import />+ {translate("crm.header.import_data", { _: "Import data" })}</Link></DropdownMenuItem>);diff --git a/src/components/atomic-crm/layout/MobileNavigation.tsx b/src/components/atomic-crm/layout/MobileNavigation.tsxindex ac558e94..71b59a4b 100644--- a/src/components/atomic-crm/layout/MobileNavigation.tsx+++ b/src/components/atomic-crm/layout/MobileNavigation.tsx@@ -11,6 +11,7 @@ import {import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";import { cn } from "@/lib/utils";import {+ Check,Home,ListTodo,LogOut,@@ -21,7 +22,15 @@ import {Sun,Users,} from "lucide-react";-import { Translate, useAuthProvider, useGetIdentity, useLogout } from "ra-core";+import {+ Translate,+ useAuthProvider,+ useGetIdentity,+ useLocaleState,+ useLocales,+ useLogout,+ useTranslate,+} from "ra-core";import { Link, matchPath, useLocation, useMatch } from "react-router";import { ContactCreateSheet } from "../contacts/ContactCreateSheet";import { useState } from "react";@@ -184,6 +193,9 @@ const CreateButton = () => {};const SettingsButton = () => {+ const translate = useTranslate();+ const languages = useLocales();+ const [locale, setLocale] = useLocaleState();const authProvider = useAuthProvider();const { data: identity } = useGetIdentity();const logout = useLogout();@@ -196,7 +208,9 @@ const SettingsButton = () => {className="flex-col gap-1 h-auto py-2 px-1 rounded-md w-16 text-muted-foreground"><Settings className="size-6" />- <span className="text-[0.6rem] font-medium">Settings</span>+ <span className="text-[0.6rem] font-medium">+ {translate("crm.settings.title", { _: "Settings" })}+ </span></Button></DropdownMenuTrigger><DropdownMenuContent>@@ -209,6 +223,26 @@ const SettingsButton = () => {</DropdownMenuLabel><DropdownMenuSeparator /><ThemeMenu />+ {languages.length > 1 && (+ <>+ <DropdownMenuSeparator />+ <DropdownMenuLabel className="text-xs text-muted-foreground uppercase">+ {translate("crm.language", { _: "Language" })}+ </DropdownMenuLabel>+ {languages.map((language) => (+ <DropdownMenuItem+ key={language.locale}+ className="h-12 px-4 text-base"+ onSelect={() => setLocale(language.locale)}+ >+ {language.name}+ {locale === language.locale ? (+ <Check className="ml-auto" />+ ) : null}+ </DropdownMenuItem>+ ))}+ </>+ )}<DropdownMenuSeparator /><DropdownMenuItemonClick={() => logout()}diff --git a/src/components/atomic-crm/root/i18nProvider.test.ts b/src/components/atomic-crm/root/i18nProvider.test.tsnew file mode 100644index 00000000..42bb0235--- /dev/null+++ b/src/components/atomic-crm/root/i18nProvider.test.ts@@ -0,0 +1,35 @@+import { describe, expect, it } from "vitest";+import { i18nProvider } from "./i18nProvider";++describe("i18nProvider", () => {+ it("registers en and fr locales", () => {+ expect(i18nProvider.getLocales?.()).toEqual([+ { locale: "en", name: "English" },+ { locale: "fr", name: "Français" },+ ]);+ });++ it("translates the language key in french", async () => {+ await i18nProvider.changeLocale("fr");++ expect(i18nProvider.translate("crm.language")).toBe("Langue");+ });++ it("falls back to english for unknown locales", async () => {+ await i18nProvider.changeLocale("es");++ expect(i18nProvider.translate("crm.language")).toBe("Language");+ });++ it("uses customized password reset overrides for en and fr", async () => {+ await i18nProvider.changeLocale("en");+ expect(i18nProvider.translate("ra-supabase.auth.password_reset")).toBe(+ "Check your emails for a Reset Password message.",+ );++ await i18nProvider.changeLocale("fr");+ expect(i18nProvider.translate("ra-supabase.auth.password_reset")).toBe(+ "Consultez vos emails pour trouver le message de reinitialisation du mot de passe.",+ );+ });+});diff --git a/src/components/atomic-crm/root/i18nProvider.tsx b/src/components/atomic-crm/root/i18nProvider.tsxindex 7e1fe3c1..cc483c8c 100644--- a/src/components/atomic-crm/root/i18nProvider.tsx+++ b/src/components/atomic-crm/root/i18nProvider.tsx@@ -1,7 +1,9 @@import { mergeTranslations } from "ra-core";import polyglotI18nProvider from "ra-i18n-polyglot";import englishMessages from "ra-language-english";+import frenchMessages from "ra-language-french";import { raSupabaseEnglishMessages } from "ra-supabase-language-english";+import { raSupabaseFrenchMessages } from "ra-supabase-language-french";const raSupabaseEnglishMessagesOverride = {"ra-supabase": {@@ -11,15 +13,53 @@ const raSupabaseEnglishMessagesOverride = {},};+const raSupabaseFrenchMessagesOverride = {+ "ra-supabase": {+ auth: {+ password_reset:+ "Consultez vos emails pour trouver le message de reinitialisation du mot de passe.",+ },+ },+};++const englishCrmMessages = {+ crm: {+ language: "Language",+ },+};++const frenchCrmMessages = {+ crm: {+ language: "Langue",+ },+};++const englishCatalog = mergeTranslations(+ englishMessages,+ raSupabaseEnglishMessages,+ raSupabaseEnglishMessagesOverride,+ englishCrmMessages,+);++const frenchCatalog = mergeTranslations(+ englishCatalog,+ frenchMessages,+ raSupabaseFrenchMessages,+ raSupabaseFrenchMessagesOverride,+ frenchCrmMessages,+);+export const i18nProvider = polyglotI18nProvider(- () => {- return mergeTranslations(- englishMessages,- raSupabaseEnglishMessages,- raSupabaseEnglishMessagesOverride,- );+ (locale) => {+ if (locale === "fr") {+ return frenchCatalog;+ }+ return englishCatalog;},"en",- [{ locale: "en", name: "English" }],+ [+ { locale: "en", name: "English" },+ { locale: "fr", name: "Français" },+ ],{ allowMissing: true },);