Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

Move language switcher to profile page

Anibal Svarcasd416941b871b
diff --git a/doc/src/content/docs/developers/customizing.mdx b/doc/src/content/docs/developers/customizing.mdx
index 2ac6091a..fcdd9d72 100644
--- a/doc/src/content/docs/developers/customizing.mdx
+++ b/doc/src/content/docs/developers/customizing.mdx
@@ -89,7 +89,7 @@ The `i18nProvider` defines:
- the list of available locales (`availableLocales`)
- how messages are resolved for each locale
-The language switcher appears in the user menu (desktop and mobile) when more than one locale is configured.
+The language switcher appears in the Profile page when more than one locale is configured.
### Configure Active Languages
@@ -105,7 +105,7 @@ Edit `src/components/atomic-crm/root/i18nProvider.tsx` and update:
2. Merge it with existing base messages in `i18nProvider.tsx`.
3. Register the locale in `availableLocales`.
4. Add app-specific keys (for example in a `crm.*` namespace) when needed.
-5. Start the app, switch locale from the user menu, and verify fallback behavior.
+5. Start the app, switch locale from the Profile page, and verify fallback behavior.
### Type-Check Message Catalogs
diff --git a/src/components/atomic-crm/layout/Header.tsx b/src/components/atomic-crm/layout/Header.tsx
index 28589864..3b4a792f 100644
--- a/src/components/atomic-crm/layout/Header.tsx
+++ b/src/components/atomic-crm/layout/Header.tsx
@@ -1,19 +1,10 @@
-import { Check, Import, Settings, User, Users } from "lucide-react";
-import {
- CanAccess,
- useLocaleState,
- useLocales,
- useTranslate,
- useUserMenu,
-} from "ra-core";
+import { Import, Settings, User, Users } from "lucide-react";
+import { CanAccess, 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,
- DropdownMenuLabel,
-} from "@/components/ui/dropdown-menu";
+import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
import { useConfigurationContext } from "../root/ConfigurationContext";
import { ImportPage } from "../misc/ImportPage";
@@ -96,7 +87,6 @@ const Header = () => {
<RefreshButton />
<UserMenu>
<ProfileMenu />
- <LanguageMenu />
<CanAccess resource="sales" action="list">
<UsersMenu />
</CanAccess>
@@ -167,41 +157,6 @@ const ProfileMenu = () => {
);
};
-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}
- className="cursor-pointer"
- onSelect={changeLocale(language.locale)}
- >
- {language.name}
- {locale === language.locale ? <Check className="ml-auto" /> : null}
- </DropdownMenuItem>
- ))}
- </>
- );
-};
-
const SettingsMenu = () => {
const translate = useTranslate();
const userMenuContext = useUserMenu();
diff --git a/src/components/atomic-crm/layout/MobileNavigation.tsx b/src/components/atomic-crm/layout/MobileNavigation.tsx
index f29965aa..4eade5df 100644
--- a/src/components/atomic-crm/layout/MobileNavigation.tsx
+++ b/src/components/atomic-crm/layout/MobileNavigation.tsx
@@ -11,7 +11,6 @@ import {
import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
import { cn } from "@/lib/utils";
import {
- Check,
Home,
ListTodo,
LogOut,
@@ -20,14 +19,13 @@ import {
Settings,
Smartphone,
Sun,
+ User,
Users,
} from "lucide-react";
import {
Translate,
useAuthProvider,
useGetIdentity,
- useLocaleState,
- useLocales,
useLogout,
useTranslate,
} from "ra-core";
@@ -202,8 +200,6 @@ const CreateButton = () => {
const SettingsButton = () => {
const translate = useTranslate();
- const languages = useLocales();
- const [locale, setLocale] = useLocaleState();
const authProvider = useAuthProvider();
const { data: identity } = useGetIdentity();
const logout = useLogout();
@@ -230,27 +226,17 @@ const SettingsButton = () => {
</div>
</DropdownMenuLabel>
<DropdownMenuSeparator />
+ <DropdownMenuItem
+ asChild
+ className="cursor-pointer h-12 px-4 text-base"
+ >
+ <Link to="/profile" className="flex items-center gap-2">
+ <User />
+ {translate("crm.profile.title", { _: "Profile" })}
+ </Link>
+ </DropdownMenuItem>
+ <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="cursor-pointer h-12 px-4 text-base"
- onSelect={() => setLocale(language.locale)}
- >
- {language.name}
- {locale === language.locale ? (
- <Check className="ml-auto" />
- ) : null}
- </DropdownMenuItem>
- ))}
- </>
- )}
<DropdownMenuSeparator />
<DropdownMenuItem
onClick={() => logout()}
diff --git a/src/components/atomic-crm/settings/ProfilePage.tsx b/src/components/atomic-crm/settings/ProfilePage.tsx
index 6379074a..540aed94 100644
--- a/src/components/atomic-crm/settings/ProfilePage.tsx
+++ b/src/components/atomic-crm/settings/ProfilePage.tsx
@@ -5,6 +5,8 @@ import {
useDataProvider,
useGetIdentity,
useGetOne,
+ useLocaleState,
+ useLocales,
useNotify,
useRecordContext,
useTranslate,
@@ -182,6 +184,7 @@ const ProfileForm = ({
<TextRender source="first_name" isEditMode={isEditMode} />
<TextRender source="last_name" isEditMode={isEditMode} />
<TextRender source="email" isEditMode={isEditMode} />
+ <LanguageSelector />
</div>
<div className="flex flex-row justify-end gap-2">
@@ -245,6 +248,36 @@ const ProfileForm = ({
);
};
+const LanguageSelector = () => {
+ const translate = useTranslate();
+ const locales = useLocales();
+ const [locale, setLocale] = useLocaleState();
+
+ if (locales.length <= 1) {
+ return null;
+ }
+
+ return (
+ <div className="space-y-2">
+ <p className="text-sm font-medium text-muted-foreground">
+ {translate("crm.language", { _: "Language" })}
+ </p>
+ <div className="flex flex-wrap gap-2">
+ {locales.map((language) => (
+ <Button
+ key={language.locale}
+ type="button"
+ variant={locale === language.locale ? "default" : "outline"}
+ onClick={() => setLocale(language.locale)}
+ >
+ {language.name}
+ </Button>
+ ))}
+ </div>
+ </div>
+ );
+};
+
const TextRender = ({
source,
isEditMode,