From 348aadef5195263148942b174374a4750ca28987 Mon Sep 17 00:00:00 2001
From: Matt Kane <mkane@cloudflare.com>
Date: Thu, 7 May 2026 14:51:17 +0100
Subject: [PATCH 1/2] fix(admin): translate long-tail i18n leaks in admin UI

Wrap remaining user-facing English strings across settings panels, marketplace,
sandboxed-plugin host, auth flows (Signup, Login, Passkey, DeviceAuthorize,
SetupWizard), taxonomy/menu management, content editor remnants, and lib/api
module-level functions.

For lib/api fallback messages, uses the i18n._(msg``) pattern since module-level
code can't call useLingui(). MenuList item count uses plural() which fixed an
existing grammar bug (1 items -> 1 item; test regex updated).
---
 .changeset/public-women-behave.md             |  5 ++
 .../src/components/BlockKitFieldWidget.tsx    |  6 +-
 .../admin/src/components/ContentEditor.tsx    |  2 +-
 .../src/components/DeviceAuthorizePage.tsx    |  2 +-
 packages/admin/src/components/FieldEditor.tsx |  2 +-
 .../src/components/MarketplaceBrowse.tsx      | 15 ++---
 .../admin/src/components/MediaLibrary.tsx     |  8 +--
 .../admin/src/components/MediaPickerModal.tsx | 13 +++--
 packages/admin/src/components/MenuList.tsx    |  7 ++-
 packages/admin/src/components/Redirects.tsx   |  6 +-
 .../src/components/SandboxedPluginPage.tsx    |  8 ++-
 .../src/components/SandboxedPluginWidget.tsx  |  8 ++-
 .../admin/src/components/SectionEditor.tsx    |  2 +-
 packages/admin/src/components/Sections.tsx    | 18 +++---
 packages/admin/src/components/SetupWizard.tsx | 57 +++++++------------
 packages/admin/src/components/SignupPage.tsx  |  2 +-
 .../admin/src/components/TaxonomyManager.tsx  |  4 +-
 .../admin/src/components/TaxonomySidebar.tsx  | 13 +++--
 .../admin/src/components/WelcomeModal.tsx     |  6 +-
 .../admin/src/components/WordPressImport.tsx  | 24 ++++----
 .../src/components/auth/PasskeyLogin.tsx      |  6 +-
 .../components/auth/PasskeyRegistration.tsx   |  6 +-
 .../admin/src/components/editor/BlockMenu.tsx | 11 ++--
 .../components/editor/DragHandleWrapper.tsx   |  4 +-
 packages/admin/src/lib/api/api-tokens.ts      |  5 +-
 packages/admin/src/lib/api/bylines.ts         |  5 +-
 packages/admin/src/lib/api/client.ts          |  4 +-
 packages/admin/src/lib/api/comments.ts        |  5 +-
 packages/admin/src/lib/api/content.ts         | 21 ++++---
 packages/admin/src/lib/api/import.ts          |  5 +-
 packages/admin/src/lib/api/marketplace.ts     |  9 ++-
 packages/admin/src/lib/api/media.ts           |  9 ++-
 packages/admin/src/lib/api/menus.ts           |  7 ++-
 packages/admin/src/lib/api/plugins.ts         | 10 +++-
 packages/admin/src/lib/api/redirects.ts       |  5 +-
 packages/admin/src/lib/api/schema.ts          | 13 +++--
 packages/admin/src/lib/api/sections.ts        |  5 +-
 packages/admin/src/lib/api/taxonomies.ts      |  5 +-
 packages/admin/src/lib/api/users.ts           | 21 ++++---
 packages/admin/src/lib/api/widgets.ts         |  9 ++-
 .../admin/tests/components/MenuList.test.tsx  |  2 +-
 41 files changed, 225 insertions(+), 150 deletions(-)
 create mode 100644 .changeset/public-women-behave.md

diff --git a/.changeset/public-women-behave.md b/.changeset/public-women-behave.md
new file mode 100644
index 000000000..d8888928b
--- /dev/null
+++ b/.changeset/public-women-behave.md
@@ -0,0 +1,5 @@
+---
+"@emdash-cms/admin": patch
+---
+
+Fixes the long tail of untranslated English strings in the admin UI: settings panels, marketplace, sandboxed-plugin host, auth flows, taxonomy/menu management, and lib/api fallback messages. After this PR, EmDash admin UI is fully localizable across all known surfaces.
diff --git a/packages/admin/src/components/BlockKitFieldWidget.tsx b/packages/admin/src/components/BlockKitFieldWidget.tsx
index b869eafde..519312652 100644
--- a/packages/admin/src/components/BlockKitFieldWidget.tsx
+++ b/packages/admin/src/components/BlockKitFieldWidget.tsx
@@ -1,5 +1,6 @@
 import { Input, Switch } from "@cloudflare/kumo";
 import type { Element } from "@emdash-cms/blocks";
+import { useLingui } from "@lingui/react/macro";
 import * as React from "react";
 
 import { BlockKitMediaPickerField } from "./BlockKitMediaPickerField";
