@open-mercato/core 0.7.1-develop.7181.1.702cedc42c → 0.7.1-develop.7183.1.db9678eeb8

package/dist/modules/translations/di.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/modules/translations/di.ts"],
-  "sourcesContent": ["import { registerTranslatableFields } from '@open-mercato/shared/lib/localization/translatable-fields'\nimport { registerTranslationOverlayPlugin } from '@open-mercato/shared/lib/localization/overlay-plugin'\nimport { translatableFields as catalogFields } from '../catalog/translations'\nimport { translatableFields as dictionaryFields } from '../dictionaries/translations'\nimport { translatableFields as entitiesFields } from '../entities/translations'\nimport { translatableFields as resourcesFields } from '../resources/translations'\nimport { applyTranslationOverlays } from './lib/apply'\nimport { resolveLocaleFromRequest } from './lib/locale'\n\nexport function register() {\n  registerTranslatableFields(catalogFields)\n  registerTranslatableFields(dictionaryFields)\n  registerTranslatableFields(entitiesFields)\n  registerTranslatableFields(resourcesFields)\n  registerTranslationOverlayPlugin(applyTranslationOverlays, resolveLocaleFromRequest)\n}\n"],
-  "mappings": "AAAA,SAAS,kCAAkC;AAC3C,SAAS,wCAAwC;AACjD,SAAS,sBAAsB,qBAAqB;AACpD,SAAS,sBAAsB,wBAAwB;AACvD,SAAS,sBAAsB,sBAAsB;AACrD,SAAS,sBAAsB,uBAAuB;AACtD,SAAS,gCAAgC;AACzC,SAAS,gCAAgC;AAElC,SAAS,WAAW;AACzB,6BAA2B,aAAa;AACxC,6BAA2B,gBAAgB;AAC3C,6BAA2B,cAAc;AACzC,6BAA2B,eAAe;AAC1C,mCAAiC,0BAA0B,wBAAwB;AACrF;",
+  "sourcesContent": ["import { registerTranslatableFields } from '@open-mercato/shared/lib/localization/translatable-fields'\nimport { registerTranslationOverlayPlugin } from '@open-mercato/shared/lib/localization/overlay-plugin'\nimport { registerSupportedLocalesResolver } from '@open-mercato/shared/lib/i18n/locale-registry'\nimport { translatableFields as catalogFields } from '../catalog/translations'\nimport { translatableFields as dictionaryFields } from '../dictionaries/translations'\nimport { translatableFields as entitiesFields } from '../entities/translations'\nimport { translatableFields as resourcesFields } from '../resources/translations'\nimport { applyTranslationOverlays } from './lib/apply'\nimport { resolveLocaleFromRequest } from './lib/locale'\nimport { resolveTenantSupportedLocales } from './lib/supported-locales'\n\n// Registered at module scope, not inside `register()`: module DI registrars only\n// run when the first request container is built, and the root layout resolves the\n// served locale set without ever building one. Inside `register()` the very first\n// render of a fresh process would find an empty resolver slot and serve the\n// un-narrowed set. `di.generated.ts` imports this module statically from the app\n// bootstrap, so the slot is filled at import time instead.\nregisterSupportedLocalesResolver(resolveTenantSupportedLocales)\n\nexport function register() {\n  registerTranslatableFields(catalogFields)\n  registerTranslatableFields(dictionaryFields)\n  registerTranslatableFields(entitiesFields)\n  registerTranslatableFields(resourcesFields)\n  registerTranslationOverlayPlugin(applyTranslationOverlays, resolveLocaleFromRequest)\n}\n"],
+  "mappings": "AAAA,SAAS,kCAAkC;AAC3C,SAAS,wCAAwC;AACjD,SAAS,wCAAwC;AACjD,SAAS,sBAAsB,qBAAqB;AACpD,SAAS,sBAAsB,wBAAwB;AACvD,SAAS,sBAAsB,sBAAsB;AACrD,SAAS,sBAAsB,uBAAuB;AACtD,SAAS,gCAAgC;AACzC,SAAS,gCAAgC;AACzC,SAAS,qCAAqC;AAQ9C,iCAAiC,6BAA6B;AAEvD,SAAS,WAAW;AACzB,6BAA2B,aAAa;AACxC,6BAA2B,gBAAgB;AAC3C,6BAA2B,cAAc;AACzC,6BAA2B,eAAe;AAC1C,mCAAiC,0BAA0B,wBAAwB;AACrF;",
   "names": []
 }

package/dist/modules/translations/lib/supported-locales.js

@@ -0,0 +1,31 @@
+import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
+import { getAuthFromCookies } from "@open-mercato/shared/lib/auth/server";
+import { createLogger } from "@open-mercato/shared/lib/logger";
+const logger = createLogger("translations").child({ component: "supported-locales" });
+const SUPPORTED_LOCALES_CONFIG_MODULE = "translations";
+const SUPPORTED_LOCALES_CONFIG_NAME = "supported_locales";
+async function resolveTenantSupportedLocales() {
+  try {
+    const auth = await getAuthFromCookies();
+    if (!auth?.tenantId) return null;
+    const container = await createRequestContainer();
+    const configService = container.resolve("moduleConfigService");
+    const configured = await configService.getValue(
+      SUPPORTED_LOCALES_CONFIG_MODULE,
+      SUPPORTED_LOCALES_CONFIG_NAME,
+      { defaultValue: null, scope: { tenantId: auth.tenantId } }
+    );
+    if (!Array.isArray(configured)) return null;
+    const codes = configured.filter((code) => typeof code === "string" && code.length > 0);
+    return codes.length > 0 ? codes : null;
+  } catch (err) {
+    logger.debug("Could not resolve tenant supported locales", { err });
+    return null;
+  }
+}
+export {
+  SUPPORTED_LOCALES_CONFIG_MODULE,
+  SUPPORTED_LOCALES_CONFIG_NAME,
+  resolveTenantSupportedLocales
+};
+//# sourceMappingURL=supported-locales.js.map

