Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

fix(academy): give @carbon/react's phone sheets a Lingui provider (#1960)

Naveen Kashyapf64d952467c4
diff --git a/apps/academy/app/root.tsx b/apps/academy/app/root.tsx
index ae397d73e8..7af05dc8ef 100644
--- a/apps/academy/app/root.tsx
+++ b/apps/academy/app/root.tsx
@@ -14,6 +14,7 @@ import { formBodyMiddleware } from "@carbon/auth/middleware/form-body.server";
import { maintenanceMiddleware } from "@carbon/auth/middleware/maintenance.server";
import { securityMiddleware } from "@carbon/auth/middleware/security.server";
import { getOrRefreshAuthSession } from "@carbon/auth/session.server";
+import { LocaleProvider } from "@carbon/locale";
import { requestIdMiddleware } from "@carbon/logger/middleware.server";
import {
OperatingSystemContextProvider,
@@ -22,6 +23,7 @@ import {
} from "@carbon/react";
import { getPreferenceHeaders } from "@carbon/utils";
import { faviconLinks } from "@carbon/utils/favicon";
+import type { Messages } from "@lingui/core";
import { I18nProvider } from "@react-aria/i18n";
import { Analytics } from "@vercel/analytics/react";
import type React from "react";
@@ -48,6 +50,18 @@ import { CourseSidebarNav } from "./components/CourseSidebar";
import { SiteHeader } from "./components/SiteHeader";
import { path } from "./utils/path";
+// Academy is English-only, but the `@carbon/react` parts it renders translate
+// their own labels with Lingui (a phone Popover becomes a BottomSheet that
+// calls `useLingui`), and a production build strips the source text from each
+// message, so they need a catalog. The MES catalog holds every
+// `@carbon/react` string at a fraction of the ERP catalog's size.
+const { messages: catalog } = Object.values(
+ import.meta.glob<{ messages: Messages }>(
+ "../../../packages/locale/locales/en/mes.po",
+ { eager: true }
+ )
+)[0];
+
export const middleware = [
requestIdMiddleware,
securityMiddleware,
@@ -179,22 +193,24 @@ export default function App() {
return (
<OperatingSystemContextProvider platform={prefs.platform}>
- <I18nProvider locale={prefs.locale}>
- <Document>
- <SiteHeader mobileNav={<CourseSidebarNav />} />
- <div className="pt-16 min-h-screen bg-background">
- <Outlet />
- </div>
- <script
- // Server render only: on the client the nonce is undefined (and browsers hide it).
- nonce={nonce}
- suppressHydrationWarning
- dangerouslySetInnerHTML={{
- __html: `window.env = ${JSON.stringify(env)}`
- }}
- />
- </Document>
- </I18nProvider>
+ <LocaleProvider locale="en" catalog={catalog}>
+ <I18nProvider locale={prefs.locale}>
+ <Document>
+ <SiteHeader mobileNav={<CourseSidebarNav />} />
+ <div className="pt-16 min-h-screen bg-background">
+ <Outlet />
+ </div>
+ <script
+ // Server render only: on the client the nonce is undefined (and browsers hide it).
+ nonce={nonce}
+ suppressHydrationWarning
+ dangerouslySetInnerHTML={{
+ __html: `window.env = ${JSON.stringify(env)}`
+ }}
+ />
+ </Document>
+ </I18nProvider>
+ </LocaleProvider>
</OperatingSystemContextProvider>
);
}
diff --git a/apps/academy/package.json b/apps/academy/package.json
index fda60d991d..99ce388942 100644
--- a/apps/academy/package.json
+++ b/apps/academy/package.json
@@ -8,9 +8,11 @@
"@carbon/form": "workspace:*",
"@carbon/content": "workspace:*",
"@carbon/kv": "workspace:*",
+ "@carbon/locale": "workspace:*",
"@carbon/logger": "workspace:*",
"@carbon/react": "workspace:*",
"@carbon/utils": "workspace:*",
+ "@lingui/core": "catalog:",
"@react-aria/i18n": "catalog:",
"@react-router/dev": "catalog:",
"@react-router/remix-routes-option-adapter": "catalog:",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 504b7e2d01..6244c8ced8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -536,6 +536,9 @@ importers:
'@carbon/kv':
specifier: workspace:*
version: link:../../packages/kv
+ '@carbon/locale':
+ specifier: workspace:*
+ version: link:../../packages/locale
'@carbon/logger':
specifier: workspace:*
version: link:../../packages/logger
@@ -545,6 +548,9 @@ importers:
'@carbon/utils':
specifier: workspace:*
version: link:../../packages/utils
+ '@lingui/core':
+ specifier: 'catalog:'
+ version: 6.9.0(@babel/[email protected])([email protected])
'@react-aria/i18n':
specifier: 'catalog:'