Skip to content

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

Misc changes

fzaninottoa05e9e4acaa0
diff --git a/doc/src/content/docs/developers/customizing.mdx b/doc/src/content/docs/developers/customizing.mdx
index 88f43cb3..2d059155 100644
--- a/doc/src/content/docs/developers/customizing.mdx
+++ b/doc/src/content/docs/developers/customizing.mdx
@@ -76,7 +76,7 @@ export default App;
## Languages (i18n)
-Atomic CRM language configuration is managed in `src/components/atomic-crm/root/i18nProvider.tsx`.
+Atomic CRM language configuration is managed in `src/components/atomic-crm/providers/i18nProvider.tsx`.
By default, this repository ships with two locales:
@@ -91,23 +91,14 @@ The `i18nProvider` defines:
The language switcher appears in the Profile page when more than one locale is configured.
-### Configure Active Languages
+### Adding a New Language
-Edit `src/components/atomic-crm/root/i18nProvider.tsx` and update:
-
-- the `getInitialLocale` resolver if you want custom startup behavior
-- the `availableLocales` array
-- the locale resolver function (`locale => ...`)
-
-### Add A New Language
-
-1. Add or create the message catalog for the new locale.
-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.
+1. Add or create the message catalog for the new locale. Use the English messages catalog as a base.
+2. Merge it with base messages (Shadcn Admin Kit comes with [35 languages integrations](https://marmelab.com/ra-core/translationlocales/))
+2. Edit `src/components/atomic-crm/providers/i18nProvider.tsx` and add the locale to `availableLocales`.
5. Start the app, switch locale from the Profile page, and verify fallback behavior.
-### Type-Check Message Catalogs
+### Type-Checking Message Catalogs
For in-repo locales (like `fr`), use strict typing so missing keys fail at compile time:
diff --git a/src/components/admin/list.tsx b/src/components/admin/list.tsx
index f4f452b7..4e4035c9 100644
--- a/src/components/admin/list.tsx
+++ b/src/components/admin/list.tsx
@@ -174,16 +174,27 @@ export const Empty = () => {
if (!resource) {
return null;
}
- const resourceLabel = getResourceLabel(resource, 2);
+ const resourceName = translate(`resources.${resource}.forcedCaseName`, {
+ smart_count: 0,
+ _: resource ? getResourceLabel(resource, 0) : undefined,
+ });
+ const emptyMessage = translate("ra.page.empty", { name: resourceName });
+ const inviteMessage = translate("ra.page.invite");
return (
<div className="flex min-h-[50vh] flex-col items-center justify-center gap-2 text-center">
<h2 className="text-2xl font-semibold">
- {translate("ra.page.empty", { name: resourceLabel })}
+ {translate(`resources.${resource}.empty`, {
+ _: emptyMessage,
+ })}
</h2>
{hasCreate ? (
<>
- <p className="text-muted-foreground">{translate("ra.page.invite")}</p>
+ <p className="text-muted-foreground">
+ {translate(`resources.${resource}.invite`, {
+ _: inviteMessage,
+ })}
+ </p>
<CreateButton />
</>
) : null}
diff --git a/src/components/admin/sort-button.tsx b/src/components/admin/sort-button.tsx
index 3b0ea2d3..55000e03 100644
--- a/src/components/admin/sort-button.tsx
+++ b/src/components/admin/sort-button.tsx
@@ -62,35 +62,6 @@ const SortButtonComponent = (props: SortButtonProps) => {
const isMobile = useIsMobile();
const [open, setOpen] = React.useState(false);
- const getFieldLabel = React.useCallback(
- (field: string) => {
- if (resource) {
- const resourceCandidates = [resource];
- if (resource.endsWith("_summary")) {
- resourceCandidates.push(resource.replace(/_summary$/, ""));
- }
-
- for (const resourceName of resourceCandidates) {
- const fieldLabel = translate(`crm.${resourceName}.fields.${field}`, {
- _: "",
- });
- if (fieldLabel) return fieldLabel;
-
- const inputLabel = translate(`crm.${resourceName}.inputs.${field}`, {
- _: "",
- });
- if (inputLabel) return inputLabel;
- }
- }
-
- return translateLabel({
- resource,
- source: field,
- });
- },
- [resource, translate, translateLabel],
- );
-
const handleChangeSort = (field: string) => {
setSort({
field,
@@ -99,7 +70,10 @@ const SortButtonComponent = (props: SortButtonProps) => {
setOpen(false);
};
- const fieldLabel = getFieldLabel(sort.field);
+ const fieldLabel = translateLabel({
+ resource,
+ source: sort.field,
+ });
const buttonLabel = translate(label, {
field: fieldLabel,
field_lower_first:
@@ -144,7 +118,10 @@ const SortButtonComponent = (props: SortButtonProps) => {
<DropdownMenuContent align="start">
{fields.map((field) => (
<DropdownMenuItem key={field} onClick={() => handleChangeSort(field)}>
- {getFieldLabel(field)}{" "}
+ {translateLabel({
+ resource,
+ source: field,
+ })}{" "}
{translate(
`ra.sort.${
sort.field === field ? inverseOrder(sort.order) : "ASC"
diff --git a/src/components/admin/theme-mode-toggle.tsx b/src/components/admin/theme-mode-toggle.tsx
index 4e7edf47..d24e207b 100644
--- a/src/components/admin/theme-mode-toggle.tsx
+++ b/src/components/admin/theme-mode-toggle.tsx
@@ -28,22 +28,20 @@ export function ThemeModeToggle() {
<Button variant="ghost" size="icon" className="hidden sm:inline-flex">
<Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
<Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
- <span className="sr-only">
- {translate("crm.theme.toggle", { _: "Toggle theme" })}
- </span>
+ <span className="sr-only">{translate("ra.action.toggle_theme")}</span>
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem onClick={() => setTheme("light")}>
- {translate("crm.theme.light_short", { _: "Light" })}
+ {translate("crm.theme.light", { _: "Light" })}
<Check className={cn("ml-auto", theme !== "light" && "hidden")} />
</DropdownMenuItem>
<DropdownMenuItem onClick={() => setTheme("dark")}>
- {translate("crm.theme.dark_short", { _: "Dark" })}
+ {translate("crm.theme.dark", { _: "Dark" })}
<Check className={cn("ml-auto", theme !== "dark" && "hidden")} />
</DropdownMenuItem>
<DropdownMenuItem onClick={() => setTheme("system")}>
- {translate("crm.theme.system_short", { _: "System" })}
+ {translate("crm.theme.system", { _: "System" })}
<Check className={cn("ml-auto", theme !== "system" && "hidden")} />
</DropdownMenuItem>
</DropdownMenuContent>
diff --git a/src/components/admin/wrapper-field.tsx b/src/components/admin/wrapper-field.tsx
deleted file mode 100644
index c493485e..00000000
--- a/src/components/admin/wrapper-field.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { InputProps } from "ra-core";
-import { ReactNode } from "react";
-
-export const WrapperField = ({
- children,
-}: InputProps & { children: ReactNode }) => children;
diff --git a/src/components/atomic-crm/activity/ActivityLog.tsx b/src/components/atomic-crm/activity/ActivityLog.tsx
index 0fcb2bfe..b6538d30 100644
--- a/src/components/atomic-crm/activity/ActivityLog.tsx
+++ b/src/components/atomic-crm/activity/ActivityLog.tsx
@@ -2,7 +2,8 @@ import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator";
import { Skeleton } from "@/components/ui/skeleton";
import { useQuery } from "@tanstack/react-query";
-import { type Identifier, useDataProvider, useTranslate } from "ra-core";
+import type { Identifier } from "ra-core";
+import { useDataProvider, useTranslate } from "ra-core";
import { RotateCcw } from "lucide-react";
import type { CrmDataProvider } from "../providers/types";
diff --git a/src/components/atomic-crm/deals/DealList.tsx b/src/components/atomic-crm/deals/DealList.tsx
index 4db09e5f..9012884b 100644
--- a/src/components/atomic-crm/deals/DealList.tsx
+++ b/src/components/atomic-crm/deals/DealList.tsx
@@ -1,3 +1,5 @@
+import type { ReactNode } from "react";
+import type { InputProps } from "ra-core";
import { useGetIdentity, useListContext, useTranslate } from "ra-core";
import { matchPath, useLocation } from "react-router";
import { AutocompleteInput } from "@/components/admin/autocomplete-input";
@@ -18,7 +20,6 @@ import { DealEmpty } from "./DealEmpty";
import { DealListContent } from "./DealListContent";
import { DealShow } from "./DealShow";
import { OnlyMineInput } from "./OnlyMineInput";
-import { WrapperField } from "@/components/admin/wrapper-field";
const DealList = () => {
const { identity } = useGetIdentity();
@@ -102,4 +103,12 @@ const DealActions = () => (
</TopToolbar>
);
+/**
+ *
+ * Used so that label of filters can be inferred for the select display,
+ * but not be displayed when showing the input.
+ */
+const WrapperField = ({ children }: InputProps & { children: ReactNode }) =>
+ children;
+
export default DealList;
diff --git a/src/components/atomic-crm/layout/MobileNavigation.tsx b/src/components/atomic-crm/layout/MobileNavigation.tsx
index d683705b..5e8bd603 100644
--- a/src/components/atomic-crm/layout/MobileNavigation.tsx
+++ b/src/components/atomic-crm/layout/MobileNavigation.tsx
@@ -307,7 +307,7 @@ const ThemeMenu = () => {
className="px-3"
>
<Smartphone className="size-5 mx-2" />
- <span className="sr-only">{translate("crm.theme.system_short")}</span>
+ <span className="sr-only">{translate("crm.theme.system")}</span>
</ToggleGroupItem>
<ToggleGroupItem
value="light"
@@ -315,7 +315,7 @@ const ThemeMenu = () => {
className="px-3"
>
<Sun className="size-5 mx-2" />
- <span className="sr-only">{translate("crm.theme.light_short")}</span>
+ <span className="sr-only">{translate("crm.theme.light")}</span>
</ToggleGroupItem>
<ToggleGroupItem
value="dark"
@@ -323,7 +323,7 @@ const ThemeMenu = () => {
className="px-3"
>
<Moon className="size-5 mx-2" />
- <span className="sr-only">{translate("crm.theme.dark_short")}</span>
+ <span className="sr-only">{translate("crm.theme.dark")}</span>
</ToggleGroupItem>
</ToggleGroup>
</div>
diff --git a/src/components/atomic-crm/providers/commons/englishCrmMessages.ts b/src/components/atomic-crm/providers/commons/englishCrmMessages.ts
index 4b45b3c2..790fbff5 100644
--- a/src/components/atomic-crm/providers/commons/englishCrmMessages.ts
+++ b/src/components/atomic-crm/providers/commons/englishCrmMessages.ts
@@ -474,13 +474,9 @@ export const englishCrmMessages = {
},
},
theme: {
- dark: "Dark theme",
- dark_short: "Dark",
- light: "Light theme",
- light_short: "Light",
- system: "System theme",
- system_short: "System",
- toggle: "Toggle theme",
+ dark: "Dark",
+ light: "Light",
+ system: "System",
},
language: "Language",
navigation: {
diff --git a/src/components/atomic-crm/providers/commons/frenchCrmMessages.ts b/src/components/atomic-crm/providers/commons/frenchCrmMessages.ts
index 2a783581..e527461f 100644
--- a/src/components/atomic-crm/providers/commons/frenchCrmMessages.ts
+++ b/src/components/atomic-crm/providers/commons/frenchCrmMessages.ts
@@ -480,13 +480,9 @@ export const frenchCrmMessages = {
},
},
theme: {
- dark: "Thème sombre",
- dark_short: "Sombre",
- light: "Thème clair",
- light_short: "Clair",
- system: "Thème système",
- system_short: "Système",
- toggle: "Changer de thème",
+ dark: "Sombre",
+ light: "Clair",
+ system: "Système",
},
language: "Langue",
navigation: {