package/dist/modules/translations/lib/supported-locales.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/translations/lib/supported-locales.ts"],
+  "sourcesContent": ["import { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromCookies } from '@open-mercato/shared/lib/auth/server'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport type { ModuleConfigService } from '@open-mercato/core/modules/configs/lib/module-config-service'\n\nconst logger = createLogger('translations').child({ component: 'supported-locales' })\n\nexport const SUPPORTED_LOCALES_CONFIG_MODULE = 'translations'\nexport const SUPPORTED_LOCALES_CONFIG_NAME = 'supported_locales'\n\n/**\n * The locale codes the signed-in user's tenant has opted into, as managed on\n * Settings \u2192 Module Configs \u2192 Translations, or `null` when there is no tenant\n * context or the tenant has never saved a selection.\n *\n * `null` means \"no opinion\" and leaves the served set untouched \u2014 it is not the\n * same as an empty selection. Reads go through `ModuleConfigService`, which\n * caches for 60s and invalidates on write, so this stays cheap enough to call\n * once per page render.\n */\nexport async function resolveTenantSupportedLocales(): Promise<readonly string[] | null> {\n  try {\n    const auth = await getAuthFromCookies()\n    if (!auth?.tenantId) return null\n\n    const container = await createRequestContainer()\n    const configService = container.resolve('moduleConfigService') as ModuleConfigService\n    const configured = await configService.getValue<string[]>(\n      SUPPORTED_LOCALES_CONFIG_MODULE,\n      SUPPORTED_LOCALES_CONFIG_NAME,\n      { defaultValue: null, scope: { tenantId: auth.tenantId } },\n    )\n\n    if (!Array.isArray(configured)) return null\n    const codes = configured.filter((code): code is string => typeof code === 'string' && code.length > 0)\n    return codes.length > 0 ? codes : null\n  } catch (err) {\n    // Anonymous requests, a container that cannot be built yet during boot, or a\n    // database that is briefly unavailable must not break locale detection \u2014\n    // the caller falls back to the full supported set.\n    logger.debug('Could not resolve tenant supported locales', { err })\n    return null\n  }\n}\n"],
+  "mappings": "AAAA,SAAS,8BAA8B;AACvC,SAAS,0BAA0B;AACnC,SAAS,oBAAoB;AAG7B,MAAM,SAAS,aAAa,cAAc,EAAE,MAAM,EAAE,WAAW,oBAAoB,CAAC;AAE7E,MAAM,kCAAkC;AACxC,MAAM,gCAAgC;AAY7C,eAAsB,gCAAmE;AACvF,MAAI;AACF,UAAM,OAAO,MAAM,mBAAmB;AACtC,QAAI,CAAC,MAAM,SAAU,QAAO;AAE5B,UAAM,YAAY,MAAM,uBAAuB;AAC/C,UAAM,gBAAgB,UAAU,QAAQ,qBAAqB;AAC7D,UAAM,aAAa,MAAM,cAAc;AAAA,MACrC;AAAA,MACA;AAAA,MACA,EAAE,cAAc,MAAM,OAAO,EAAE,UAAU,KAAK,SAAS,EAAE;AAAA,IAC3D;AAEA,QAAI,CAAC,MAAM,QAAQ,UAAU,EAAG,QAAO;AACvC,UAAM,QAAQ,WAAW,OAAO,CAAC,SAAyB,OAAO,SAAS,YAAY,KAAK,SAAS,CAAC;AACrG,WAAO,MAAM,SAAS,IAAI,QAAQ;AAAA,EACpC,SAAS,KAAK;AAIZ,WAAO,MAAM,8CAA8C,EAAE,IAAI,CAAC;AAClE,WAAO;AAAA,EACT;AACF;",
+  "names": []
+}

package/dist/modules/wms/api/warehouseSearch.js

@@ -1,5 +1,5 @@
 import { escapeLikePattern } from "@open-mercato/shared/lib/db/escapeLikePattern";
