@open-mercato/core 0.6.6 → 0.6.7-develop.6552.1.5208a19369

package/src/modules/dictionaries/fields/dictionary.tsx

@@ -90,9 +90,12 @@ function DictionaryFieldDefEditor({ def, onChange }: { def: { configJson?: Dicti
   const [error, setError] = React.useState<string | null>(null)
   const multiId = React.useId()
   const inlineCreateId = React.useId()
+  const inlineCreateHintId = React.useId()
+  const defaultValueHintId = React.useId()
   const selectedId = typeof def?.configJson?.dictionaryId === 'string' ? def?.configJson?.dictionaryId : ''
   const inlineCreate = def?.configJson?.dictionaryInlineCreate !== false
   const isMulti = def?.configJson?.multi === true
+  const inlineCreateDisabled = !selectedId || isMulti
   const errorLoadLabel = t('dictionaries.customFields.errorLoad', 'Failed to load dictionaries.')
 
   React.useEffect(() => {
@@ -181,45 +184,65 @@ function DictionaryFieldDefEditor({ def, onChange }: { def: { configJson?: Dicti
           </a>
         </div>
       ) : null}
-      <div className="inline-flex items-center gap-2 text-xs">
-        <Checkbox
-          id={multiId}
-          checked={isMulti}
-          onCheckedChange={(checked) => {
-            const enabled = checked === true
-            onChange({ multi: enabled, defaultValue: enabled ? undefined : def?.configJson?.defaultValue })
-          }}
-          disabled={!selectedId}
-        />
-        <label
-          htmlFor={multiId}
-          className={selectedId ? 'cursor-pointer select-none' : 'cursor-not-allowed opacity-60'}
-        >
-          {t('dictionaries.customFields.allowMultiple', 'Allow selecting multiple entries')}
-        </label>
-      </div>
-      {!isMulti ? (
-        <div className="inline-flex items-center gap-2 text-xs">
-          <Checkbox
-            id={inlineCreateId}
-            checked={inlineCreate}
-            onCheckedChange={(checked) => onChange({ dictionaryInlineCreate: checked === true })}
-            disabled={!selectedId}
-          />
-          <label
-            htmlFor={inlineCreateId}
-            className={selectedId ? 'cursor-pointer select-none' : 'cursor-not-allowed opacity-60'}
-          >
-            {t('dictionaries.customFields.allowInlineCreate', 'Allow inline creation inside forms')}
-          </label>
+      <div className="space-y-2">
+        <div className="flex flex-col gap-2 sm:flex-row sm:flex-wrap sm:items-center sm:gap-x-4">
+          <div className="inline-flex items-center gap-2 text-xs">
+            <Checkbox
+              id={multiId}
+              checked={isMulti}
+              onCheckedChange={(checked) => {
+                const enabled = checked === true
+                onChange({ multi: enabled, defaultValue: enabled ? undefined : def?.configJson?.defaultValue })
+              }}
+              disabled={!selectedId}
+            />
+            <label
+              htmlFor={multiId}
+              className={selectedId ? 'cursor-pointer select-none' : 'cursor-not-allowed opacity-60'}
+            >
+              {t('dictionaries.customFields.allowMultiple', 'Allow selecting multiple entries')}
+            </label>
+          </div>
+          <div className="inline-flex items-center gap-2 text-xs">
+            <Checkbox
+              id={inlineCreateId}
+              checked={!isMulti && inlineCreate}
+              onCheckedChange={(checked) => onChange({ dictionaryInlineCreate: checked === true })}
+              disabled={inlineCreateDisabled}
+              aria-describedby={isMulti ? inlineCreateHintId : undefined}
+            />
+            <label
+              htmlFor={inlineCreateId}
+              className={!inlineCreateDisabled ? 'cursor-pointer select-none' : 'cursor-not-allowed opacity-60'}
+            >
+              {t('dictionaries.customFields.allowInlineCreate', 'Allow inline creation inside forms')}
+            </label>
+          </div>
         </div>
-      ) : null}
+        {isMulti ? (
+          <p id={inlineCreateHintId} className="text-xs text-muted-foreground">
+            {t(
+              'dictionaries.customFields.inlineCreateSingleOnly',
+              'Inline creation is available for single-entry dictionary fields only.',
+            )}
+          </p>
+        ) : null}
+      </div>
       {selectedId && !isMulti ? (
         <DictionaryDefaultSelector
           dictionaryId={selectedId}
           defaultValue={typeof def?.configJson?.defaultValue === 'string' ? def.configJson.defaultValue : ''}
           onChange={(value) => onChange({ defaultValue: value || undefined })}
         />
+      ) : selectedId && isMulti ? (
+        <div className="inline-flex items-center gap-2 text-xs">
+          <p id={defaultValueHintId} className="text-xs text-muted-foreground">
+            {t(
+              'dictionaries.customFields.defaultValueMultiUnavailable',
+              'Default values are not available for multi-select dictionary fields.',
+            )}
+          </p>
+        </div>
       ) : null}
     </div>
   )

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

@@ -82,6 +82,7 @@
   "dictionaries.customFields.allowInlineCreate": "Inline-Erstellung in Formularen erlauben",
   "dictionaries.customFields.allowMultiple": "Mehrere Einträge auswählen erlauben",
   "dictionaries.customFields.defaultValue": "Standardwert",
+  "dictionaries.customFields.defaultValueMultiUnavailable": "Standardwerte sind für Wörterbuchfelder mit Mehrfachauswahl nicht verfügbar.",
   "dictionaries.customFields.defaultValueNone": "Kein Standardwert",
   "dictionaries.customFields.defaultValueStale": "Standardeintrag nicht gefunden — er wurde möglicherweise gelöscht oder umbenannt.",
   "dictionaries.customFields.dictionaryLabel": "Quelle des Wörterbuchs",
@@ -89,6 +90,7 @@
   "dictionaries.customFields.empty": "Noch keine Wörterbücher verfügbar. Erstellen Sie zuerst eines.",
   "dictionaries.customFields.errorLoad": "Wörterbücher konnten nicht geladen werden.",
   "dictionaries.customFields.inactive": "inaktiv",
+  "dictionaries.customFields.inlineCreateSingleOnly": "Inline-Erstellung ist nur für Wörterbuchfelder mit Einzelauswahl verfügbar.",
   "dictionaries.customFields.loading": "Wörterbücher werden geladen…",
   "dictionaries.customFields.manageLink": "Wörterbücher verwalten",
   "dictionaries.customFields.selectedHint": "Einträge aus diesem Wörterbuch füllen das Feld.",

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

@@ -82,6 +82,7 @@
   "dictionaries.customFields.allowInlineCreate": "Allow inline creation inside forms",
   "dictionaries.customFields.allowMultiple": "Allow selecting multiple entries",
   "dictionaries.customFields.defaultValue": "Default value",
+  "dictionaries.customFields.defaultValueMultiUnavailable": "Default values are not available for multi-select dictionary fields.",
   "dictionaries.customFields.defaultValueNone": "No default",
   "dictionaries.customFields.defaultValueStale": "Default entry not found — it may have been deleted or renamed.",
   "dictionaries.customFields.dictionaryLabel": "Dictionary source",
@@ -89,6 +90,7 @@
   "dictionaries.customFields.empty": "No dictionaries available yet. Create one first.",
   "dictionaries.customFields.errorLoad": "Failed to load dictionaries.",
   "dictionaries.customFields.inactive": "inactive",
+  "dictionaries.customFields.inlineCreateSingleOnly": "Inline creation is available for single-entry dictionary fields only.",
   "dictionaries.customFields.loading": "Loading dictionaries…",
   "dictionaries.customFields.manageLink": "Manage dictionaries",
   "dictionaries.customFields.selectedHint": "Entries from this dictionary populate the field.",

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

@@ -82,6 +82,7 @@
   "dictionaries.customFields.allowInlineCreate": "Permitir creación en línea dentro de los formularios",
   "dictionaries.customFields.allowMultiple": "Permitir seleccionar varias entradas",
   "dictionaries.customFields.defaultValue": "Valor predeterminado",
+  "dictionaries.customFields.defaultValueMultiUnavailable": "Los valores predeterminados no están disponibles para campos de diccionario con selección múltiple.",
   "dictionaries.customFields.defaultValueNone": "Sin valor predeterminado",
   "dictionaries.customFields.defaultValueStale": "No se encontró la entrada predeterminada; puede haber sido eliminada o renombrada.",
   "dictionaries.customFields.dictionaryLabel": "Fuente del diccionario",
@@ -89,6 +90,7 @@
   "dictionaries.customFields.empty": "Aún no hay diccionarios disponibles. Crea uno primero.",
   "dictionaries.customFields.errorLoad": "No se pudieron cargar los diccionarios.",
   "dictionaries.customFields.inactive": "inactivo",
+  "dictionaries.customFields.inlineCreateSingleOnly": "La creación en línea solo está disponible para campos de diccionario de una sola entrada.",
   "dictionaries.customFields.loading": "Cargando diccionarios…",
   "dictionaries.customFields.manageLink": "Administrar diccionarios",
   "dictionaries.customFields.selectedHint": "Las entradas de este diccionario rellenarán el campo.",

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

@@ -82,6 +82,7 @@
   "dictionaries.customFields.allowInlineCreate": "Zezwól na tworzenie w formularzach",
   "dictionaries.customFields.allowMultiple": "Zezwól na wybór wielu wpisów",
   "dictionaries.customFields.defaultValue": "Wartość domyślna",
+  "dictionaries.customFields.defaultValueMultiUnavailable": "Wartości domyślne nie są dostępne dla wielokrotnego wyboru wpisów słownika.",
   "dictionaries.customFields.defaultValueNone": "Brak wartości domyślnej",
   "dictionaries.customFields.defaultValueStale": "Nie znaleziono domyślnego wpisu — mógł zostać usunięty albo przemianowany.",
   "dictionaries.customFields.dictionaryLabel": "Źródło słownika",
@@ -89,6 +90,7 @@
   "dictionaries.customFields.empty": "Brak dostępnych słowników. Najpierw utwórz jeden.",
   "dictionaries.customFields.errorLoad": "Nie udało się wczytać słowników.",
   "dictionaries.customFields.inactive": "nieaktywne",
+  "dictionaries.customFields.inlineCreateSingleOnly": "Tworzenie wpisów w formularzu jest dostępne tylko dla pól z pojedynczym wyborem.",
   "dictionaries.customFields.loading": "Ładowanie słowników…",
   "dictionaries.customFields.manageLink": "Zarządzaj słownikami",
   "dictionaries.customFields.selectedHint": "Wpisy z tego słownika uzupełnią pole.",

package/src/modules/directory/utils/organizationScope.ts

@@ -18,6 +18,13 @@ export type OrganizationScope = {
   filterIds: string[] | null
   allowedIds: string[] | null
   tenantId: string | null
+  // True when the caller explicitly selected a concrete organization (cookie /
+  // selectedId param) that could not be honored — it does not exist for the
+  // tenant or is not accessible. Reads degrade gracefully (filterIds/selectedId
+  // fall back to the caller's accessible orgs), but writes MUST fail loudly on
+  // this so a record never lands under an org the caller did not intend. Absent
+  // (undefined) means the selection — if any — was honored.
+  selectionRejected?: boolean
 }
 
 // Phase 4 — short-TTL cache for resolveOrganizationScopeForRequest.
@@ -79,7 +86,8 @@ function isValidCachedScope(value: unknown): value is OrganizationScope {
   const record = value as Partial<OrganizationScope>
   const idOk = (v: unknown) => v === null || typeof v === 'string'
   const arrOk = (v: unknown) => v === null || (Array.isArray(v) && v.every((entry) => typeof entry === 'string'))
-  return idOk(record.selectedId) && idOk(record.tenantId) && arrOk(record.filterIds) && arrOk(record.allowedIds)
+  const flagOk = record.selectionRejected === undefined || typeof record.selectionRejected === 'boolean'
+  return idOk(record.selectedId) && idOk(record.tenantId) && arrOk(record.filterIds) && arrOk(record.allowedIds) && flagOk
 }
 
 function resolveCacheFromContainer(container: AwilixContainer | null | undefined): CacheStrategy | null {
@@ -320,9 +328,18 @@ export async function resolveOrganizationScope({
   const initialSelected =
     normalizedSelectedId
     ?? (widenToAllOrgs ? null : accountOrgId ?? null)
+  // A selection is only honored when it resolves to a real, non-deleted org for
+  // this tenant. `orgDescendants` holds exactly the existing orgs among the
+  // candidate ids, so a stale/dead id (e.g. a selected-org cookie or JWT org
+  // that no longer resolves after a DB reset) has no entry and is dropped here.
+  // Without the existence guard an unrestricted (all-orgs) principal — whose
+  // `allowedSet` is null — would accept the dead id as `effectiveSelected`, and
+  // writes derived from `selectedId` would land under an org the read scope
+  // (`filterIds`) never filters to, silently orphaning the record.
+  const selectionResolvesToOrg = (id: string): boolean => orgDescendants.has(id)
   let effectiveSelected: string | null = null
   if (initialSelected) {
-    if (allowedSet === null || allowedSet.has(initialSelected)) {
+    if ((allowedSet === null || allowedSet.has(initialSelected)) && selectionResolvesToOrg(initialSelected)) {
       effectiveSelected = initialSelected
     }
   }
@@ -336,6 +353,13 @@ export async function resolveOrganizationScope({
     filterSet = null
   } else if (auth.orgId) {
     filterSet = loadFallbackSet()
+    // Keep the write target (`selectedId`) aligned with the read scope
+    // (`filterIds`): when an unrestricted principal's requested selection was
+    // dropped above, fall the selection back to the account org too so a record
+    // created here is always readable back by the same caller.
+    if (!effectiveSelected && fallbackOrgId && filterSet && filterSet.size > 0) {
+      effectiveSelected = fallbackOrgId
+    }
   }
 
   if ((!filterSet || filterSet.size === 0) && fallbackOrgId && !widenToAllOrgs) {
@@ -348,11 +372,21 @@ export async function resolveOrganizationScope({
     }
   }
 
+  // A concrete organization was explicitly requested (`normalizedSelectedId` is
+  // null for both "no selection" and the "all organizations" token) but the
+  // resolver could not honor it — it was dropped as non-existent/inaccessible
+  // and the effective selection fell back to something else. Surface this so the
+  // write layer can reject the request instead of silently creating the record
+  // under the fallback org. Only set the field when true to keep the scope shape
+  // unchanged for the common (honored) case.
+  const selectionRejected = normalizedSelectedId !== null && effectiveSelected !== normalizedSelectedId
+
   return {
     selectedId: effectiveSelected,
     filterIds: filterSet ? Array.from(filterSet) : null,
     allowedIds: allowedSet ? Array.from(allowedSet) : null,
     tenantId,
+    ...(selectionRejected ? { selectionRejected: true } : {}),
   }
 }
 

package/src/modules/entities/api/records.ts

@@ -8,6 +8,7 @@ import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacS
 import { resolveOrganizationScope, getSelectedOrganizationFromRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import { SYSTEM_ENTITY_RECORDS_BLOCKED_CODE, isOrmBackedSystemEntityId } from '@open-mercato/shared/lib/data/engine'
 import { parseBooleanToken, parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'
+import { parseCommaSeparatedList } from '@open-mercato/shared/lib/string'
 import { setRecordCustomFields } from '../lib/helpers'
 import { CustomFieldValue } from '../data/entities'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
@@ -151,10 +152,7 @@ export async function GET(req: Request) {
   const sortDir = (url.searchParams.get('sortDir') || 'asc').toLowerCase() === 'desc' ? 'desc' : 'asc'
   const withDeleted = parseBooleanWithDefault(url.searchParams.get('withDeleted'), false)
   const searchTerm = (url.searchParams.get('search') || '').trim()
-  const searchFields = (url.searchParams.get('searchFields') || '')
-    .split(',')
-    .map((field) => field.trim())
-    .filter(Boolean)
+  const searchFields = parseCommaSeparatedList(url.searchParams.get('searchFields'))
 
   const qpEntries: Array<[string, string]> = []
   for (const [key, val] of url.searchParams.entries()) {
@@ -211,11 +209,11 @@ export async function GET(req: Request) {
       if (key.startsWith('cf_')) {
         if (key.endsWith('In')) {
           const base = key.slice(0, -2)
-          const values = val.split(',').map((s) => s.trim()).filter(Boolean)
+          const values = parseCommaSeparatedList(val)
           ;(filtersObj as any)[base] = { $in: values }
         } else {
           if (val.includes(',')) {
-            const values = val.split(',').map((s) => s.trim()).filter(Boolean)
+            const values = parseCommaSeparatedList(val)
             ;(filtersObj as any)[key] = { $in: values }
           } else {
             const parsed = parseBooleanToken(val)
@@ -224,7 +222,7 @@ export async function GET(req: Request) {
         }
       } else if (allowAnyKey) {
         if (val.includes(',')) {
-          const values = val.split(',').map((s) => s.trim()).filter(Boolean)
+          const values = parseCommaSeparatedList(val)
           ;(filtersObj as any)[key] = { $in: values }
         } else {
           const parsed = parseBooleanToken(val)

package/src/modules/entities/backend/entities/system/[entityId]/page.meta.ts

@@ -2,6 +2,7 @@ export const metadata = {
   requireAuth: true,
   requireFeatures: ['entities.definitions.manage'],
   pageTitle: 'Edit Definitions',
+  pageTitleKey: 'entities.userEntities.edit.pageTitle',
   pageGroup: 'Data designer',
   navHidden: true,
 }

package/src/modules/entities/backend/entities/user/[entityId]/page.meta.ts

@@ -2,6 +2,7 @@ export const metadata = {
   requireAuth: true,
   requireFeatures: ['entities.definitions.manage'],
   pageTitle: 'Edit Definitions',
+  pageTitleKey: 'entities.userEntities.edit.pageTitle',
   pageGroup: 'Data designer',
   navHidden: true,
 }

package/src/modules/entities/backend/entities/user/[entityId]/page.tsx

@@ -167,7 +167,7 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
         const entJson = await readApiResultOrThrow<EntitiesListResponse>(
           '/api/entities/entities',
           undefined,
-          { errorMessage: 'Failed to load entity metadata', fallback: { items: [] } },
+          { errorMessage: t('entities.userEntities.edit.errors.loadMetadataFailed', 'Failed to load entity metadata'), fallback: { items: [] } },
         )
         const ent = (entJson.items || []).find((x: any) => x.entityId === entityId)
         if (mounted) {
@@ -197,7 +197,7 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
         const json = await readApiResultOrThrow<DefinitionsManageResponse>(
           `/api/entities/definitions.manage?entityId=${encodeURIComponent(entityId)}`,
           undefined,
-          { errorMessage: 'Failed to load entity definitions', fallback: { items: [], deletedKeys: [] } },
+          { errorMessage: t('entities.userEntities.edit.errors.loadDefinitionsFailed', 'Failed to load entity definitions'), fallback: { items: [], deletedKeys: [] } },
         )
         if (mounted) {
           const loaded: Def[] = (json.items || []).map((d: any) => ({ key: d.key, kind: d.kind, configJson: d.configJson || {}, isActive: d.isActive !== false }))
@@ -220,14 +220,14 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
           setSingleFieldsetPerRecord(json.settings?.singleFieldsetPerRecord !== false)
         }
       } catch (e: any) {
-        if (mounted) setError(e.message || 'Failed to load')
+        if (mounted) setError(e.message || t('entities.userEntities.edit.errors.loadFailed', 'Failed to load'))
       } finally {
         if (mounted) setLoading(false)
       }
     }
     if (entityId) load()
     return () => { mounted = false }
-  }, [entityId])
+  }, [entityId, t])
 
   function addField() {
     setDefs((arr) => [
@@ -249,13 +249,13 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
         body: JSON.stringify({ entityId, key }),
       })
       if (!call.ok) {
-        await raiseCrudError(call.response, 'Failed to restore field')
+        await raiseCrudError(call.response, t('entities.userEntities.edit.errors.restoreFieldFailed', 'Failed to restore field'))
       }
       // Reload definitions & deleted keys
       const j2 = await readApiResultOrThrow<DefinitionsManageResponse>(
         `/api/entities/definitions.manage?entityId=${encodeURIComponent(entityId)}`,
         undefined,
-        { errorMessage: 'Failed to reload field definitions', fallback: { items: [], deletedKeys: [] } },
+        { errorMessage: t('entities.userEntities.edit.errors.reloadDefinitionsFailed', 'Failed to reload field definitions'), fallback: { items: [], deletedKeys: [] } },
       )
       const loaded: Def[] = (j2.items || []).map((d: any) => ({ key: d.key, kind: d.kind, configJson: d.configJson || {}, isActive: d.isActive !== false }))
       loaded.sort(
@@ -264,10 +264,10 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
       setDefs(loaded)
       setDefsVersion(readVersionToken(j2.version))
       setDeletedKeys(Array.isArray(j2.deletedKeys) ? j2.deletedKeys : [])
-      flash(`Restored ${key}`, 'success')
+      flash(t('entities.userEntities.edit.flash.restoredField', 'Restored {{key}}', { key }), 'success')
       await invalidateCustomFieldDefs(queryClient, entityId)
     } catch (e: any) {
-      flash(e?.message || 'Failed to restore field', 'error')
+      flash(e?.message || t('entities.userEntities.edit.errors.restoreFieldFailed', 'Failed to restore field'), 'error')
     }
   }
 
@@ -276,8 +276,8 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
     setError(null)
     try {
       if (!validateAll()) {
-        flash('Please fix validation errors in field definitions', 'error')
-        throw new Error('Validation failed')
+        flash(t('entities.customFields.errors.validation', 'Please fix validation errors in field definitions.'), 'error')
+        throw new Error(t('entities.userEntities.edit.errors.validationFailed', 'Validation failed'))
       }
       const payload = {
         entityId,
@@ -298,13 +298,13 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
       )
       if (!call.ok) {
         if (surfaceRecordConflict({ status: call.status, body: call.result }, t)) return
-        await raiseCrudError(call.response, 'Failed to save definitions')
+        await raiseCrudError(call.response, t('entities.customFields.errors.saveFailed', 'Failed to save field definitions.'))
       }
       setDefsVersion(readVersionToken(call.result?.version))
       await invalidateCustomFieldDefs(queryClient, entityId)
-      router.push(`/backend/entities/user?flash=Definitions%20saved&type=success`)
+      router.push(`/backend/entities/user?flash=${encodeURIComponent(t('entities.customFields.flash.saved', 'Definitions saved'))}&type=success`)
     } catch (e: any) {
-      setError(e.message || 'Failed to save')
+      setError(e.message || t('entities.customFields.errors.saveFailed', 'Failed to save field definitions.'))
     } finally {
       setSaving(false)
     }
@@ -321,13 +321,13 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
           body: JSON.stringify({ entityId, key: def.key }),
         })
         if (!call.ok) {
-          await raiseCrudError(call.response, 'Failed to delete field')
+          await raiseCrudError(call.response, t('entities.customFields.errors.deleteFailed', 'Failed to delete field.'))
         }
         // Keep the optimistic-lock token in sync after an out-of-band delete so a
         // later Save does not falsely 409 against our own change (issue #3152).
         setDefsVersion(readVersionToken(call.result?.version))
       } catch (error) {
-        const message = error instanceof Error ? error.message : 'Failed to delete field'
+        const message = error instanceof Error ? error.message : t('entities.customFields.errors.deleteFailed', 'Failed to delete field.')
         flash(message, 'error')
         return
       }
@@ -372,7 +372,7 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
     setOrderSaving(true)
     try {
       // Do not save order when there are invalid keys/kinds
-      if (!validateAll()) throw new Error('Validation failed')
+      if (!validateAll()) throw new Error(t('entities.userEntities.edit.errors.validationFailed', 'Validation failed'))
       const payload = {
         entityId,
         definitions: defs.filter(d => !!d.key).map((d) => ({
@@ -396,14 +396,14 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
           setOrderDirty(false)
           return
         }
-        await raiseCrudError(call.response, 'Failed to save order')
+        await raiseCrudError(call.response, t('entities.userEntities.edit.errors.saveOrderFailed', 'Failed to save order'))
       }
       setDefsVersion(readVersionToken(call.result?.version))
       setOrderDirty(false)
-      flash('Order saved', 'success')
+      flash(t('entities.userEntities.edit.flash.orderSaved', 'Order saved'), 'success')
       await invalidateCustomFieldDefs(queryClient, entityId)
     } catch (e: any) {
-      flash(e?.message || 'Failed to save order', 'error')
+      flash(e?.message || t('entities.userEntities.edit.errors.saveOrderFailed', 'Failed to save order'), 'error')
     } finally {
       setOrderSaving(false)
     }
@@ -423,21 +423,21 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
 
   const metadataFieldsReadOnly = entitySource === 'code'
   const fields: CrudField[] = [
-    { id: 'label', label: 'Label', type: 'text', required: true, readOnly: metadataFieldsReadOnly },
-    { id: 'description', label: 'Description', type: 'textarea', readOnly: metadataFieldsReadOnly },
+    { id: 'label', label: t('entities.userEntities.form.label.label', 'Label'), type: 'text', required: true, readOnly: metadataFieldsReadOnly },
+    { id: 'description', label: t('entities.userEntities.form.description.label', 'Description'), type: 'textarea', readOnly: metadataFieldsReadOnly },
     {
       id: 'defaultEditor',
-      label: 'Default Editor (multiline)',
+      label: t('entities.userEntities.form.defaultEditor.label', 'Default Editor (multiline)'),
       type: 'select',
       readOnly: metadataFieldsReadOnly,
       options: [
-        { value: '', label: 'Default (Markdown)' },
-        { value: 'markdown', label: 'Markdown (UIW)' },
-        { value: 'simpleMarkdown', label: 'Simple Markdown' },
-        { value: 'htmlRichText', label: 'HTML Rich Text' },
+        { value: '', label: t('entities.userEntities.form.defaultEditor.options.default', 'Default (Markdown)') },
+        { value: 'markdown', label: t('entities.userEntities.form.defaultEditor.options.markdown', 'Markdown (UIW)') },
+        { value: 'simpleMarkdown', label: t('entities.userEntities.form.defaultEditor.options.simpleMarkdown', 'Simple Markdown') },
+        { value: 'htmlRichText', label: t('entities.userEntities.form.defaultEditor.options.htmlRichText', 'HTML Rich Text') },
       ],
     } as any,
-    ...(entitySource === 'custom' ? [{ id: 'showInSidebar', label: 'Show in sidebar', type: 'checkbox' }] : []),
+    ...(entitySource === 'custom' ? [{ id: 'showInSidebar', label: t('entities.userEntities.form.showInSidebar.label', 'Show in sidebar'), type: 'checkbox' }] : []),
   ]
   const renderFieldDefinitions = React.useCallback(() => (
       <FieldDefinitionsEditor
@@ -474,7 +474,7 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
           })
           setOrderDirty(true)
         }}
-        orderNotice={orderDirty ? { dirty: true, saving: orderSaving, message: 'Reordered — will auto-save on blur' } : undefined}
+        orderNotice={orderDirty ? { dirty: true, saving: orderSaving, message: t('entities.userEntities.edit.orderNotice', 'Reordered - will auto-save on blur') } : undefined}
         addButtonLabel={t('entities.customFields.editor.addField', 'Add Field')}
         translate={t}
         listRef={listRef}
@@ -491,22 +491,22 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
         }}
       />
     ),
-  [defs, defErrors, deletedKeys, fieldsets, activeFieldset, singleFieldsetPerRecord, orderDirty, orderSaving, addField, removeField, restoreField, saveOrderIfDirty])
+  [defs, defErrors, deletedKeys, fieldsets, activeFieldset, singleFieldsetPerRecord, orderDirty, orderSaving, addField, removeField, restoreField, saveOrderIfDirty, t])
 
-  const definitionsGroup: CrudFormGroup = { id: 'definitions', title: 'Field Definitions', column: 1, component: renderFieldDefinitions }
+  const definitionsGroup: CrudFormGroup = { id: 'definitions', title: t('entities.userEntities.edit.groups.definitions', 'Field Definitions'), column: 1, component: renderFieldDefinitions }
 
   const groups: CrudFormGroup[] = [
-    { id: 'settings', title: 'Entity Settings', column: 1, fields: entitySource === 'custom' ? ['label','description','defaultEditor','showInSidebar'] : ['label','description','defaultEditor'] },
+    { id: 'settings', title: t('entities.userEntities.edit.groups.settings', 'Entity Settings'), column: 1, fields: entitySource === 'custom' ? ['label','description','defaultEditor','showInSidebar'] : ['label','description','defaultEditor'] },
     definitionsGroup,
   ]
 
   const handleCrudFormSubmit = React.useCallback(async (vals: Record<string, unknown>) => {
     if (!entityId) {
-      throw createCrudFormError('Invalid entity ID')
+      throw createCrudFormError(t('entities.userEntities.edit.errors.invalidEntityId', 'Invalid entity ID'))
     }
     if (!validateAll()) {
-      flash('Please fix validation errors in field definitions', 'error')
-      throw createCrudFormError('Please fix validation errors in field definitions')
+      flash(t('entities.customFields.errors.validation', 'Please fix validation errors in field definitions.'), 'error')
+      throw createCrudFormError(t('entities.customFields.errors.validation', 'Please fix validation errors in field definitions.'))
     }
     // Code-declared system entities are not registered as custom entities — their
     // metadata is owned by code and `POST /api/entities/entities` is fail-closed for
@@ -514,14 +514,14 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
     // skip the registration call and persist definitions below.
     if (shouldRegisterEntityMetadata(entitySource)) {
       const entityPayload = buildEntityMetadataPayload(entitySource, vals)
-      if (!entityPayload) throw createCrudFormError('Validation failed')
+      if (!entityPayload) throw createCrudFormError(t('entities.userEntities.edit.errors.validationFailed', 'Validation failed'))
       const callEntity = await apiCall('/api/entities/entities', {
         method: 'POST',
         headers: { 'content-type': 'application/json' },
         body: JSON.stringify({ entityId, ...entityPayload }),
       })
       if (!callEntity.ok) {
-        await raiseCrudError(callEntity.response, 'Failed to save entity')
+        await raiseCrudError(callEntity.response, t('entities.userEntities.edit.errors.saveEntityFailed', 'Failed to save entity'))
       }
       try { window.dispatchEvent(new Event('om:refresh-sidebar')) } catch {}
     }
@@ -543,13 +543,13 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
       }),
     )
     if (!callDefs.ok) {
-      await raiseCrudError(callDefs.response, 'Failed to save definitions')
+      await raiseCrudError(callDefs.response, t('entities.customFields.errors.saveFailed', 'Failed to save field definitions.'))
     }
     setDefsVersion(readVersionToken(callDefs.result?.version))
     try { window.dispatchEvent(new Event('om:refresh-sidebar')) } catch {}
     await invalidateCustomFieldDefs(queryClient, entityId)
-    flash('Definitions saved', 'success')
-  }, [buildFieldsetPayload, defs, defsVersion, entityId, entitySource, queryClient, singleFieldsetPerRecord, validateAll])
+    flash(t('entities.customFields.flash.saved', 'Definitions saved'), 'success')
+  }, [buildFieldsetPayload, defs, defsVersion, entityId, entitySource, queryClient, singleFieldsetPerRecord, t, validateAll])
 
   if (!entityId) {
     return (
@@ -557,8 +557,8 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
         <PageBody>
           <div className="p-6">
             <Alert variant="destructive">
-              <AlertTitle>Invalid entity</AlertTitle>
-              <AlertDescription>The requested entity ID is missing or invalid.</AlertDescription>
+              <AlertTitle>{t('entities.userEntities.edit.errors.invalidEntityTitle', 'Invalid entity')}</AlertTitle>
+              <AlertDescription>{t('entities.userEntities.edit.errors.invalidEntityDescription', 'The requested entity ID is missing or invalid.')}</AlertDescription>
             </Alert>
           </div>
         </PageBody>
@@ -571,12 +571,12 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
       <div className="p-4">
         <CrudForm
           schema={entityFormSchema}
-          title={`Edit fieldset: ${requestedFieldset ?? entityId}`}
+          title={t('entities.userEntities.edit.fieldsetTitle', 'Edit fieldset: {{name}}', { name: requestedFieldset ?? entityId })}
           fields={[]}
           groups={[definitionsGroup]}
           initialValues={entityInitial as any}
           isLoading={entityFormLoading || loading}
-          submitLabel="Save"
+          submitLabel={t('entities.userEntities.records.form.submitSave', 'Save')}
           deleteVisible={false}
           backHref={undefined}
           cancelHref={undefined}
@@ -592,30 +592,32 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
       <PageBody>
         <CrudForm
           schema={entityFormSchema}
-          title={`Edit Entity: ${entityId}`}
+          title={t('entities.userEntities.edit.title', 'Edit Entity: {{entityId}}', { entityId })}
           backHref={entitySource === 'code' ? "/backend/entities/system" : "/backend/entities/user"}
           fields={fields}
           groups={groups}
           initialValues={entityInitial as any}
           isLoading={entityFormLoading || loading}
-          submitLabel="Save"
+          submitLabel={t('entities.userEntities.records.form.submitSave', 'Save')}
           deleteVisible={entitySource === 'custom'}
           extraActions={entitySource === 'custom' ? (
             <Button variant="outline" asChild>
               <Link href={`/backend/entities/user/${encodeURIComponent(entityId)}/records`}>
-                Show Records
+                {t('entities.userEntities.edit.showRecords', 'Show Records')}
               </Link>
             </Button>
           ) : null}
           cancelHref={entitySource === 'code' ? "/backend/entities/system" : "/backend/entities/user"}
-          successRedirect={entitySource === 'code' ? "/backend/entities/system?flash=Definitions%20saved&type=success" : "/backend/entities/user?flash=Definitions%20saved&type=success"}
+          successRedirect={entitySource === 'code'
+            ? `/backend/entities/system?flash=${encodeURIComponent(t('entities.customFields.flash.saved', 'Definitions saved'))}&type=success`
+            : `/backend/entities/user?flash=${encodeURIComponent(t('entities.customFields.flash.saved', 'Definitions saved'))}&type=success`}
           onSubmit={handleCrudFormSubmit}
         onDelete={entitySource === 'custom' ? async () => {
           const callDelete = await apiCall('/api/entities/entities', { method: 'DELETE', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ entityId }) })
           if (!callDelete.ok) {
-            await raiseCrudError(callDelete.response, 'Failed to delete entity')
+            await raiseCrudError(callDelete.response, t('entities.userEntities.edit.errors.deleteEntityFailed', 'Failed to delete entity'))
           }
-          flash('Entity deleted', 'success')
+          flash(t('entities.userEntities.edit.flash.entityDeleted', 'Entity deleted'), 'success')
           try { window.dispatchEvent(new Event('om:refresh-sidebar')) } catch {}
         } : undefined}
       />