diff --git a/apps/remix/app/components/tables/admin-organisations-table.tsx b/apps/remix/app/components/tables/admin-organisations-table.tsx index 1da49067d..144fb20b8 100644 --- a/apps/remix/app/components/tables/admin-organisations-table.tsx +++ b/apps/remix/app/components/tables/admin-organisations-table.tsx @@ -140,7 +140,7 @@ export const AdminOrganisationsTable = ({ target="_blank" className="flex flex-row items-center gap-2" > - {SUBSCRIPTION_STATUS_MAP[row.original.subscription.status]} + {i18n._(SUBSCRIPTION_STATUS_MAP[row.original.subscription.status])} ) : ( @@ -203,7 +203,7 @@ export const AdminOrganisationsTable = ({ ), }, ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[]; - }, []); + }, [i18n, t, memberUserId, showOwnerColumn]); return (
diff --git a/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx index c0f6e8ea7..9e9dfaeea 100644 --- a/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx +++ b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx @@ -56,7 +56,7 @@ export default function OrganisationGroupSettingsPage({ }: Route.ComponentProps) { const { licenseFlags } = loaderData; - const { t } = useLingui(); + const { t, i18n } = useLingui(); const { toast } = useToast(); const navigate = useNavigate(); @@ -98,7 +98,7 @@ export default function OrganisationGroupSettingsPage({ accessorKey: 'url', }, ] satisfies DataTableColumnDef[]; - }, []); + }, [t]); const organisationMembersColumns = useMemo(() => { return [ @@ -143,7 +143,7 @@ export default function OrganisationGroupSettingsPage({ }, }, ] satisfies DataTableColumnDef[]; - }, [organisation]); + }, [organisation, t]); if (isLoadingOrganisation) { return ( @@ -209,7 +209,8 @@ export default function OrganisationGroupSettingsPage({ {organisation.subscription ? ( - {SUBSCRIPTION_STATUS_MAP[organisation.subscription.status]} subscription found + {i18n._(SUBSCRIPTION_STATUS_MAP[organisation.subscription.status])} subscription + found ) : ( diff --git a/packages/lib/constants/billing.ts b/packages/lib/constants/billing.ts index 48c16802d..b275cadf7 100644 --- a/packages/lib/constants/billing.ts +++ b/packages/lib/constants/billing.ts @@ -1,3 +1,4 @@ +import { msg } from '@lingui/core/macro'; import { SubscriptionStatus } from '@prisma/client'; export enum STRIPE_PLAN_TYPE { @@ -12,7 +13,16 @@ export enum STRIPE_PLAN_TYPE { export const FREE_TIER_DOCUMENT_QUOTA = 5; export const SUBSCRIPTION_STATUS_MAP = { - [SubscriptionStatus.ACTIVE]: 'Active', - [SubscriptionStatus.INACTIVE]: 'Inactive', - [SubscriptionStatus.PAST_DUE]: 'Past Due', + [SubscriptionStatus.ACTIVE]: msg({ + message: 'Active', + context: 'Subscription status', + }), + [SubscriptionStatus.INACTIVE]: msg({ + message: 'Inactive', + context: 'Subscription status', + }), + [SubscriptionStatus.PAST_DUE]: msg({ + message: 'Past Due', + context: 'Subscription status', + }), };