@@ -65,6 +66,7 @@ function BlockKitFieldElement({
 	value: unknown;
 	onChange: (actionId: string, value: unknown) => void;
 }) {
+	const { t } = useLingui();
 	switch (element.type) {
 		case "text_input":
 			return (
@@ -105,7 +107,7 @@ function BlockKitFieldElement({
 						value={typeof value === "string" ? value : ""}
 						onChange={(e) => onChange(element.action_id, e.target.value)}
 					>
-						<option value="">Select...</option>
+						<option value="">{t`Select...`}</option>
 						{options.map((opt) => (
 							<option key={opt.value} value={opt.value}>
 								{opt.label}
@@ -129,7 +131,7 @@ function BlockKitFieldElement({
 		default:
 			return (
 				<div className="text-sm text-kumo-subtle">
-					Unsupported widget element type: {(element as { type: string }).type}
+					{t`Unsupported widget element type: ${(element as { type: string }).type}`}
 				</div>
 			);
 	}
diff --git a/packages/admin/src/components/ContentEditor.tsx b/packages/admin/src/components/ContentEditor.tsx
index a730156ce..1e332479f 100644
--- a/packages/admin/src/components/ContentEditor.tsx
+++ b/packages/admin/src/components/ContentEditor.tsx
@@ -613,7 +613,7 @@ export function ContentEditor({
 						<div
 							className="flex items-center text-xs text-kumo-subtle"
 							role="status"
-							aria-label="Autosave status"
+							aria-label={t`Autosave status`}
 							aria-live="polite"
 						>
 							{isAutosaving ? (
diff --git a/packages/admin/src/components/DeviceAuthorizePage.tsx b/packages/admin/src/components/DeviceAuthorizePage.tsx
index 5485342b9..74f825aea 100644
--- a/packages/admin/src/components/DeviceAuthorizePage.tsx
+++ b/packages/admin/src/components/DeviceAuthorizePage.tsx
@@ -102,7 +102,7 @@ export function DeviceAuthorizePage() {
 				body: JSON.stringify({ user_code: trimmed, action: "approve" }),
 			});
 
-			const data = await parseApiResponse<{ authorized: boolean }>(res, "Authorization failed");
+			const data = await parseApiResponse<{ authorized: boolean }>(res, t`Authorization failed`);
 			setPageState(data.authorized ? "success" : "denied");
 		} catch (err) {
 			setErrorMessage(err instanceof Error ? err.message : "Network error");
diff --git a/packages/admin/src/components/FieldEditor.tsx b/packages/admin/src/components/FieldEditor.tsx
index 62a9a78b7..6f6573c2e 100644
--- a/packages/admin/src/components/FieldEditor.tsx
+++ b/packages/admin/src/components/FieldEditor.tsx
@@ -513,7 +513,7 @@ export function FieldEditor({ open, onOpenChange, field, onSave, isSaving }: Fie
 								label={t`Options (one per line)`}
 								value={options}
 								onChange={(e) => setField("options", e.target.value)}
-								placeholder={"Option 1\nOption 2\nOption 3"}
+								placeholder={t`Option 1\nOption 2\nOption 3`}
 								rows={5}
 							/>
 						)}
diff --git a/packages/admin/src/components/MarketplaceBrowse.tsx b/packages/admin/src/components/MarketplaceBrowse.tsx
index 46ee32564..ca7843d1d 100644
--- a/packages/admin/src/components/MarketplaceBrowse.tsx
+++ b/packages/admin/src/components/MarketplaceBrowse.tsx
@@ -6,7 +6,8 @@
  */
 
 import { Badge, Button } from "@cloudflare/kumo";
-import { plural } from "@lingui/core/macro";
+import type { MessageDescriptor } from "@lingui/core";
+import { msg, plural } from "@lingui/core/macro";
 import { useLingui } from "@lingui/react/macro";
 import {
 	MagnifyingGlass,
@@ -37,11 +38,11 @@ function isSortOption(value: string): value is SortOption {
 	return SORT_OPTIONS.has(value);
 }
 
-const SORT_LABELS: Record<SortOption, string> = {
-	installs: "Most Popular",
-	updated: "Recently Updated",
-	created: "Newest",
-	name: "Name",
+const SORT_LABELS: Record<SortOption, MessageDescriptor> = {
+	installs: msg`Most Popular`,
+	updated: msg`Recently Updated`,
+	created: msg`Newest`,
+	name: msg`Name`,
 };
 
 export interface MarketplaceBrowseProps {
@@ -123,7 +124,7 @@ export function MarketplaceBrowse({ installedPluginIds = new Set() }: Marketplac
 				>
 					{Object.entries(SORT_LABELS).map(([value, label]) => (
 						<option key={value} value={value}>
-							{label}
+							{t(label)}
 						</option>
 					))}
 				</select>
diff --git a/packages/admin/src/components/MediaLibrary.tsx b/packages/admin/src/components/MediaLibrary.tsx
index fa453fad6..fc314dded 100644
--- a/packages/admin/src/components/MediaLibrary.tsx
+++ b/packages/admin/src/components/MediaLibrary.tsx
@@ -79,12 +79,12 @@ export function MediaLibrary({
 		if (activeProvider === "local") {
 			return {
 				id: "local",
-				name: "Library",
+				name: t`Library`,
 				capabilities: { browse: true, search: false, upload: true, delete: true },
 			} as MediaProviderInfo;
 		}
 		return providers?.find((p) => p.id === activeProvider);
-	}, [activeProvider, providers]);
+	}, [activeProvider, providers, t]);
 
 	// Update selected item when items change (e.g., after metadata update)
 	React.useEffect(() => {
@@ -199,7 +199,7 @@ export function MediaLibrary({
 	// Build provider tabs
 	const providerTabs = React.useMemo(() => {
 		const tabs: Array<{ id: string; name: string; icon?: string }> = [
-			{ id: "local", name: "Library", icon: undefined },
+			{ id: "local", name: t`Library`, icon: undefined },
 		];
 		if (providers) {
 			for (const p of providers) {
@@ -209,7 +209,7 @@ export function MediaLibrary({
 			}
 		}
 		return tabs;
-	}, [providers]);
+	}, [providers, t]);
 
 	// Get current items based on active provider
 	const currentItems = activeProvider === "local" ? items : [];
diff --git a/packages/admin/src/components/MediaPickerModal.tsx b/packages/admin/src/components/MediaPickerModal.tsx
index 47de9489a..8c710bb16 100644
--- a/packages/admin/src/components/MediaPickerModal.tsx
+++ b/packages/admin/src/components/MediaPickerModal.tsx
@@ -59,14 +59,17 @@ export interface MediaPickerModalProps {
 /**
  * Probe image URL to get dimensions
  */
-function probeImageDimensions(url: string): Promise<{ width: number; height: number }> {
+function probeImageDimensions(
+	url: string,
+	errorMessage: string,
+): Promise<{ width: number; height: number }> {
 	return new Promise((resolve, reject) => {
 		const img = new window.Image();
 		img.onload = () => {
 			resolve({ width: img.naturalWidth, height: img.naturalHeight });
 		};
 		img.onerror = () => {
-			reject(new Error("Failed to load image"));
+			reject(new Error(errorMessage));
 		};
 		img.src = url;
 	});
@@ -309,7 +312,7 @@ export function MediaPickerModal({
 		setUrlError(null);
 
 		try {
-			const dimensions = await probeImageDimensions(url.href);
+			const dimensions = await probeImageDimensions(url.href, t`Failed to load image`);
 			const externalItem: MediaItem = {
 				id: "",
 				filename: url.pathname.split("/").pop() || "external-image",
@@ -392,7 +395,7 @@ export function MediaPickerModal({
 									<Globe className="absolute start-3 top-1/2 -translate-y-1/2 h-4 w-4 text-kumo-subtle" />
 									<Input
 										type="url"
-										placeholder="https://example.com/image.jpg"
+										placeholder={t`https://example.com/image.jpg`}
 										aria-label={t`Image URL`}
 										value={imageUrl}
 										onChange={(e) => {
@@ -491,7 +494,7 @@ export function MediaPickerModal({
 								accept={mimeTypeFilter ? `${mimeTypeFilter}*` : undefined}
 								className="sr-only"
 								onChange={handleFileSelect}
-								aria-label="Upload file"
+								aria-label={t`Upload file`}
 							/>
 						</>
 					)}
diff --git a/packages/admin/src/components/MenuList.tsx b/packages/admin/src/components/MenuList.tsx
index 2ad71addd..7819a60fa 100644
--- a/packages/admin/src/components/MenuList.tsx
+++ b/packages/admin/src/components/MenuList.tsx
@@ -5,6 +5,8 @@
  */
 
 import { Button, Dialog, Input, Toast, buttonVariants } from "@cloudflare/kumo";
+import { plural } from "@lingui/core/macro";
+import { Trans } from "@lingui/react/macro";
 import { useLingui } from "@lingui/react/macro";
 import { Plus, Pencil, Trash, List as ListIcon } from "@phosphor-icons/react";
 import { X } from "@phosphor-icons/react";
@@ -209,7 +211,10 @@ export function MenuList() {
 										) : null}
 									</h3>
 									<p className="text-sm text-kumo-subtle">
-										{menu.name} • {menu.itemCount || 0} items
+										<Trans>
+											{menu.name} •{" "}
+											{plural(menu.itemCount ?? 0, { one: "# item", other: "# items" })}
+										</Trans>
 									</p>
 								</div>
 							</Link>
diff --git a/packages/admin/src/components/Redirects.tsx b/packages/admin/src/components/Redirects.tsx
index 437f69364..178684818 100644
--- a/packages/admin/src/components/Redirects.tsx
+++ b/packages/admin/src/components/Redirects.tsx
@@ -126,7 +126,7 @@ function RedirectFormDialog({
 				<form onSubmit={handleSubmit} className="space-y-4">
 					<Input
 						label={t`Source path`}
-						placeholder="/old-page or /blog/[slug]"
+						placeholder={t`/old-page or /blog/[slug]`}
 						value={source}
 						onChange={(e: React.ChangeEvent<HTMLInputElement>) => setSource(e.target.value)}
 						required
@@ -134,7 +134,7 @@ function RedirectFormDialog({
 
 					<Input
 						label={t`Destination path`}
-						placeholder="/new-page or /articles/[slug]"
+						placeholder={t`/new-page or /articles/[slug]`}
 						value={destination}
 						onChange={(e: React.ChangeEvent<HTMLInputElement>) => setDestination(e.target.value)}
 						required
@@ -158,7 +158,7 @@ function RedirectFormDialog({
 
 						<Input
 							label={t`Group (optional)`}
-							placeholder="e.g. import, blog"
+							placeholder={t`e.g. import, blog`}
 							value={groupName}
 							onChange={(e: React.ChangeEvent<HTMLInputElement>) => setGroupName(e.target.value)}
 						/>
diff --git a/packages/admin/src/components/SandboxedPluginPage.tsx b/packages/admin/src/components/SandboxedPluginPage.tsx
index bce672d8c..38a5aec4e 100644
--- a/packages/admin/src/components/SandboxedPluginPage.tsx
+++ b/packages/admin/src/components/SandboxedPluginPage.tsx
@@ -7,6 +7,7 @@
 
 import { BlockRenderer } from "@emdash-cms/blocks";
 import type { Block, BlockInteraction, BlockResponse } from "@emdash-cms/blocks";
+import { useLingui } from "@lingui/react/macro";
 import { CircleNotch, WarningCircle } from "@phosphor-icons/react";
 import { useCallback, useEffect, useState } from "react";
 
@@ -18,6 +19,7 @@ interface SandboxedPluginPageProps {
 }
 
 export function SandboxedPluginPage({ pluginId, page }: SandboxedPluginPageProps) {
+	const { t } = useLingui();
 	const [blocks, setBlocks] = useState<Block[]>([]);
 	const [loading, setLoading] = useState(true);
 	const [error, setError] = useState<string | null>(null);
@@ -35,7 +37,7 @@ export function SandboxedPluginPage({ pluginId, page }: SandboxedPluginPageProps
 
 				if (!response.ok) {
 					const text = await response.text();
-					setError(`Plugin responded with ${response.status}: ${text}`);
+					setError(t`Plugin responded with ${response.status}: ${text}`);
 					return;
 				}
 
@@ -49,7 +51,7 @@ export function SandboxedPluginPage({ pluginId, page }: SandboxedPluginPageProps
 					setTimeout(setToast, 4000, null);
 				}
 			} catch (err) {
-				setError(err instanceof Error ? err.message : "Failed to communicate with plugin");
+				setError(err instanceof Error ? err.message : t`Failed to communicate with plugin`);
 			}
 		},
 		[pluginId],
@@ -84,7 +86,7 @@ export function SandboxedPluginPage({ pluginId, page }: SandboxedPluginPageProps
 				<div className="flex items-start gap-3">
 					<WarningCircle className="h-5 w-5 shrink-0 text-kumo-danger" />
 					<div>
-						<h3 className="font-semibold text-kumo-danger">Plugin Error</h3>
+						<h3 className="font-semibold text-kumo-danger">{t`Plugin Error`}</h3>
 						<p className="mt-1 text-sm text-kumo-subtle">{error}</p>
 					</div>
 				</div>
diff --git a/packages/admin/src/components/SandboxedPluginWidget.tsx b/packages/admin/src/components/SandboxedPluginWidget.tsx
index 97b97b2cd..e63739a0c 100644
--- a/packages/admin/src/components/SandboxedPluginWidget.tsx
+++ b/packages/admin/src/components/SandboxedPluginWidget.tsx
@@ -7,6 +7,7 @@
 
 import { BlockRenderer } from "@emdash-cms/blocks";
 import type { Block, BlockInteraction, BlockResponse } from "@emdash-cms/blocks";
+import { useLingui } from "@lingui/react/macro";
 import { CircleNotch } from "@phosphor-icons/react";
 import { useCallback, useEffect, useState } from "react";
 
@@ -18,6 +19,7 @@ interface SandboxedPluginWidgetProps {
 }
 
 export function SandboxedPluginWidget({ pluginId, widgetId }: SandboxedPluginWidgetProps) {
+	const { t } = useLingui();
 	const [blocks, setBlocks] = useState<Block[]>([]);
 	const [loading, setLoading] = useState(true);
 	const [error, setError] = useState<string | null>(null);
@@ -32,7 +34,7 @@ export function SandboxedPluginWidget({ pluginId, widgetId }: SandboxedPluginWid
 				});
 
 				if (!response.ok) {
-					setError(`Plugin error (${response.status})`);
+					setError(t`Plugin error (${response.status})`);
 					return;
 				}
 
@@ -41,7 +43,7 @@ export function SandboxedPluginWidget({ pluginId, widgetId }: SandboxedPluginWid
 				setBlocks(data.blocks);
 				setError(null);
 			} catch {
-				setError("Failed to load widget");
+				setError(t`Failed to load widget`);
 			}
 		},
 		[pluginId],
@@ -75,7 +77,7 @@ export function SandboxedPluginWidget({ pluginId, widgetId }: SandboxedPluginWid
 	}
 
 	if (blocks.length === 0) {
-		return <p className="text-sm text-kumo-subtle">No content</p>;
+		return <p className="text-sm text-kumo-subtle">{t`No content`}</p>;
 	}
 
 	return <BlockRenderer blocks={blocks} onAction={handleAction} />;
diff --git a/packages/admin/src/components/SectionEditor.tsx b/packages/admin/src/components/SectionEditor.tsx
index ae86c438f..0314b2051 100644
--- a/packages/admin/src/components/SectionEditor.tsx
+++ b/packages/admin/src/components/SectionEditor.tsx
@@ -258,7 +258,7 @@ function SectionEditorForm({ section, isSaving, onSave }: SectionEditorFormProps
 										label={t`Keywords`}
 										value={keywords}
 										onChange={(e) => setKeywords(e.target.value)}
-										placeholder="hero, banner, cta"
+										placeholder={t`hero, banner, cta`}
 									/>
 									<p className="text-xs text-kumo-subtle mt-1">{t`Comma-separated keywords for search.`}</p>
 								</div>
diff --git a/packages/admin/src/components/Sections.tsx b/packages/admin/src/components/Sections.tsx
index 0b7ea88d5..9ea383eca 100644
--- a/packages/admin/src/components/Sections.tsx
+++ b/packages/admin/src/components/Sections.tsx
@@ -5,6 +5,8 @@
  */
 
 import { Button, Dialog, Input, InputArea, Toast } from "@cloudflare/kumo";
+import type { MessageDescriptor } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
 import { useLingui } from "@lingui/react/macro";
 import {
 	Plus,
@@ -39,10 +41,10 @@ const sourceIcons: Record<SectionSource, React.ElementType> = {
 	import: FileArrowDown,
 };
 
-const sourceLabels: Record<SectionSource, string> = {
-	theme: "Theme",
-	user: "Custom",
-	import: "Imported",
+const sourceLabels: Record<SectionSource, MessageDescriptor> = {
+	theme: msg`Theme`,
+	user: msg`Custom`,
+	import: msg`Imported`,
 };
 
 export function Sections() {
@@ -175,7 +177,7 @@ export function Sections() {
 									}
 								}}
 								required
-								placeholder="Hero Banner"
+								placeholder={t`Hero Banner`}
 							/>
 							<div>
 								<Input
@@ -198,7 +200,7 @@ export function Sections() {
 								label={t`Description`}
 								value={createDescription}
 								onChange={(e) => setCreateDescription(e.target.value)}
-								placeholder="A full-width hero banner with heading, text, and CTA button"
+								placeholder={t`A full-width hero banner with heading, text, and CTA button`}
 								rows={3}
 							/>
 							<DialogError message={createError || getMutationError(createMutation.error)} />
@@ -351,10 +353,10 @@ function SectionCard({
 					</div>
 					<div
 						className="flex items-center gap-1 text-xs text-kumo-subtle"
-						title={sourceLabels[section.source]}
+						title={t(sourceLabels[section.source])}
 					>
 						<SourceIcon className="h-3 w-3" />
-						<span>{sourceLabels[section.source]}</span>
+						<span>{t(sourceLabels[section.source])}</span>
 					</div>
 				</div>
 
diff --git a/packages/admin/src/components/SetupWizard.tsx b/packages/admin/src/components/SetupWizard.tsx
index 0dbac4d3f..d7a39410b 100644
--- a/packages/admin/src/components/SetupWizard.tsx
+++ b/packages/admin/src/components/SetupWizard.tsx
@@ -76,35 +76,6 @@ interface SetupAdminResponse {
 
 type WizardStep = "site" | "admin" | "passkey";
 
-// ============================================================================
-// API Functions
-// ============================================================================
-
-async function fetchSetupStatus(): Promise<SetupStatusResponse> {
-	const response = await apiFetch("/_emdash/api/setup/status");
-	return parseApiResponse<SetupStatusResponse>(response, "Failed to fetch setup status");
-}
-
-async function executeSiteSetup(data: SetupSiteRequest): Promise<SetupSiteResponse> {
-	const response = await apiFetch("/_emdash/api/setup", {
-		method: "POST",
-		headers: { "Content-Type": "application/json" },
-		body: JSON.stringify(data),
-	});
-
-	return parseApiResponse<SetupSiteResponse>(response, "Setup failed");
-}
-
-async function executeAdminSetup(data: SetupAdminRequest): Promise<SetupAdminResponse> {
-	const response = await apiFetch("/_emdash/api/setup/admin", {
-		method: "POST",
-		headers: { "Content-Type": "application/json" },
-		body: JSON.stringify(data),
-	});
-
-	return parseApiResponse<SetupAdminResponse>(response, "Failed to create admin");
-}
-
 // ============================================================================
 // Step Components
 // ============================================================================
@@ -336,7 +307,7 @@ function AuthMethodStep({ adminData, providers, onBack }: AuthMethodStepProps) {
 							<span className="w-full border-t" />
 						</div>
 						<div className="relative flex justify-center text-xs uppercase">
-							<span className="bg-kumo-base px-2 text-kumo-subtle">Or continue with</span>
+							<span className="bg-kumo-base px-2 text-kumo-subtle">{t`Or continue with`}</span>
 						</div>
 					</div>
 
@@ -440,6 +411,7 @@ function StepIndicator({ currentStep, useAccessAuth }: StepIndicatorProps) {
 // ============================================================================
 
 export function SetupWizard() {
+	const { t } = useLingui();
 	const [currentStep, setCurrentStep] = React.useState<WizardStep>("site");
 	const [_siteData, setSiteData] = React.useState<SetupSiteRequest | null>(null);
 	const [adminData, setAdminData] = React.useState<SetupAdminRequest | null>(null);
@@ -469,7 +441,10 @@ export function SetupWizard() {
 		error: statusError,
 	} = useQuery({
 		queryKey: ["setup", "status"],
-		queryFn: fetchSetupStatus,
+		queryFn: async () => {
+			const response = await apiFetch("/_emdash/api/setup/status");
+			return parseApiResponse<SetupStatusResponse>(response, t`Failed to fetch setup status`);
+		},
 		retry: false,
 	});
 
@@ -484,7 +459,14 @@ export function SetupWizard() {
 
 	// Site setup mutation
 	const siteMutation = useMutation({
-		mutationFn: executeSiteSetup,
+		mutationFn: async (data: SetupSiteRequest) => {
+			const response = await apiFetch("/_emdash/api/setup", {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify(data),
+			});
+			return parseApiResponse<SetupSiteResponse>(response, t`Setup failed`);
+		},
 		onSuccess: (data) => {
 			setError(undefined);
 			// In Access mode, setup is complete - redirect to admin
@@ -502,7 +484,14 @@ export function SetupWizard() {
 
 	// Admin setup mutation
 	const adminMutation = useMutation({
-		mutationFn: executeAdminSetup,
+		mutationFn: async (data: SetupAdminRequest) => {
+			const response = await apiFetch("/_emdash/api/setup/admin", {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify(data),
+			});
+			return parseApiResponse<SetupAdminResponse>(response, t`Failed to create admin`);
+		},
 		onSuccess: () => {
 			setError(undefined);
 			setCurrentStep("passkey");
@@ -530,8 +519,6 @@ export function SetupWizard() {
 		return null;
 	}
 
-	const { t } = useLingui();
-
 	// Loading state
 	if (statusLoading) {
 		return (
diff --git a/packages/admin/src/components/SignupPage.tsx b/packages/admin/src/components/SignupPage.tsx
index b7469db6e..8d3e1d7f2 100644
--- a/packages/admin/src/components/SignupPage.tsx
+++ b/packages/admin/src/components/SignupPage.tsx
@@ -347,7 +347,7 @@ export function SignupPage() {
 			await requestSignup(submittedEmail);
 			setStep("check-email");
 		} catch (err) {
-			setError(err instanceof Error ? err.message : "Failed to send verification email");
+			setError(err instanceof Error ? err.message : t`Failed to send verification email`);
 		} finally {
 			setIsLoading(false);
 		}
diff --git a/packages/admin/src/components/TaxonomyManager.tsx b/packages/admin/src/components/TaxonomyManager.tsx
index 40c138534..56460f907 100644
--- a/packages/admin/src/components/TaxonomyManager.tsx
+++ b/packages/admin/src/components/TaxonomyManager.tsx
@@ -387,7 +387,7 @@ function TermFormDialog({
 							label={t`Name`}
 							value={label}
 							onChange={(e) => setLabel(e.target.value)}
-							placeholder="News"
+							placeholder={t`News`}
 							required
 						/>
 
@@ -621,7 +621,7 @@ function CreateTaxonomyDialog({
 							label={t`Label`}
 							value={label}
 							onChange={(e) => setLabel(e.target.value)}
-							placeholder="Genres"
+							placeholder={t`Genres`}
 							required
 						/>
 
diff --git a/packages/admin/src/components/TaxonomySidebar.tsx b/packages/admin/src/components/TaxonomySidebar.tsx
index f5a08bd57..6186417fe 100644
--- a/packages/admin/src/components/TaxonomySidebar.tsx
+++ b/packages/admin/src/components/TaxonomySidebar.tsx
@@ -7,6 +7,8 @@
  */
 
 import { Button, Input, Label, Toast } from "@cloudflare/kumo";
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
 import { useLingui } from "@lingui/react/macro";
 import { Plus, X } from "@phosphor-icons/react";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
@@ -58,7 +60,10 @@ async function fetchTaxonomyDefs(): Promise<TaxonomyDef[]> {
  */
 async function fetchTerms(taxonomyName: string): Promise<TaxonomyTerm[]> {
 	const res = await apiFetch(`/_emdash/api/taxonomies/${taxonomyName}/terms`);
-	const data = await parseApiResponse<{ terms: TaxonomyTerm[] }>(res, "Failed to fetch terms");
+	const data = await parseApiResponse<{ terms: TaxonomyTerm[] }>(
+		res,
+		i18n._(msg`Failed to fetch terms`),
+	);
 	return data.terms;
 }
 
@@ -73,7 +78,7 @@ async function fetchEntryTerms(
 	const res = await apiFetch(`/_emdash/api/content/${collection}/${entryId}/terms/${taxonomy}`);
 	const data = await parseApiResponse<{ terms: TaxonomyTerm[] }>(
 		res,
-		"Failed to fetch entry terms",
+		i18n._(msg`Failed to fetch entry terms`),
 	);
 	return data.terms;
 }
@@ -92,7 +97,7 @@ async function setEntryTerms(
 		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify({ termIds }),
 	});
-	if (!res.ok) await throwResponseError(res, "Failed to set entry terms");
+	if (!res.ok) await throwResponseError(res, i18n._(msg`Failed to set entry terms`));
 }
 
 /**
@@ -257,7 +262,7 @@ function TagInput({
 								className="w-full text-start px-3 py-2 text-sm hover:bg-kumo-tint text-kumo-accent flex items-center gap-1 border-t"
 							>
 								<Plus className="w-3 h-3" />
-								{isCreating ? "Creating..." : `Create "${trimmedInput}"`}
+								{isCreating ? t`Creating...` : t`Create "${trimmedInput}"`}
 							</button>
 						)}
 					</div>
diff --git a/packages/admin/src/components/WelcomeModal.tsx b/packages/admin/src/components/WelcomeModal.tsx
index 1baf24cbe..010c8c1ed 100644
--- a/packages/admin/src/components/WelcomeModal.tsx
+++ b/packages/admin/src/components/WelcomeModal.tsx
@@ -53,13 +53,13 @@ function scopeDescriptor(isAdmin: boolean, userRole: number): MessageDescriptor
 const MSG_ADMIN_INVITE = msg`As an administrator, you can invite other users from the Users section.`;
 const MSG_CLOSE = msg`Close`;
 
-async function dismissWelcome(): Promise<void> {
+async function dismissWelcome(fallbackMessage: string): Promise<void> {
 	const response = await apiFetch("/_emdash/api/auth/me", {
 		method: "POST",
 		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify({ action: "dismissWelcome" }),
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to dismiss welcome");
+	if (!response.ok) await throwResponseError(response, fallbackMessage);
 }
 
 export function WelcomeModal({ open, onClose, userName, userRole }: WelcomeModalProps) {
@@ -67,7 +67,7 @@ export function WelcomeModal({ open, onClose, userName, userRole }: WelcomeModal
 	const queryClient = useQueryClient();
 
 	const dismissMutation = useMutation({
-		mutationFn: dismissWelcome,
+		mutationFn: () => dismissWelcome(t`Failed to dismiss welcome`),
 		onSuccess: () => {
 			// Update the cached user data to reflect that they've seen the welcome
 			queryClient.setQueryData(["currentUser"], (old: unknown) => {
diff --git a/packages/admin/src/components/WordPressImport.tsx b/packages/admin/src/components/WordPressImport.tsx
index 03ec44f3f..757b70c34 100644
--- a/packages/admin/src/components/WordPressImport.tsx
+++ b/packages/admin/src/components/WordPressImport.tsx
@@ -199,6 +199,8 @@ export function WordPressImport() {
 		}
 	}, []); // eslint-disable-line react-hooks/exhaustive-deps
 
+	const { t } = useLingui();
+
 	// Probe mutation
 	const probeMutation = useMutation({
 		mutationFn: probeImportUrl,
@@ -262,7 +264,7 @@ export function WordPressImport() {
 			}
 		},
 		onError: (error) => {
-			setPrepareError(error instanceof Error ? error.message : "Failed to prepare import");
+			setPrepareError(error instanceof Error ? error.message : t`Failed to prepare import`);
 			setStep("review");
 		},
 	});
@@ -281,7 +283,7 @@ export function WordPressImport() {
 			}
 		},
 		onError: (error) => {
-			setImportError(error instanceof Error ? error.message : "Failed to execute import");
+			setImportError(error instanceof Error ? error.message : t`Failed to execute import`);
 			setStep("review");
 		},
 	});
@@ -305,7 +307,7 @@ export function WordPressImport() {
 		},
 		onError: (error) => {
 			setMediaProgress(null);
-			setMediaError(error instanceof Error ? error.message : "Failed to import media");
+			setMediaError(error instanceof Error ? error.message : t`Failed to import media`);
 			setStep("media");
 		},
 	});
@@ -318,7 +320,7 @@ export function WordPressImport() {
 			setStep("complete");
 		},
 		onError: (error) => {
-			setMediaError(error instanceof Error ? error.message : "Failed to rewrite URLs");
+			setMediaError(error instanceof Error ? error.message : t`Failed to rewrite URLs`);
 			setStep("complete");
 		},
 	});
@@ -353,7 +355,7 @@ export function WordPressImport() {
 			setStep("review");
 		},
 		onError: (error) => {
-			setImportError(error instanceof Error ? error.message : "Failed to analyze WordPress site");
+			setImportError(error instanceof Error ? error.message : t`Failed to analyze WordPress site`);
 			setStep("plugin-auth");
 		},
 	});
@@ -372,7 +374,7 @@ export function WordPressImport() {
 			}
 		},
 		onError: (error) => {
-			setImportError(error instanceof Error ? error.message : "Failed to import from WordPress");
+			setImportError(error instanceof Error ? error.message : t`Failed to import from WordPress`);
 			setStep("review");
 		},
 	});
@@ -600,8 +602,6 @@ export function WordPressImport() {
 	// Check if we're using the plugin source
 	const isPluginSource = importSource?.type === "wordpress-plugin";
 
-	const { t } = useLingui();
-
 	return (
 		<div className="space-y-6">
 			<div>
@@ -615,7 +615,7 @@ export function WordPressImport() {
 			<div className="flex items-center gap-2 text-sm flex-wrap">
 				<StepIndicator
 					number={1}
-					label="Connect"
+					label={t`Connect`}
 					active={
 						step === "choose" ||
 						step === "probing" ||
@@ -638,7 +638,7 @@ export function WordPressImport() {
 				<div className="h-px w-8 bg-kumo-line" />
 				<StepIndicator
 					number={2}
-					label="Review"
+					label={t`Review`}
 					active={step === "review" || step === "authors"}
 					complete={
 						step === "preparing" ||
@@ -652,7 +652,7 @@ export function WordPressImport() {
 				<div className="h-px w-8 bg-kumo-line" />
 				<StepIndicator
 					number={3}
-					label="Import"
+					label={t`Import`}
 					active={step === "preparing" || step === "importing"}
 					complete={
 						step === "media" ||
@@ -666,7 +666,7 @@ export function WordPressImport() {
 						<div className="h-px w-8 bg-kumo-line" />
 						<StepIndicator
 							number={4}
-							label="Media"
+							label={t`Media`}
 							active={step === "media" || step === "importing-media" || step === "rewriting"}
 							complete={step === "complete"}
 						/>
diff --git a/packages/admin/src/components/auth/PasskeyLogin.tsx b/packages/admin/src/components/auth/PasskeyLogin.tsx
index 6e155a58f..610ec2e85 100644
--- a/packages/admin/src/components/auth/PasskeyLogin.tsx
+++ b/packages/admin/src/components/auth/PasskeyLogin.tsx
@@ -173,7 +173,7 @@ export function PasskeyLogin({
 
 				const optionsData = await parseApiResponse<{
 					options: PublicKeyCredentialRequestOptionsJSON;
-				}>(optionsResponse, "Failed to get authentication options");
+				}>(optionsResponse, t`Failed to get authentication options`);
 				const { options } = optionsData;
 
 				// Step 2: Get assertion from browser
@@ -247,13 +247,13 @@ export function PasskeyLogin({
 
 				const result = await parseApiResponse<unknown>(
 					verifyResponse,
-					"Failed to verify authentication",
+					t`Failed to verify authentication`,
 				);
 
 				setState({ status: "success" });
 				onSuccess(result);
 			} catch (error) {
-				const message = error instanceof Error ? error.message : "Authentication failed";
+				const message = error instanceof Error ? error.message : t`Authentication failed`;
 
 				// Handle specific WebAuthn errors
 				let userMessage = message;
diff --git a/packages/admin/src/components/auth/PasskeyRegistration.tsx b/packages/admin/src/components/auth/PasskeyRegistration.tsx
index 60732b85b..7d5708bdb 100644
--- a/packages/admin/src/components/auth/PasskeyRegistration.tsx
+++ b/packages/admin/src/components/auth/PasskeyRegistration.tsx
@@ -177,7 +177,7 @@ export function PasskeyRegistration({
 
 			const optionsData = await parseApiResponse<{
 				options: PublicKeyCredentialCreationOptionsJSON;
-			}>(optionsResponse, "Failed to get registration options");
+			}>(optionsResponse, t`Failed to get registration options`);
 			const { options } = optionsData;
 
 			// Step 2: Create credential with browser
@@ -250,13 +250,13 @@ export function PasskeyRegistration({
 
 			const result = await parseApiResponse<unknown>(
 				verifyResponse,
-				"Failed to verify registration",
+				t`Failed to verify registration`,
 			);
 
 			setState({ status: "success" });
 			onSuccess(result);
 		} catch (error) {
-			const message = error instanceof Error ? error.message : "Registration failed";
+			const message = error instanceof Error ? error.message : t`Registration failed`;
 
 			// Handle specific WebAuthn errors
 			let userMessage = message;
diff --git a/packages/admin/src/components/editor/BlockMenu.tsx b/packages/admin/src/components/editor/BlockMenu.tsx
index 5043289e4..518d6eaa9 100644
--- a/packages/admin/src/components/editor/BlockMenu.tsx
+++ b/packages/admin/src/components/editor/BlockMenu.tsx
@@ -251,7 +251,7 @@ export function BlockMenu({ editor, anchorElement, isOpen, onClose }: BlockMenuP
 						onClick={() => setShowTransforms(false)}
 					>
 						<CaretPrev className="h-4 w-4" />
-						<span>Back</span>
+						{t`Back`}
 					</button>
 					<div className="h-px bg-kumo-line my-1" />
 					{blockTransforms.map((transform) => (
@@ -276,7 +276,7 @@ export function BlockMenu({ editor, anchorElement, isOpen, onClose }: BlockMenuP
 					>
 						<span className="flex items-center gap-2">
 							<Paragraph className="h-4 w-4 text-kumo-subtle" />
-							<span>Turn into</span>
+							{t`Turn into`}
 						</span>
 						<CaretNext className="h-4 w-4 text-kumo-subtle" />
 					</button>
@@ -286,7 +286,7 @@ export function BlockMenu({ editor, anchorElement, isOpen, onClose }: BlockMenuP
 						onClick={handleDuplicate}
 					>
 						<Copy className="h-4 w-4 text-kumo-subtle" />
-						<span>Duplicate</span>
+						{t`Duplicate`}
 					</button>
 					<div className="h-px bg-kumo-line my-1" />
 					<button
@@ -295,7 +295,7 @@ export function BlockMenu({ editor, anchorElement, isOpen, onClose }: BlockMenuP
 						onClick={handleDelete}
 					>
 						<Trash className="h-4 w-4" />
-						<span>Delete</span>
+						{t`Delete`}
 					</button>
 				</div>
 			)}
@@ -317,6 +317,7 @@ interface BlockHandleProps {
 }
 
 export function BlockHandle({ onClick, onDragStart, selected }: BlockHandleProps) {
+	const { t } = useLingui();
 	return (
 		<Button
 			type="button"
@@ -331,7 +332,7 @@ export function BlockHandle({ onClick, onDragStart, selected }: BlockHandleProps
 			onDragStart={onDragStart}
 			draggable
 			data-block-handle
-			aria-label="Drag to reorder block"
+			aria-label={t`Drag to reorder block`}
 		>
 			<DotsSixVertical className="h-4 w-4" />
 		</Button>
diff --git a/packages/admin/src/components/editor/DragHandleWrapper.tsx b/packages/admin/src/components/editor/DragHandleWrapper.tsx
index 4b8b6a983..2d75374cd 100644
--- a/packages/admin/src/components/editor/DragHandleWrapper.tsx
+++ b/packages/admin/src/components/editor/DragHandleWrapper.tsx
@@ -8,6 +8,7 @@
  * - Block menu integration for transforms, duplicate, delete
  */
 
+import { useLingui } from "@lingui/react/macro";
 import { DotsSixVertical } from "@phosphor-icons/react";
 import type { Editor } from "@tiptap/core";
 import { DragHandle } from "@tiptap/extension-drag-handle-react";
@@ -41,6 +42,7 @@ declare module "@tiptap/core" {
  * DragHandleWrapper - Official TipTap drag handle with BlockMenu integration
  */
 export function DragHandleWrapper({ editor }: DragHandleWrapperProps) {
+	const { t } = useLingui();
 	const [hoveredNode, setHoveredNode] = React.useState<HoveredNode | null>(null);
 	const [menuOpen, setMenuOpen] = React.useState(false);
 	const [menuAnchor, setMenuAnchor] = React.useState<HTMLElement | null>(null);
@@ -120,7 +122,7 @@ export function DragHandleWrapper({ editor }: DragHandleWrapperProps) {
 					)}
 					onClick={handleClick}
 					data-block-handle
-					aria-label="Block actions - drag to reorder, click for menu"
+					aria-label={t`Block actions - drag to reorder, click for menu`}
 				>
 					<DotsSixVertical className="h-4 w-4" />
 				</button>
diff --git a/packages/admin/src/lib/api/api-tokens.ts b/packages/admin/src/lib/api/api-tokens.ts
index 7e106ef81..010bb62a5 100644
--- a/packages/admin/src/lib/api/api-tokens.ts
+++ b/packages/admin/src/lib/api/api-tokens.ts
@@ -2,6 +2,9 @@
  * API token management client functions
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import { API_BASE, apiFetch, parseApiResponse, throwResponseError } from "./client.js";
 
 // =============================================================================
@@ -92,5 +95,5 @@ export async function revokeApiToken(id: string): Promise<void> {
 		method: "DELETE",
 	});
 
-	if (!response.ok) await throwResponseError(response, "Failed to revoke API token");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to revoke API token`));
 }
diff --git a/packages/admin/src/lib/api/bylines.ts b/packages/admin/src/lib/api/bylines.ts
index c1abb2239..54a3060a1 100644
--- a/packages/admin/src/lib/api/bylines.ts
+++ b/packages/admin/src/lib/api/bylines.ts
@@ -1,3 +1,6 @@
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import {
 	API_BASE,
 	apiFetch,
@@ -83,5 +86,5 @@ export async function deleteByline(id: string): Promise<void> {
 	const response = await apiFetch(`${API_BASE}/admin/bylines/${id}`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete byline");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete byline`));
 }
diff --git a/packages/admin/src/lib/api/client.ts b/packages/admin/src/lib/api/client.ts
index 53a5c4532..eca38c8f2 100644
--- a/packages/admin/src/lib/api/client.ts
+++ b/packages/admin/src/lib/api/client.ts
@@ -3,6 +3,8 @@
  */
 
 import type { Element } from "@emdash-cms/blocks";
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
 
 export const API_BASE = "/_emdash/api";
 
@@ -182,7 +184,7 @@ export async function parseApiResponse<T>(
  */
 export async function fetchManifest(): Promise<AdminManifest> {
 	const response = await apiFetch(`${API_BASE}/manifest`);
-	return parseApiResponse<AdminManifest>(response, "Failed to fetch manifest");
+	return parseApiResponse<AdminManifest>(response, i18n._(msg`Failed to fetch manifest`));
 }
 
 /**
diff --git a/packages/admin/src/lib/api/comments.ts b/packages/admin/src/lib/api/comments.ts
index b2078b35f..d26f3512c 100644
--- a/packages/admin/src/lib/api/comments.ts
+++ b/packages/admin/src/lib/api/comments.ts
@@ -2,6 +2,9 @@
  * Comment moderation API client
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import {
 	API_BASE,
 	apiFetch,
@@ -105,7 +108,7 @@ export async function deleteComment(id: string): Promise<void> {
 	const response = await apiFetch(`${API_BASE}/admin/comments/${id}`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete comment");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete comment`));
 }
 
 /**
diff --git a/packages/admin/src/lib/api/content.ts b/packages/admin/src/lib/api/content.ts
index ffa8ad30d..7d3fe3451 100644
--- a/packages/admin/src/lib/api/content.ts
+++ b/packages/admin/src/lib/api/content.ts
@@ -2,6 +2,9 @@
  * Content CRUD and revision APIs
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import type { BylineCreditInput, BylineSummary } from "./bylines.js";
 import {
 	API_BASE,
@@ -211,7 +214,7 @@ export async function deleteContent(collection: string, id: string): Promise<voi
 	const response = await apiFetch(`${API_BASE}/content/${collection}/${id}`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete content");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete content`));
 }
 
 /**
@@ -243,7 +246,7 @@ export async function restoreContent(collection: string, id: string): Promise<vo
 	const response = await apiFetch(`${API_BASE}/content/${collection}/${id}/restore`, {
 		method: "POST",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to restore content");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to restore content`));
 }
 
 /**
@@ -253,7 +256,8 @@ export async function permanentDeleteContent(collection: string, id: string): Pr
 	const response = await apiFetch(`${API_BASE}/content/${collection}/${id}/permanent`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to permanently delete content");
+	if (!response.ok)
+		await throwResponseError(response, i18n._(msg`Failed to permanently delete content`));
 }
 
 /**
@@ -455,10 +459,13 @@ export async function fetchRevision(revisionId: string): Promise<Revision> {
 		if (response.status === 404) {
 			throw new Error(`Revision not found: ${revisionId}`);
 		}
-		await throwResponseError(response, "Failed to fetch revision");
+		await throwResponseError(response, i18n._(msg`Failed to fetch revision`));
 	}
 
-	const data = await parseApiResponse<{ item: Revision }>(response, "Failed to fetch revision");
+	const data = await parseApiResponse<{ item: Revision }>(
+		response,
+		i18n._(msg`Failed to fetch revision`),
+	);
 	return data.item;
 }
 
@@ -474,12 +481,12 @@ export async function restoreRevision(revisionId: string): Promise<ContentItem>
 		if (response.status === 404) {
 			throw new Error(`Revision not found: ${revisionId}`);
 		}
-		await throwResponseError(response, "Failed to restore revision");
+		await throwResponseError(response, i18n._(msg`Failed to restore revision`));
 	}
 
 	const data = await parseApiResponse<{ item: ContentItem }>(
 		response,
-		"Failed to restore revision",
+		i18n._(msg`Failed to restore revision`),
 	);
 	return data.item;
 }
diff --git a/packages/admin/src/lib/api/import.ts b/packages/admin/src/lib/api/import.ts
index bf17ddb10..80749948e 100644
--- a/packages/admin/src/lib/api/import.ts
+++ b/packages/admin/src/lib/api/import.ts
@@ -2,6 +2,9 @@
  * WordPress import and source probing APIs
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import { API_BASE, apiFetch, parseApiResponse, throwResponseError } from "./client.js";
 
 // =============================================================================
@@ -250,7 +253,7 @@ export async function importWxrMedia(
 		body: JSON.stringify({ attachments, stream: !!onProgress }),
 	});
 
-	if (!response.ok) await throwResponseError(response, "Failed to import media");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to import media`));
 
 	// If no progress callback, just parse as JSON (non-streaming mode)
 	// Note: streaming NDJSON responses are excluded from the { data } envelope
diff --git a/packages/admin/src/lib/api/marketplace.ts b/packages/admin/src/lib/api/marketplace.ts
index 3eed5dddf..16cdd9571 100644
--- a/packages/admin/src/lib/api/marketplace.ts
+++ b/packages/admin/src/lib/api/marketplace.ts
@@ -6,6 +6,9 @@
  * admin UI doesn't need to know the marketplace URL.
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import { API_BASE, apiFetch, parseApiResponse, throwResponseError } from "./client.js";
 
 // ---------------------------------------------------------------------------
@@ -154,7 +157,7 @@ export async function installMarketplacePlugin(
 		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify(opts),
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to install plugin");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to install plugin`));
 }
 
 /**
@@ -170,7 +173,7 @@ export async function updateMarketplacePlugin(
 		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify(opts),
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to update plugin");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to update plugin`));
 }
 
 /**
@@ -186,7 +189,7 @@ export async function uninstallMarketplacePlugin(
 		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify(opts),
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to uninstall plugin");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to uninstall plugin`));
 }
 
 /**
diff --git a/packages/admin/src/lib/api/media.ts b/packages/admin/src/lib/api/media.ts
index a63651cd7..83fdbcff4 100644
--- a/packages/admin/src/lib/api/media.ts
+++ b/packages/admin/src/lib/api/media.ts
@@ -2,6 +2,9 @@
  * Media upload, list, delete, and provider APIs
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import {
 	API_BASE,
 	apiFetch,
@@ -119,7 +122,7 @@ async function uploadToSignedUrl(file: File, uploadInfo: UploadUrlResponse): Pro
 		body: file,
 	});
 
-	if (!response.ok) await throwResponseError(response, "Failed to upload file");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to upload file`));
 }
 
 /**
@@ -201,7 +204,7 @@ export async function deleteMedia(id: string): Promise<void> {
 	const response = await apiFetch(`${API_BASE}/media/${id}`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete media");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete media`));
 }
 
 /**
@@ -321,5 +324,5 @@ export async function deleteFromProvider(providerId: string, itemId: string): Pr
 	const response = await apiFetch(`${API_BASE}/media/providers/${providerId}/${itemId}`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete from provider");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete from provider`));
 }
diff --git a/packages/admin/src/lib/api/menus.ts b/packages/admin/src/lib/api/menus.ts
index e6417b4b8..b137a45b9 100644
--- a/packages/admin/src/lib/api/menus.ts
+++ b/packages/admin/src/lib/api/menus.ts
@@ -6,6 +6,9 @@
  * been updated yet).
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import { API_BASE, apiFetch, parseApiResponse, throwResponseError } from "./client.js";
 
 export interface Menu {
@@ -157,7 +160,7 @@ export async function deleteMenu(name: string, options: LocaleOptions = {}): Pro
 	const response = await apiFetch(withLocale(`${API_BASE}/menus/${name}`, options.locale), {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete menu");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete menu`));
 }
 
 /**
@@ -211,7 +214,7 @@ export async function deleteMenuItem(
 		withLocale(`${API_BASE}/menus/${menuName}/items?id=${itemId}`, options.locale),
 		{ method: "DELETE" },
 	);
-	if (!response.ok) await throwResponseError(response, "Failed to delete menu item");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete menu item`));
 }
 
 /**
diff --git a/packages/admin/src/lib/api/plugins.ts b/packages/admin/src/lib/api/plugins.ts
index e44e05265..6cbef65d8 100644
--- a/packages/admin/src/lib/api/plugins.ts
+++ b/packages/admin/src/lib/api/plugins.ts
@@ -2,6 +2,9 @@
  * Plugin management APIs
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import { API_BASE, apiFetch, parseApiResponse, throwResponseError } from "./client.js";
 
 export interface PluginInfo {
@@ -49,9 +52,12 @@ export async function fetchPlugin(pluginId: string): Promise<PluginInfo> {
 		if (response.status === 404) {
 			throw new Error(`Plugin "${pluginId}" not found`);
 		}
-		await throwResponseError(response, "Failed to fetch plugin");
+		await throwResponseError(response, i18n._(msg`Failed to fetch plugin`));
 	}
-	const result = await parseApiResponse<{ item: PluginInfo }>(response, "Failed to fetch plugin");
+	const result = await parseApiResponse<{ item: PluginInfo }>(
+		response,
+		i18n._(msg`Failed to fetch plugin`),
+	);
 	return result.item;
 }
 
diff --git a/packages/admin/src/lib/api/redirects.ts b/packages/admin/src/lib/api/redirects.ts
index e17382859..ed28129f2 100644
--- a/packages/admin/src/lib/api/redirects.ts
+++ b/packages/admin/src/lib/api/redirects.ts
@@ -2,6 +2,9 @@
  * Redirects API client
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import { API_BASE, apiFetch, parseApiResponse, throwResponseError } from "./client.js";
 
 export interface Redirect {
@@ -105,7 +108,7 @@ export async function deleteRedirect(id: string): Promise<void> {
 	const response = await apiFetch(`${API_BASE}/redirects/${encodeURIComponent(id)}`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete redirect");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete redirect`));
 }
 
 /**
diff --git a/packages/admin/src/lib/api/schema.ts b/packages/admin/src/lib/api/schema.ts
index 223d2eea0..c294df23c 100644
--- a/packages/admin/src/lib/api/schema.ts
+++ b/packages/admin/src/lib/api/schema.ts
@@ -2,6 +2,9 @@
  * Schema/collection/field management APIs (Content Type Builder)
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import { API_BASE, apiFetch, parseApiResponse, throwResponseError } from "./client.js";
 
 export type FieldType =
@@ -161,11 +164,11 @@ export async function fetchCollection(
 		if (response.status === 404) {
 			throw new Error(`Collection "${slug}" not found`);
 		}
-		await throwResponseError(response, "Failed to fetch collection");
+		await throwResponseError(response, i18n._(msg`Failed to fetch collection`));
 	}
 	const data = await parseApiResponse<{ item: SchemaCollectionWithFields }>(
 		response,
-		"Failed to fetch collection",
+		i18n._(msg`Failed to fetch collection`),
 	);
 	return data.item;
 }
@@ -213,7 +216,7 @@ export async function deleteCollection(slug: string, force = false): Promise<voi
 		? `${API_BASE}/schema/collections/${slug}?force=true`
 		: `${API_BASE}/schema/collections/${slug}`;
 	const response = await apiFetch(url, { method: "DELETE" });
-	if (!response.ok) await throwResponseError(response, "Failed to delete collection");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete collection`));
 }
 
 /**
@@ -269,7 +272,7 @@ export async function deleteField(collectionSlug: string, fieldSlug: string): Pr
 		`${API_BASE}/schema/collections/${collectionSlug}/fields/${fieldSlug}`,
 		{ method: "DELETE" },
 	);
-	if (!response.ok) await throwResponseError(response, "Failed to delete field");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete field`));
 }
 
 /**
@@ -284,7 +287,7 @@ export async function reorderFields(collectionSlug: string, fieldSlugs: string[]
 			body: JSON.stringify({ fieldSlugs }),
 		},
 	);
-	if (!response.ok) await throwResponseError(response, "Failed to reorder fields");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to reorder fields`));
 }
 
 // ============================================
diff --git a/packages/admin/src/lib/api/sections.ts b/packages/admin/src/lib/api/sections.ts
index c1ae936b9..f2db4a18b 100644
--- a/packages/admin/src/lib/api/sections.ts
+++ b/packages/admin/src/lib/api/sections.ts
@@ -2,6 +2,9 @@
  * Sections API (reusable content blocks)
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import { API_BASE, apiFetch, parseApiResponse, throwResponseError } from "./client.js";
 
 export type SectionSource = "theme" | "user" | "import";
@@ -104,5 +107,5 @@ export async function deleteSection(slug: string): Promise<void> {
 	const response = await apiFetch(`${API_BASE}/sections/${slug}`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete section");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete section`));
 }
diff --git a/packages/admin/src/lib/api/taxonomies.ts b/packages/admin/src/lib/api/taxonomies.ts
index b2bc421f5..42fc2e699 100644
--- a/packages/admin/src/lib/api/taxonomies.ts
+++ b/packages/admin/src/lib/api/taxonomies.ts
@@ -7,6 +7,9 @@
  * that haven't yet been updated).
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import { API_BASE, apiFetch, parseApiResponse, throwResponseError } from "./client.js";
 
 export interface TaxonomyTerm {
@@ -195,7 +198,7 @@ export async function deleteTerm(
 		withLocale(`${API_BASE}/taxonomies/${taxonomyName}/terms/${slug}`, options.locale),
 		{ method: "DELETE" },
 	);
-	if (!response.ok) await throwResponseError(response, "Failed to delete term");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete term`));
 }
 
 /** List every translation (locale variant) of a term. */
diff --git a/packages/admin/src/lib/api/users.ts b/packages/admin/src/lib/api/users.ts
index 4e5144289..46c1a60b3 100644
--- a/packages/admin/src/lib/api/users.ts
+++ b/packages/admin/src/lib/api/users.ts
@@ -2,6 +2,9 @@
  * User management, passkeys, and allowed domains APIs
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import {
 	API_BASE,
 	apiFetch,
@@ -82,10 +85,13 @@ export async function fetchUser(id: string): Promise<UserDetail> {
 		if (response.status === 404) {
 			throw new Error(`User not found: ${id}`);
 		}
-		await throwResponseError(response, "Failed to fetch user");
+		await throwResponseError(response, i18n._(msg`Failed to fetch user`));
 	}
 
-	const data = await parseApiResponse<{ item: UserDetail }>(response, "Failed to fetch user");
+	const data = await parseApiResponse<{ item: UserDetail }>(
+		response,
+		i18n._(msg`Failed to fetch user`),
+	);
 	return data.item;
 }
 
@@ -109,7 +115,7 @@ export async function disableUser(id: string): Promise<void> {
 	const response = await apiFetch(`${API_BASE}/admin/users/${id}/disable`, {
 		method: "POST",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to disable user");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to disable user`));
 }
 
 /**
@@ -119,7 +125,7 @@ export async function sendRecoveryLink(id: string): Promise<void> {
 	const response = await apiFetch(`${API_BASE}/admin/users/${id}/send-recovery`, {
 		method: "POST",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to send recovery link");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to send recovery link`));
 }
 
 /**
@@ -129,7 +135,7 @@ export async function enableUser(id: string): Promise<void> {
 	const response = await apiFetch(`${API_BASE}/admin/users/${id}/enable`, {
 		method: "POST",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to enable user");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to enable user`));
 }
 
 /** Invite response -- includes inviteUrl when no email provider is configured */
@@ -247,7 +253,7 @@ export async function deletePasskey(id: string): Promise<void> {
 	const response = await apiFetch(`${API_BASE}/auth/passkey/${id}`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete passkey");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete passkey`));
 }
 
 // =============================================================================
@@ -335,7 +341,8 @@ export async function deleteAllowedDomain(domain: string): Promise<void> {
 			method: "DELETE",
 		},
 	);
-	if (!response.ok) await throwResponseError(response, "Failed to delete allowed domain");
+	if (!response.ok)
+		await throwResponseError(response, i18n._(msg`Failed to delete allowed domain`));
 }
 
 // =============================================================================
diff --git a/packages/admin/src/lib/api/widgets.ts b/packages/admin/src/lib/api/widgets.ts
index 4a5e010da..84e674541 100644
--- a/packages/admin/src/lib/api/widgets.ts
+++ b/packages/admin/src/lib/api/widgets.ts
@@ -2,6 +2,9 @@
  * Widget areas APIs
  */
 
+import { i18n } from "@lingui/core";
+import { msg } from "@lingui/core/macro";
+
 import { API_BASE, apiFetch, parseApiResponse, throwResponseError } from "./client.js";
 
 export interface WidgetArea {
@@ -102,7 +105,7 @@ export async function deleteWidgetArea(name: string): Promise<void> {
 	const response = await apiFetch(`${API_BASE}/widget-areas/${name}`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete widget area");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete widget area`));
 }
 
 /**
@@ -140,7 +143,7 @@ export async function deleteWidget(areaName: string, widgetId: string): Promise<
 	const response = await apiFetch(`${API_BASE}/widget-areas/${areaName}/widgets/${widgetId}`, {
 		method: "DELETE",
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to delete widget");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to delete widget`));
 }
 
 /**
@@ -152,7 +155,7 @@ export async function reorderWidgets(areaName: string, widgetIds: string[]): Pro
 		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify({ widgetIds }),
 	});
-	if (!response.ok) await throwResponseError(response, "Failed to reorder widgets");
+	if (!response.ok) await throwResponseError(response, i18n._(msg`Failed to reorder widgets`));
 }
 
 /**
diff --git a/packages/admin/tests/components/MenuList.test.tsx b/packages/admin/tests/components/MenuList.test.tsx
index dd51b5e03..92fd5cb35 100644
--- a/packages/admin/tests/components/MenuList.test.tsx
+++ b/packages/admin/tests/components/MenuList.test.tsx
@@ -44,7 +44,7 @@ import * as api from "../../src/lib/api";
 // ---------------------------------------------------------------------------
 
 const MAIN_MENU_ITEMS_REGEX = /main.*3 items/;
-const FOOTER_MENU_ITEMS_REGEX = /footer.*1 items/;
+const FOOTER_MENU_ITEMS_REGEX = /footer.*1 item(?!s)/;
 const DELETE_MENU_CONFIRMATION_REGEX = /Are you sure you want to delete this menu/;
 const CREATE_MENU_REGEX = /Create Menu/;
 

From 7635c9651f6cd32fed83c61e9b3842284737c68e Mon Sep 17 00:00:00 2001
From: Matt Kane <mkane@cloudflare.com>
Date: Thu, 7 May 2026 15:45:22 +0100
Subject: [PATCH 2/2] fix(admin): restore <span> wrappers around BlockMenu i18n
 labels

The previous commit dropped the <span> wrappers around Back/Turn into/Duplicate/Delete
labels when wrapping in t``. The wrappers are needed for consistent flex layout
with the icon and to match the transforms-list pattern.
---
 packages/admin/src/components/editor/BlockMenu.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/admin/src/components/editor/BlockMenu.tsx b/packages/admin/src/components/editor/BlockMenu.tsx
index 518d6eaa9..44658099a 100644
--- a/packages/admin/src/components/editor/BlockMenu.tsx
+++ b/packages/admin/src/components/editor/BlockMenu.tsx
@@ -251,7 +251,7 @@ export function BlockMenu({ editor, anchorElement, isOpen, onClose }: BlockMenuP
 						onClick={() => setShowTransforms(false)}
 					>
 						<CaretPrev className="h-4 w-4" />
-						{t`Back`}
+						<span>{t`Back`}</span>
 					</button>
 					<div className="h-px bg-kumo-line my-1" />
 					{blockTransforms.map((transform) => (
@@ -276,7 +276,7 @@ export function BlockMenu({ editor, anchorElement, isOpen, onClose }: BlockMenuP
 					>
 						<span className="flex items-center gap-2">
 							<Paragraph className="h-4 w-4 text-kumo-subtle" />
-							{t`Turn into`}
+							<span>{t`Turn into`}</span>
 						</span>
 						<CaretNext className="h-4 w-4 text-kumo-subtle" />
 					</button>
@@ -286,7 +286,7 @@ export function BlockMenu({ editor, anchorElement, isOpen, onClose }: BlockMenuP
 						onClick={handleDuplicate}
 					>
 						<Copy className="h-4 w-4 text-kumo-subtle" />
-						{t`Duplicate`}
+						<span>{t`Duplicate`}</span>
 					</button>
 					<div className="h-px bg-kumo-line my-1" />
 					<button
@@ -295,7 +295,7 @@ export function BlockMenu({ editor, anchorElement, isOpen, onClose }: BlockMenuP
 						onClick={handleDelete}
 					>
 						<Trash className="h-4 w-4" />
-						{t`Delete`}
+						<span>{t`Delete`}</span>
 					</button>
 				</div>
 			)}