-import { locales } from "@open-mercato/shared/lib/i18n/config";
+import { getSupportedLocales } from "@open-mercato/shared/lib/i18n/locale-set";
 import { matchCountryCodes } from "@open-mercato/shared/lib/location/countries";
 function buildWarehouseListSearchOr(term) {
   const like = `%${escapeLikePattern(term)}%`;
@@ -9,7 +9,7 @@ function buildWarehouseListSearchOr(term) {
     { city: { $ilike: like } },
     { country: { $ilike: like } }
   ];
-  const matchedCountryCodes = matchCountryCodes(term, { locales });
+  const matchedCountryCodes = matchCountryCodes(term, { locales: [...getSupportedLocales()] });
   if (matchedCountryCodes.length > 0) {
     orFilters.push({ country: { $in: matchedCountryCodes } });
   }

package/dist/modules/wms/api/warehouseSearch.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/wms/api/warehouseSearch.ts"],
-  "sourcesContent": ["import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'\nimport { locales } from '@open-mercato/shared/lib/i18n/config'\nimport { matchCountryCodes } from '@open-mercato/shared/lib/location/countries'\n\n/**\n * Warehouse list search matches name/code/city plus both stored country values:\n * ISO codes (`PL`) and legacy free-text (`Poland`). Localized labels shown in\n * the table (`Poland` / `Polska`) must resolve back to the stored ISO code.\n */\nexport function buildWarehouseListSearchOr(term: string): Array<Record<string, unknown>> {\n  const like = `%${escapeLikePattern(term)}%`\n  const orFilters: Array<Record<string, unknown>> = [\n    { name: { $ilike: like } },\n    { code: { $ilike: like } },\n    { city: { $ilike: like } },\n    { country: { $ilike: like } },\n  ]\n  const matchedCountryCodes = matchCountryCodes(term, { locales })\n  if (matchedCountryCodes.length > 0) {\n    orFilters.push({ country: { $in: matchedCountryCodes } })\n  }\n  return orFilters\n}\n"],
-  "mappings": "AAAA,SAAS,yBAAyB;AAClC,SAAS,eAAe;AACxB,SAAS,yBAAyB;AAO3B,SAAS,2BAA2B,MAA8C;AACvF,QAAM,OAAO,IAAI,kBAAkB,IAAI,CAAC;AACxC,QAAM,YAA4C;AAAA,IAChD,EAAE,MAAM,EAAE,QAAQ,KAAK,EAAE;AAAA,IACzB,EAAE,MAAM,EAAE,QAAQ,KAAK,EAAE;AAAA,IACzB,EAAE,MAAM,EAAE,QAAQ,KAAK,EAAE;AAAA,IACzB,EAAE,SAAS,EAAE,QAAQ,KAAK,EAAE;AAAA,EAC9B;AACA,QAAM,sBAAsB,kBAAkB,MAAM,EAAE,QAAQ,CAAC;AAC/D,MAAI,oBAAoB,SAAS,GAAG;AAClC,cAAU,KAAK,EAAE,SAAS,EAAE,KAAK,oBAAoB,EAAE,CAAC;AAAA,EAC1D;AACA,SAAO;AACT;",
+  "sourcesContent": ["import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'\nimport { getSupportedLocales } from '@open-mercato/shared/lib/i18n/locale-set'\nimport { matchCountryCodes } from '@open-mercato/shared/lib/location/countries'\n\n/**\n * Warehouse list search matches name/code/city plus both stored country values:\n * ISO codes (`PL`) and legacy free-text (`Poland`). Localized labels shown in\n * the table (`Poland` / `Polska`) must resolve back to the stored ISO code.\n */\nexport function buildWarehouseListSearchOr(term: string): Array<Record<string, unknown>> {\n  const like = `%${escapeLikePattern(term)}%`\n  const orFilters: Array<Record<string, unknown>> = [\n    { name: { $ilike: like } },\n    { code: { $ilike: like } },\n    { city: { $ilike: like } },\n    { country: { $ilike: like } },\n  ]\n  // The served set, not the shipped baseline: an operator searching in a locale\n  // their app registered should match country names in that locale too.\n  // `resolveCountryName` goes through `Intl.DisplayNames`, so any code the\n  // runtime has region data for resolves without shipping a table.\n  const matchedCountryCodes = matchCountryCodes(term, { locales: [...getSupportedLocales()] })\n  if (matchedCountryCodes.length > 0) {\n    orFilters.push({ country: { $in: matchedCountryCodes } })\n  }\n  return orFilters\n}\n"],
+  "mappings": "AAAA,SAAS,yBAAyB;AAClC,SAAS,2BAA2B;AACpC,SAAS,yBAAyB;AAO3B,SAAS,2BAA2B,MAA8C;AACvF,QAAM,OAAO,IAAI,kBAAkB,IAAI,CAAC;AACxC,QAAM,YAA4C;AAAA,IAChD,EAAE,MAAM,EAAE,QAAQ,KAAK,EAAE;AAAA,IACzB,EAAE,MAAM,EAAE,QAAQ,KAAK,EAAE;AAAA,IACzB,EAAE,MAAM,EAAE,QAAQ,KAAK,EAAE;AAAA,IACzB,EAAE,SAAS,EAAE,QAAQ,KAAK,EAAE;AAAA,EAC9B;AAKA,QAAM,sBAAsB,kBAAkB,MAAM,EAAE,SAAS,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC;AAC3F,MAAI,oBAAoB,SAAS,GAAG;AAClC,cAAU,KAAK,EAAE,SAAS,EAAE,KAAK,oBAAoB,EAAE,CAAC;AAAA,EAC1D;AACA,SAAO;AACT;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.7.1-develop.7181.1.702cedc42c",
+  "version": "0.7.1-develop.7183.1.db9678eeb8",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -252,16 +252,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.7.1-develop.7181.1.702cedc42c",
-    "@open-mercato/shared": "0.7.1-develop.7181.1.702cedc42c",
-    "@open-mercato/ui": "0.7.1-develop.7181.1.702cedc42c",
+    "@open-mercato/ai-assistant": "0.7.1-develop.7183.1.db9678eeb8",
+    "@open-mercato/shared": "0.7.1-develop.7183.1.db9678eeb8",
+    "@open-mercato/ui": "0.7.1-develop.7183.1.db9678eeb8",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.7.1-develop.7181.1.702cedc42c",
-    "@open-mercato/shared": "0.7.1-develop.7181.1.702cedc42c",
-    "@open-mercato/ui": "0.7.1-develop.7181.1.702cedc42c",
+    "@open-mercato/ai-assistant": "0.7.1-develop.7183.1.db9678eeb8",
+    "@open-mercato/shared": "0.7.1-develop.7183.1.db9678eeb8",
+    "@open-mercato/ui": "0.7.1-develop.7183.1.db9678eeb8",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.3",

package/src/modules/auth/api/locale/route.ts

@@ -1,14 +1,31 @@
 import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
-import { locales, type Locale } from '@open-mercato/shared/lib/i18n/config'
-import { resolveForcedLocale } from '@open-mercato/shared/lib/i18n/locale'
+import {
+  isSupportedLocale,
+  resolveSupportedLocalesForRequest,
+} from '@open-mercato/shared/lib/i18n/locale-registry'
+import { resolveForcedLocale, resolveSupportedLocale } from '@open-mercato/shared/lib/i18n/locale'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { sanitizeRedirectPath } from '@open-mercato/core/modules/auth/lib/safeRedirect'
 import { getAppBaseUrl } from '@open-mercato/shared/lib/url'
 
-const supportedLocales = new Set<Locale>(locales)
-const localeSchema = z.object({ locale: z.enum(locales as [Locale, ...Locale[]]) })
+// Resolved per request, not at module scope: an app or tenant may register a
+// locale after this module is first imported, and a snapshot taken at import
+// time would reject it for the lifetime of the process.
+//
+// This costs the generated OpenAPI its `enum` of valid values, which a closed
+// `z.enum(locales)` used to give for free. That is the honest documentation now
+// rather than a regression: the accepted set is per-tenant (see
+// `resolveLocaleForRequest` below), so any static list published in a spec
+// shared by every tenant would be wrong for most of them. The description points
+// at the endpoint that answers the question for the caller's own tenant.
+const localeSchema = z.object({
+  locale: z
+    .string()
+    .refine(isSupportedLocale, { message: 'Unsupported locale' })
+    .describe('A locale code this tenant serves — one of the `servable` entries returned by `GET /api/translations/locales`. Codes are canonicalized (`de-AT` → `de`).'),
+})
 const localeQuerySchema = localeSchema.extend({
   redirect: z.string().optional(),
 })
@@ -20,6 +37,20 @@ export const metadata = {
   POST: { requireAuth: false },
 }
 
+// Both handlers write the `locale` cookie, and `detectLocale` later reads it back
+// against the *request's* served set — the tenant's selection, not the
+// process-wide registry. Validating against the wider set would make a locale the
+// tenant has not selected return 200 (or 302) and set a year-long cookie that
+// every subsequent render silently discards, so the caller is told the change
+// took effect and nothing ever changes.
+async function resolveLocaleForRequest(value: unknown) {
+  if (typeof value !== 'string') return null
+  // Resolve rather than merely validate: the cookie must hold the canonical
+  // code the registry stores (`pt-BR` → `pt-br`, `cs-CZ` → `cs`), because
+  // `detectLocale` compares it against the served set verbatim.
+  return resolveSupportedLocale(value, await resolveSupportedLocalesForRequest())
+}
+
 export async function POST(req: Request) {
   const { t } = await resolveTranslations()
   if (resolveForcedLocale(process.env)) {
@@ -27,11 +58,12 @@ export async function POST(req: Request) {
   }
   try {
     const { locale } = await req.json()
-    if (typeof locale !== 'string' || !supportedLocales.has(locale as Locale)) {
+    const resolved = await resolveLocaleForRequest(locale)
+    if (!resolved) {
       return NextResponse.json({ error: t('api.errors.invalidLocale', 'Invalid locale') }, { status: 400 })
     }
     const res = NextResponse.json({ ok: true })
-    res.cookies.set('locale', locale as Locale, { path: '/', maxAge: 60 * 60 * 24 * 365 })
+    res.cookies.set('locale', resolved, { path: '/', maxAge: 60 * 60 * 24 * 365 })
     return res
   } catch {
     return NextResponse.json({ error: t('api.errors.badRequest', 'Bad request') }, { status: 400 })
@@ -44,14 +76,14 @@ export async function GET(req: Request) {
     return NextResponse.json({ error: t('api.errors.localeForced', 'Locale is fixed by configuration') }, { status: 409 })
   }
   const url = new URL(req.url)
-  const locale = url.searchParams.get('locale')
-  if (!locale || !supportedLocales.has(locale as Locale)) {
+  const resolved = await resolveLocaleForRequest(url.searchParams.get('locale'))
+  if (!resolved) {
     return NextResponse.json({ error: t('api.errors.invalidLocale', 'Invalid locale') }, { status: 400 })
   }
   const baseUrl = getAppBaseUrl(req)
   const safePath = sanitizeRedirectPath(url.searchParams.get('redirect'), baseUrl, '/')
   const res = NextResponse.redirect(new URL(safePath, url.origin))
-  res.cookies.set('locale', locale as Locale, { path: '/', maxAge: 60 * 60 * 24 * 365 })
+  res.cookies.set('locale', resolved, { path: '/', maxAge: 60 * 60 * 24 * 365 })
   return res
 }
 

package/src/modules/translations/api/get/locales.ts

@@ -3,6 +3,7 @@ import { z } from 'zod'
 import { resolveTranslationsRouteContext } from '@open-mercato/core/modules/translations/api/context'
 import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { locales as defaultLocales } from '@open-mercato/shared/lib/i18n/config'
+import { getSupportedLocales } from '@open-mercato/shared/lib/i18n/locale-set'
 import type { ModuleConfigService } from '@open-mercato/core/modules/configs/lib/module-config-service'
 import type { OpenApiMethodDoc, OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { createLogger } from '@open-mercato/shared/lib/logger'
@@ -24,7 +25,15 @@ async function GET(req: Request) {
       scope: { tenantId: context.tenantId },
     })
 
-    return NextResponse.json({ locales: Array.isArray(locales) ? locales : [...defaultLocales] })
+    // `servable` is what the application can actually render its own UI in
+    // (platform baseline plus app-registered locales). The stored selection also
+    // drives the content-translation editor, which accepts any ISO 639-1 code, so
+    // the two sets differ and the settings screen has to be able to tell them
+    // apart before it claims a locale was added to the UI language set.
+    return NextResponse.json({
+      locales: Array.isArray(locales) ? locales : [...defaultLocales],
+      servable: [...getSupportedLocales()],
+    })
   } catch (err) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
@@ -36,6 +45,7 @@ async function GET(req: Request) {
 
 const responseSchema = z.object({
   locales: z.array(z.string()),
+  servable: z.array(z.string()),
 })
 
 const getDoc: OpenApiMethodDoc = {

package/src/modules/translations/components/TranslationManager.tsx

@@ -4,6 +4,7 @@ import * as React from 'react'
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { IconButton } from '@open-mercato/ui/primitives/icon-button'
+import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Tabs, TabsList, TabsTrigger } from '@open-mercato/ui/primitives/tabs'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { ComboboxInput } from '@open-mercato/ui/backend/inputs'
@@ -17,7 +18,7 @@ import { useCustomFieldDefs } from '@open-mercato/ui/backend/utils/customFieldDe
 import { Save, Plus, X } from 'lucide-react'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { locales as defaultLocales } from '@open-mercato/shared/lib/i18n/config'
+import { defaultLocale, locales as defaultLocales } from '@open-mercato/shared/lib/i18n/config'
 import { ISO_639_1, isValidIso639, getIso639Label } from '@open-mercato/shared/lib/i18n/iso639'
 import { formatEntityLabel, buildEntityListUrl, getRecordLabel, resolveBaseValue } from '../lib/helpers'
 import { resolveFieldList } from '../lib/resolve-field-list'
@@ -48,15 +49,27 @@ type TranslationsResponse = {
   updatedAt?: string
 }
 
+type TranslationLocales = {
+  /** The tenant's stored selection: which locales content can be translated into. */
+  locales: string[]
+  /** Which of those the admin UI itself can be rendered in. Resolved on the server. */
+  servable: string[]
+}
+
 function useTranslationLocales() {
-  return useQuery<string[]>({
+  return useQuery<TranslationLocales>({
     queryKey: ['translation-locales'],
     queryFn: async () => {
-      const res = await apiCall<{ locales: string[] }>('/api/translations/locales')
-      if (!res.ok) return [...defaultLocales]
-      return Array.isArray(res.result?.locales) && res.result.locales.length > 0
+      const res = await apiCall<TranslationLocales>('/api/translations/locales')
+      const fallback = { locales: [...defaultLocales], servable: [...defaultLocales] }
+      if (!res.ok) return fallback
+      const locales = Array.isArray(res.result?.locales) && res.result.locales.length > 0
         ? res.result.locales
         : [...defaultLocales]
+      const servable = Array.isArray(res.result?.servable) && res.result.servable.length > 0
+        ? res.result.servable
+        : [...defaultLocales]
+      return { locales, servable }
     },
     staleTime: 60_000,
   })
@@ -85,7 +98,10 @@ export function TranslationManager({
   const entityType = isEmbedded ? (propEntityType ?? '') : selectedEntityType
   const recordId = isEmbedded ? (propRecordId ?? '') : selectedRecordId
 
-  const { data: locales = [...defaultLocales] } = useTranslationLocales()
+  const { data: localeData } = useTranslationLocales()
+  // Memoized: `locales` feeds effect dependency lists below, and a fresh array
+  // on every render while the query is still loading would re-fire them.
+  const locales = React.useMemo(() => localeData?.locales ?? [...defaultLocales], [localeData])
 
   React.useEffect(() => {
     if (locales.length > 0 && (!activeLocale || !locales.includes(activeLocale))) {
@@ -572,7 +588,9 @@ export function TranslationManager({
 export function LocaleManager() {
   const t = useT()
   const queryClient = useQueryClient()
-  const { data: locales = [], isLoading } = useTranslationLocales()
+  const { data: localeData, isLoading } = useTranslationLocales()
+  const locales = React.useMemo(() => localeData?.locales ?? [], [localeData])
+  const servable = React.useMemo(() => localeData?.servable ?? [], [localeData])
   const [newLocale, setNewLocale] = React.useState('')
 
   const { runMutation, retryLastMutation } = useGuardedMutation<{
@@ -603,7 +621,16 @@ export function LocaleManager() {
       })
     },
     onSuccess: (result) => {
-      queryClient.setQueryData(['translation-locales'], result)
+      // The PUT response carries the stored selection only, so `servable` has to
+      // come from the cached entry. With no entry to read, defaulting it to `[]`
+      // would mark every chip "Content only" — including the shipped locales —
+      // which is the one answer that is definitely wrong. Refetch instead.
+      const previous = queryClient.getQueryData<TranslationLocales>(['translation-locales'])
+      if (previous) {
+        queryClient.setQueryData<TranslationLocales>(['translation-locales'], { ...previous, locales: result })
+      } else {
+        void queryClient.invalidateQueries({ queryKey: ['translation-locales'] })
+      }
       flash(t('translations.locales.flash.saved', 'Locales updated'), 'success')
     },
     onError: () => {
@@ -611,11 +638,32 @@ export function LocaleManager() {
     },
   })
 
+  // A locale the app has no dictionary for can be translated into, but the admin
+  // UI can never be shown in it — `resolveSupportedLocalesForRequest` intersects
+  // the selection with what the app serves. Saying so at the point of action is
+  // what keeps the successful-looking add honest.
+  const contentOnlyLabel = t('translations.locales.contentOnly', 'Content only')
+  const isServable = React.useCallback(
+    (code: string) => servable.includes(code.toLowerCase()),
+    [servable],
+  )
+
   const availableLocales = React.useMemo(
     () => ISO_639_1.filter((entry) => !locales.includes(entry.code)).map((entry) => ({
       value: entry.code,
-      label: `${entry.code.toUpperCase()} — ${entry.label}`,
+      label: isServable(entry.code)
+        ? `${entry.code.toUpperCase()} — ${entry.label}`
+        : `${entry.code.toUpperCase()} — ${entry.label} (${contentOnlyLabel})`,
     })),
+    [locales, isServable, contentOnlyLabel],
+  )
+
+  // `resolveSupportedLocalesForRequest` keeps `defaultLocale` in the served set
+  // whatever the stored selection says, so a tenant whose saved list omits it
+  // still gets it in the language switcher. Rendering the raw selection here
+  // would leave this screen and the switcher disagreeing about what is served.
+  const chips = React.useMemo(
+    () => (locales.includes(defaultLocale) ? locales : [defaultLocale, ...locales]),
     [locales],
   )
 
@@ -628,6 +676,10 @@ export function LocaleManager() {
 
   const removeLocale = (locale: string) => {
     if (locales.length <= 1) return
+    // The default locale stays servable whatever the selection says
+    // (`resolveSupportedLocalesForRequest` re-adds it), so letting it be removed
+    // here would leave the chip list claiming something untrue.
+    if (locale === defaultLocale) return
     mutation.mutate(locales.filter((l) => l !== locale))
   }
 
@@ -640,33 +692,49 @@ export function LocaleManager() {
       <div className="space-y-1">
         <h3 className="text-lg font-semibold">{t('translations.locales.title', 'Supported locales')}</h3>
         <p className="text-sm text-muted-foreground">
-          {t('translations.locales.description', 'Configure which locales are available for translations. Add ISO language codes (e.g. fr, it, ja, zh).')}
+          {t('translations.locales.description', 'Which languages content can be translated into. A language the application ships an interface for is also offered in the admin language switcher; the rest are available for content only.')}
         </p>
       </div>
 
       <div className="flex flex-wrap gap-2">
-        {locales.map((locale) => (
-          <span
-            key={locale}
-            className="inline-flex items-center gap-1.5 rounded-full border bg-muted/50 px-3 py-1 text-sm font-medium"
-            title={getIso639Label(locale) ?? locale}
-          >
-            {locale.toUpperCase()}{getIso639Label(locale) ? ` — ${getIso639Label(locale)}` : ''}
-            {locales.length > 1 && (
-              <IconButton
-                variant="ghost"
-                size="xs"
-                fullRadius
-                aria-label={t('translations.locales.remove', 'Remove {{locale}}', { locale: getIso639Label(locale) ?? locale.toUpperCase() })}
-                title={t('translations.locales.remove', 'Remove {{locale}}', { locale: getIso639Label(locale) ?? locale.toUpperCase() })}
-                onClick={() => removeLocale(locale)}
-                disabled={mutation.isPending}
-              >
-                <X className="h-3 w-3" />
-              </IconButton>
-            )}
-          </span>
-        ))}
+        {chips.map((locale) => {
+          const localeLabel = getIso639Label(locale) ?? locale.toUpperCase()
+          const isDefault = locale === defaultLocale
+          const isStored = locales.includes(locale)
+          const removeLabel = t('translations.locales.remove', 'Remove {{locale}}', { locale: localeLabel })
+          const defaultLabel = t(
+            'translations.locales.alwaysServed',
+            '{{locale}} is the default language and is always served, so it cannot be removed.',
+            { locale: localeLabel },
+          )
+          return (
+            <span
+              key={locale}
+              className="inline-flex items-center gap-1.5 rounded-full border bg-muted/50 px-3 py-1 text-sm font-medium"
+              title={isStored ? (getIso639Label(locale) ?? locale) : defaultLabel}
+            >
+              {locale.toUpperCase()}{getIso639Label(locale) ? ` — ${getIso639Label(locale)}` : ''}
+              {!isServable(locale) && (
+                <Badge variant="outline" size="sm" title={t('translations.locales.contentOnlyHint', 'The application ships no interface for this language, so it is available for content translations only.')}>
+                  {contentOnlyLabel}
+                </Badge>
+              )}
+              {isStored && locales.length > 1 && (
+                <IconButton
+                  variant="ghost"
+                  size="xs"
+                  fullRadius
+                  aria-label={isDefault ? defaultLabel : removeLabel}
+                  title={isDefault ? defaultLabel : removeLabel}
+                  onClick={() => removeLocale(locale)}
+                  disabled={mutation.isPending || isDefault}
+                >
+                  <X className="h-3 w-3" />
+                </IconButton>
+              )}
+            </span>
+          )
+        })}
       </div>
 
       <div className="flex gap-2 items-center">
@@ -674,11 +742,12 @@ export function LocaleManager() {
           <ComboboxInput
             value={newLocale}
             onChange={setNewLocale}
-            placeholder={t('translations.locales.addPlaceholder', 'Search language...')}
+            placeholder={t('translations.locales.addPlaceholder', 'e.g. fr, it, ja...')}
             suggestions={availableLocales}
             resolveLabel={(value) => {
               const label = getIso639Label(value)
-              return label ? `${value.toUpperCase()} — ${label}` : value.toUpperCase()
+              const base = label ? `${value.toUpperCase()} — ${label}` : value.toUpperCase()
+              return isServable(value) ? base : `${base} (${contentOnlyLabel})`
             }}
           />
         </div>

package/src/modules/translations/di.ts

@@ -1,11 +1,21 @@
 import { registerTranslatableFields } from '@open-mercato/shared/lib/localization/translatable-fields'
 import { registerTranslationOverlayPlugin } from '@open-mercato/shared/lib/localization/overlay-plugin'
+import { registerSupportedLocalesResolver } from '@open-mercato/shared/lib/i18n/locale-registry'
 import { translatableFields as catalogFields } from '../catalog/translations'
 import { translatableFields as dictionaryFields } from '../dictionaries/translations'
 import { translatableFields as entitiesFields } from '../entities/translations'
 import { translatableFields as resourcesFields } from '../resources/translations'
 import { applyTranslationOverlays } from './lib/apply'
 import { resolveLocaleFromRequest } from './lib/locale'
+import { resolveTenantSupportedLocales } from './lib/supported-locales'
+
+// Registered at module scope, not inside `register()`: module DI registrars only
+// run when the first request container is built, and the root layout resolves the
+// served locale set without ever building one. Inside `register()` the very first
+// render of a fresh process would find an empty resolver slot and serve the
+// un-narrowed set. `di.generated.ts` imports this module statically from the app
+// bootstrap, so the slot is filled at import time instead.
+registerSupportedLocalesResolver(resolveTenantSupportedLocales)
 
 export function register() {
   registerTranslatableFields(catalogFields)

package/src/modules/translations/i18n/de.json

@@ -2,7 +2,10 @@
   "translations.config.nav.title": "Übersetzungen",
   "translations.locales.add": "Hinzufügen",
   "translations.locales.addPlaceholder": "z.B. fr, it, ja...",
-  "translations.locales.description": "Konfiguriere die verfügbaren Sprachen für Übersetzungen. Füge ISO-Sprachcodes hinzu (z.B. fr, it, ja, zh).",
+  "translations.locales.alwaysServed": "{{locale}} ist die Standardsprache und wird immer ausgeliefert, daher kann sie nicht entfernt werden.",
+  "translations.locales.contentOnly": "Nur Inhalte",
+  "translations.locales.contentOnlyHint": "Die Anwendung liefert keine Oberfläche in dieser Sprache, sie steht daher nur für Inhaltsübersetzungen zur Verfügung.",
+  "translations.locales.description": "Sprachen, in die Inhalte übersetzt werden können. Eine Sprache, für die die Anwendung eine Oberfläche mitliefert, erscheint auch in der Sprachauswahl des Backends; die übrigen stehen nur für Inhalte zur Verfügung.",
   "translations.locales.flash.error": "Fehler beim Aktualisieren der Sprachen",
   "translations.locales.flash.saved": "Sprachen aktualisiert",
   "translations.locales.loading": "Sprachen werden geladen...",

package/src/modules/translations/i18n/en.json

@@ -2,7 +2,10 @@
   "translations.config.nav.title": "Translations",
   "translations.locales.add": "Add",
   "translations.locales.addPlaceholder": "e.g. fr, it, ja...",
-  "translations.locales.description": "Configure which locales are available for translations. Add ISO language codes (e.g. fr, it, ja, zh).",
+  "translations.locales.alwaysServed": "{{locale}} is the default language and is always served, so it cannot be removed.",
+  "translations.locales.contentOnly": "Content only",
+  "translations.locales.contentOnlyHint": "The application ships no interface for this language, so it is available for content translations only.",
+  "translations.locales.description": "Which languages content can be translated into. A language the application ships an interface for is also offered in the admin language switcher; the rest are available for content only.",
   "translations.locales.flash.error": "Failed to update locales",
   "translations.locales.flash.saved": "Locales updated",
   "translations.locales.loading": "Loading locales...",

package/src/modules/translations/i18n/es.json

@@ -2,7 +2,10 @@
   "translations.config.nav.title": "Traducciones",
   "translations.locales.add": "Añadir",
   "translations.locales.addPlaceholder": "p. ej. fr, it, ja...",
-  "translations.locales.description": "Configura los idiomas disponibles para las traducciones. Añade códigos ISO de idioma (p. ej. fr, it, ja, zh).",
+  "translations.locales.alwaysServed": "{{locale}} es el idioma predeterminado y siempre se ofrece, por lo que no se puede eliminar.",
+  "translations.locales.contentOnly": "Solo contenido",
+  "translations.locales.contentOnlyHint": "La aplicación no incluye interfaz en este idioma, por lo que solo está disponible para traducciones de contenido.",
+  "translations.locales.description": "Idiomas a los que se puede traducir el contenido. Un idioma para el que la aplicación incluye interfaz también aparece en el selector de idioma del panel; el resto solo está disponible para contenido.",
   "translations.locales.flash.error": "Error al actualizar los idiomas",
   "translations.locales.flash.saved": "Idiomas actualizados",
   "translations.locales.loading": "Cargando idiomas...",

package/src/modules/translations/i18n/ko.json

@@ -2,7 +2,10 @@
   "translations.config.nav.title": "번역",
   "translations.locales.add": "추가",
   "translations.locales.addPlaceholder": "예: fr, it, ja...",
-  "translations.locales.description": "번역에 사용할 로케일을 설정하세요. ISO 언어 코드를 추가하세요 (예: fr, it, ja, zh).",
+  "translations.locales.alwaysServed": "{{locale}}은(는) 기본 언어로 항상 제공되므로 제거할 수 없습니다.",
+  "translations.locales.contentOnly": "콘텐츠 전용",
+  "translations.locales.contentOnlyHint": "애플리케이션이 이 언어의 인터페이스를 제공하지 않으므로 콘텐츠 번역에만 사용할 수 있습니다.",
+  "translations.locales.description": "콘텐츠를 번역할 수 있는 언어입니다. 애플리케이션이 인터페이스를 제공하는 언어는 관리자 언어 전환기에도 표시되며, 나머지는 콘텐츠 번역에만 사용됩니다.",
   "translations.locales.flash.error": "로케일 업데이트에 실패했습니다",
   "translations.locales.flash.saved": "로케일이 업데이트되었습니다",
   "translations.locales.loading": "로케일을 불러오는 중...",

package/src/modules/translations/i18n/pl.json

@@ -2,7 +2,10 @@
   "translations.config.nav.title": "Tłumaczenia",
   "translations.locales.add": "Dodaj",
   "translations.locales.addPlaceholder": "np. fr, it, ja...",
-  "translations.locales.description": "Skonfiguruj dostępne języki dla tłumaczeń. Dodaj kody ISO języków (np. fr, it, ja, zh).",
+  "translations.locales.alwaysServed": "{{locale}} jest językiem domyślnym i zawsze pozostaje dostępny, dlatego nie można go usunąć.",
+  "translations.locales.contentOnly": "Tylko treści",
+  "translations.locales.contentOnlyHint": "Aplikacja nie ma interfejsu w tym języku, więc służy on wyłącznie do tłumaczenia treści.",
+  "translations.locales.description": "Języki, na które można tłumaczyć treści. Język, dla którego aplikacja ma interfejs, jest też dostępny w przełączniku języka panelu; pozostałe służą wyłącznie do tłumaczenia treści.",
   "translations.locales.flash.error": "Nie udało się zaktualizować języków",
   "translations.locales.flash.saved": "Języki zaktualizowane",
   "translations.locales.loading": "Ładowanie języków...",

package/src/modules/translations/lib/supported-locales.ts

@@ -0,0 +1,44 @@
+import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
+import { getAuthFromCookies } from '@open-mercato/shared/lib/auth/server'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+import type { ModuleConfigService } from '@open-mercato/core/modules/configs/lib/module-config-service'
+
+const logger = createLogger('translations').child({ component: 'supported-locales' })
+
+export const SUPPORTED_LOCALES_CONFIG_MODULE = 'translations'
+export const SUPPORTED_LOCALES_CONFIG_NAME = 'supported_locales'
+
+/**
+ * The locale codes the signed-in user's tenant has opted into, as managed on
+ * Settings → Module Configs → Translations, or `null` when there is no tenant
+ * context or the tenant has never saved a selection.
+ *
+ * `null` means "no opinion" and leaves the served set untouched — it is not the
+ * same as an empty selection. Reads go through `ModuleConfigService`, which
+ * caches for 60s and invalidates on write, so this stays cheap enough to call
+ * once per page render.
+ */
+export async function resolveTenantSupportedLocales(): Promise<readonly string[] | null> {
+  try {
+    const auth = await getAuthFromCookies()
+    if (!auth?.tenantId) return null
+
+    const container = await createRequestContainer()
+    const configService = container.resolve('moduleConfigService') as ModuleConfigService
+    const configured = await configService.getValue<string[]>(
+      SUPPORTED_LOCALES_CONFIG_MODULE,
+      SUPPORTED_LOCALES_CONFIG_NAME,
+      { defaultValue: null, scope: { tenantId: auth.tenantId } },
+    )
+
+    if (!Array.isArray(configured)) return null
+    const codes = configured.filter((code): code is string => typeof code === 'string' && code.length > 0)
+    return codes.length > 0 ? codes : null
+  } catch (err) {
+    // Anonymous requests, a container that cannot be built yet during boot, or a
+    // database that is briefly unavailable must not break locale detection —
+    // the caller falls back to the full supported set.
+    logger.debug('Could not resolve tenant supported locales', { err })
+    return null
+  }
+}