@defra/forms-engine-plugin 5.0.0-alpha.1 → 5.0.0-alpha.11

package/.server/server/plugins/engine/i18n/form.d.ts

@@ -0,0 +1,13 @@
+import { type FormMetadata, type FormStatus } from '@defra/forms-model';
+import { type Translator } from '../../../../server/plugins/engine/i18n/types.js';
+import { type AnyFormRequest } from '../../../../server/plugins/engine/types.js';
+/**
+ * Get translator for plugin, for the current form's metadata (as well as the plugin-specific boilerplate).
+ * This is an async call so we can read the form definition inside this call.
+ * See docs/features/multi-language.md for the language and translation flow overview.
+ * @param {AnyFormRequest} request
+ * @param {FormMetadata} metadata - the metadata of the form
+ * @param {FormStatus} status - the form status to use when retrieving the definition
+ * @param {string} language - the language to use for the translator
+ */
+export declare function getCachedPluginTranslator(request: AnyFormRequest, metadata: FormMetadata, status: FormStatus, language: string): Promise<Translator>;

package/.server/server/plugins/engine/i18n/form.js

@@ -0,0 +1,35 @@
+import Boom from '@hapi/boom';
+import { LRUCache } from 'lru-cache';
+import { getPluginOptions } from "../helpers.js";
+import { createFormTranslator } from "./createFormTranslator.js";
+const cache = new LRUCache({
+  max: 100,
+  ttl: 1000 * 60 * 15 // 15 minutes
+});
+
+/**
+ * Get translator for plugin, for the current form's metadata (as well as the plugin-specific boilerplate).
+ * This is an async call so we can read the form definition inside this call.
+ * See docs/features/multi-language.md for the language and translation flow overview.
+ * @param {AnyFormRequest} request
+ * @param {FormMetadata} metadata - the metadata of the form
+ * @param {FormStatus} status - the form status to use when retrieving the definition
+ * @param {string} language - the language to use for the translator
+ */
+export async function getCachedPluginTranslator(request, metadata, status, language) {
+  const key = `${metadata.id}-${status}-${language}-plugin-meta`;
+  if (cache.has(key)) {
+    return cache.get(key);
+  }
+  const {
+    services
+  } = getPluginOptions(request.server);
+  const definition = await services?.formsService.getFormDefinition(metadata.id, status);
+  if (!definition) {
+    throw Boom.notFound(`FormDefinition not found for form ${metadata.id} and status ${status}`);
+  }
+  const translator = createFormTranslator(metadata, definition, language);
+  cache.set(key, translator);
+  return translator;
+}
+//# sourceMappingURL=form.js.map

package/.server/server/plugins/engine/i18n/form.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"form.js","names":["Boom","LRUCache","getPluginOptions","createFormTranslator","cache","max","ttl","getCachedPluginTranslator","request","metadata","status","language","key","id","has","get","services","server","definition","formsService","getFormDefinition","notFound","translator","set"],"sources":["../../../../../src/server/plugins/engine/i18n/form.ts"],"sourcesContent":["import { type FormMetadata, type FormStatus } from '@defra/forms-model'\nimport Boom from '@hapi/boom'\nimport { LRUCache } from 'lru-cache'\n\nimport { getPluginOptions } from '~/src/server/plugins/engine/helpers.js'\nimport { createFormTranslator } from '~/src/server/plugins/engine/i18n/createFormTranslator.js'\nimport { type Translator } from '~/src/server/plugins/engine/i18n/types.js'\nimport { type AnyFormRequest } from '~/src/server/plugins/engine/types.js'\n\nconst cache = new LRUCache({\n  max: 100,\n  ttl: 1000 * 60 * 15 // 15 minutes\n})\n\n/**\n * Get translator for plugin, for the current form's metadata (as well as the plugin-specific boilerplate).\n * This is an async call so we can read the form definition inside this call.\n * See docs/features/multi-language.md for the language and translation flow overview.\n * @param {AnyFormRequest} request\n * @param {FormMetadata} metadata - the metadata of the form\n * @param {FormStatus} status - the form status to use when retrieving the definition\n * @param {string} language - the language to use for the translator\n */\nexport async function getCachedPluginTranslator(\n  request: AnyFormRequest,\n  metadata: FormMetadata,\n  status: FormStatus,\n  language: string\n) {\n  const key = `${metadata.id}-${status}-${language}-plugin-meta`\n\n  if (cache.has(key)) {\n    return cache.get(key) as unknown as Translator\n  }\n\n  const { services } = getPluginOptions(request.server)\n\n  const definition = await services?.formsService.getFormDefinition(\n    metadata.id,\n    status\n  )\n\n  if (!definition) {\n    throw Boom.notFound(\n      `FormDefinition not found for form ${metadata.id} and status ${status}`\n    )\n  }\n\n  const translator = createFormTranslator(metadata, definition, language)\n\n  cache.set(key, translator)\n\n  return translator\n}\n"],"mappings":"AACA,OAAOA,IAAI,MAAM,YAAY;AAC7B,SAASC,QAAQ,QAAQ,WAAW;AAEpC,SAASC,gBAAgB;AACzB,SAASC,oBAAoB;AAI7B,MAAMC,KAAK,GAAG,IAAIH,QAAQ,CAAC;EACzBI,GAAG,EAAE,GAAG;EACRC,GAAG,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;AACtB,CAAC,CAAC;;AAEF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,yBAAyBA,CAC7CC,OAAuB,EACvBC,QAAsB,EACtBC,MAAkB,EAClBC,QAAgB,EAChB;EACA,MAAMC,GAAG,GAAG,GAAGH,QAAQ,CAACI,EAAE,IAAIH,MAAM,IAAIC,QAAQ,cAAc;EAE9D,IAAIP,KAAK,CAACU,GAAG,CAACF,GAAG,CAAC,EAAE;IAClB,OAAOR,KAAK,CAACW,GAAG,CAACH,GAAG,CAAC;EACvB;EAEA,MAAM;IAAEI;EAAS,CAAC,GAAGd,gBAAgB,CAACM,OAAO,CAACS,MAAM,CAAC;EAErD,MAAMC,UAAU,GAAG,MAAMF,QAAQ,EAAEG,YAAY,CAACC,iBAAiB,CAC/DX,QAAQ,CAACI,EAAE,EACXH,MACF,CAAC;EAED,IAAI,CAACQ,UAAU,EAAE;IACf,MAAMlB,IAAI,CAACqB,QAAQ,CACjB,qCAAqCZ,QAAQ,CAACI,EAAE,eAAeH,MAAM,EACvE,CAAC;EACH;EAEA,MAAMY,UAAU,GAAGnB,oBAAoB,CAACM,QAAQ,EAAES,UAAU,EAAEP,QAAQ,CAAC;EAEvEP,KAAK,CAACmB,GAAG,CAACX,GAAG,EAAEU,UAAU,CAAC;EAE1B,OAAOA,UAAU;AACnB","ignoreList":[]}

package/.server/server/plugins/engine/i18n/languages.d.ts

@@ -0,0 +1,10 @@
+import { type FormDefinition } from '@defra/forms-model';
+/**
+ * Return a list of available languages.
+ * Empty array if only English, or an array of English and Welsh if translations have been defined.
+ * @param {FormDefinition} def
+ */
+export declare function getAvailableLanguages(def: FormDefinition): {
+    name: string;
+    code: string;
+}[];

package/.server/server/plugins/engine/i18n/languages.js

@@ -0,0 +1,19 @@
+/**
+ * Return a list of available languages.
+ * Empty array if only English, or an array of English and Welsh if translations have been defined.
+ * @param {FormDefinition} def
+ */
+export function getAvailableLanguages(def) {
+  // @ts-expect-error - dynamic property
+  if (def.metadata?.translations?.cy) {
+    return [{
+      name: 'English',
+      code: 'en-GB'
+    }, {
+      name: 'Cymraeg',
+      code: 'cy'
+    }];
+  }
+  return [];
+}
+//# sourceMappingURL=languages.js.map

package/.server/server/plugins/engine/i18n/languages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"languages.js","names":["getAvailableLanguages","def","metadata","translations","cy","name","code"],"sources":["../../../../../src/server/plugins/engine/i18n/languages.ts"],"sourcesContent":["import { type FormDefinition } from '@defra/forms-model'\n\n/**\n * Return a list of available languages.\n * Empty array if only English, or an array of English and Welsh if translations have been defined.\n * @param {FormDefinition} def\n */\nexport function getAvailableLanguages(\n  def: FormDefinition\n): { name: string; code: string }[] {\n  // @ts-expect-error - dynamic property\n  if (def.metadata?.translations?.cy) {\n    return [\n      { name: 'English', code: 'en-GB' },\n      { name: 'Cymraeg', code: 'cy' }\n    ]\n  }\n  return []\n}\n"],"mappings":"AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,qBAAqBA,CACnCC,GAAmB,EACe;EAClC;EACA,IAAIA,GAAG,CAACC,QAAQ,EAAEC,YAAY,EAAEC,EAAE,EAAE;IAClC,OAAO,CACL;MAAEC,IAAI,EAAE,SAAS;MAAEC,IAAI,EAAE;IAAQ,CAAC,EAClC;MAAED,IAAI,EAAE,SAAS;MAAEC,IAAI,EAAE;IAAK,CAAC,CAChC;EACH;EACA,OAAO,EAAE;AACX","ignoreList":[]}

package/.server/server/plugins/engine/i18n/translations/cy.json

@@ -14,7 +14,17 @@
     "numberInteger": "Rhaid i {{#label}} fod yn rhif cyfan",
     "numberMin": "Rhaid i {{#label}} fod yn {{#limit}} neu uwch",
     "numberMax": "Rhaid i {{#label}} fod yn {{#limit}} neu is",
-    "maxWords": "Rhaid i {{#label}} fod yn {{#limit}} o eiriau neu lai"
+    "maxWords": "Rhaid i {{#label}} fod yn {{#limit}} o eiriau neu lai",
+    "unicode": "Mae {{#label}} yn cynnwys nodau annilys, er enghraifft, dashes hirion",
+    "arrayMin": "Dewiswch o leiaf {{#limit}} o opsiynau o'r rhestr",
+    "arrayMax": "Dim ond {{#limit}} y gellir eu dewis o'r rhestr",
+    "arrayLength": "Dewiswch ddim ond {{#limit}} o opsiynau o'r rhestr",
+    "featuresMin": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMax": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresLength": "Diffiniwch nodweddion {{#limit}} yn union",
+    "filesMin": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
+    "filesMax": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
+    "filesLength": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau"
   },
 
   "errors": {
@@ -29,7 +39,14 @@
     "continue": "Parhau",
     "saveAndExit": "Cadw a gadael",
     "draft": "ddrafft",
-    "live": "fyw"
+    "live": "fyw",
+    "or": "neu",
+    "and": "a",
+    "england": "Lloegr",
+    "wales": "Cymru",
+    "northernIreland": "Gogledd Iwerddon",
+    "scotland": "Yr Alban",
+    "sendFeedback": "Anfon adborth"
   },
 
   "pages": {
@@ -60,6 +77,12 @@
       "totalAmount": "Cyfanswm",
       "reference": "Cyfeirnod",
       "dateOfPayment": "Dyddiad talu",
+      "fileUpload_zero": "Ni uwchlwythwyd unrhyw ffeiliau",
+      "fileUpload_one": "Uwchlwythwyd [[count]] ffeil",
+      "fileUpload_two": "Uwchlwythwyd dwy feil",
+      "fileUpload_few": "Uwchlwythwyd [[count]] ffeil",
+      "fileUpload_many": "Uwchlwythwyd [[count]] o ffeiliau",
+      "fileUpload_other": "Uwchlwythwyd [[count]] ffeil",
       "submissionFailed": "Roedd problem ac ni chyflwynwyd eich ffurflen. Ceisiwch gyflwyno'r ffurflen eto",
       "submissionFailedContactSuffix": " neu gallwch [[contactUsLink]] a dyfynnu'ch cyfeirnod i drefnu ad-daliad",
       "contactUsLinkText": "cysylltu â ni (yn agor mewn tab newydd)",
@@ -79,17 +102,40 @@
       "change": "Newid",
       "notProvided": "Heb ei ddarparu",
       "visuallyHiddenItem": "eitem [[index]]",
+      "pageTitle_zero": "Nid ydych wedi ychwanegu unrhyw atebion",
       "pageTitle_one": "Rydych wedi ychwanegu [[count]] ateb",
+      "pageTitle_two": "Rydych wedi ychwanegu dau ateb",
+      "pageTitle_few": "Rydych wedi ychwanegu [[count]] ateb",
+      "pageTitle_many": "Rydych wedi ychwanegu [[count]] o atebion",
       "pageTitle_other": "Rydych wedi ychwanegu [[count]] ateb",
+      "tooMany_zero": "Ni allwch ychwanegu unrhyw atebion",
       "tooMany_one": "Dim ond hyd at [[count]] ateb y gallwch ei ychwanegu",
+      "tooMany_two": "Dim ond hyd at ddau gateb y gallwch eu hychwanegu",
+      "tooMany_few": "Dim ond hyd at [[count]] ateb y gallwch eu hychwanegu",
+      "tooMany_many": "Dim ond hyd at [[count]] o atebion y gallwch eu hychwanegu",
       "tooMany_other": "Dim ond hyd at [[count]] ateb y gallwch eu hychwanegu",
+      "tooFew_zero": "Rhaid i chi ychwanegu atebion",
       "tooFew_one": "Rhaid i chi ychwanegu o leiaf [[count]] ateb",
+      "tooFew_two": "Rhaid i chi ychwanegu o leiaf ddau gateb",
+      "tooFew_few": "Rhaid i chi ychwanegu o leiaf [[count]] ateb",
+      "tooFew_many": "Rhaid i chi ychwanegu o leiaf [[count]] o atebion",
       "tooFew_other": "Rhaid i chi ychwanegu o leiaf [[count]] ateb"
     },
 
     "fileUpload": {
       "upload": "Uwchlwytho ffeil",
-      "maxFilesReached": "Rydych wedi cyrraedd nifer uchaf y ffeiliau. Tynnwch ffeil i uwchlwytho rhagor."
+      "maxFilesReached": "Rydych wedi cyrraedd nifer uchaf y ffeiliau. Tynnwch ffeil i uwchlwytho rhagor.",
+      "remove": "Tynnu",
+      "removeFileTitle": "Ydych chi'n siŵr eich bod chi eisiau dileu'r ffeil hon?",
+      "removeFileBody": "Ni allwch adfer ffeiliau a dynnwyd.",
+      "removeFileButton": "Dileu ffeil",
+      "cancel": "Canslo",
+      "FILE_VIRUS": "Mae'r ffeil a ddewiswyd yn cynnwys firws",
+      "FILE_EMPTY": "Mae'r ffeil a ddewiswyd yn wag",
+      "FILE_TOO_LARGE": "Rhaid i'r ffeil a ddewiswyd fod yn llai na [[maxFileSizeFormatted]]",
+      "FILE_INVALID_TYPE": "Rhaid i'r ffeil a ddewiswyd fod yn [[fileExtensions]]",
+      "FILE_UPLOAD_FAILED": "Ni ellid uwchlwytho'r ffeil a ddewiswyd - rhowch gynnig arall arni",
+      "FILE_ERROR_UNKNOWN": "Gwall anhysbys"
     },
 
     "exit": {
@@ -111,6 +157,7 @@
         "body": "Os hoffech dderbyn e-bost prawf, [[link]] yr hoffech i gyflwyniadau ffurflen fynd iddo.",
         "linkText": "nodwch y cyfeiriad e-bost (yn agor mewn tab newydd)"
       },
+      "bannerTitle": "Pwysig",
       "bannerForce": "Rhagolwg o ffurflen [[previewMode]] yw hon. Peidiwch â rhoi gwybodaeth bersonol.",
       "bannerText": "Dyma ragolwg o dudalen ffurflen [[previewMode]] rydych chi'n ei golygu.",
       "previousPages": "Mae'n dibynnu ar atebion o dudalennau cynharach yn y ffurflen. Yn y fersiwn fyw, bydd angen i ddefnyddwyr gwblhau'r cwestiynau hynny yn gyntaf."
@@ -134,7 +181,11 @@
     "findAnAddressInstead": "dod o hyd i gyfeiriad yn lle hynny",
     "noAddressFoundTitle": "Ni chanfuwyd cyfeiriad",
     "noAddressFoundBody": "Ni allem ddod o hyd i gyfeiriad cyfatebol",
+    "addressFound_zero": "Ni chanfuwyd unrhyw gyfeiriadau ar gyfer",
     "addressFound_one": "Canfuwyd [[count]] cyfeiriad ar gyfer",
+    "addressFound_two": "Canfuwyd dau gyfeiriad ar gyfer",
+    "addressFound_few": "Canfuwyd [[count]] chyfeiriad ar gyfer",
+    "addressFound_many": "Canfuwyd [[count]] o gyfeiriadau ar gyfer",
     "addressFound_other": "Canfuwyd [[count]] cyfeiriad ar gyfer",
     "validation": {
       "invalidPostcode": "Nodwch god post dilys neu nodwch gyfeiriad â llaw",
@@ -199,7 +250,8 @@
       "eastingDigits": "Rhaid i {{#label}} ar gyfer [[fieldLabel]] fod rhwng 1 a 6 digid",
       "northingDigits": "Rhaid i {{#label}} ar gyfer [[fieldLabel]] fod rhwng 1 a 7 digid",
       "eastingRange": "Rhaid i {{#label}} ar gyfer [[fieldLabel]] fod rhwng [[min]] a [[max]]",
-      "northingRange": "Rhaid i {{#label}} ar gyfer [[fieldLabel]] fod rhwng [[min]] a [[max]]"
+      "northingRange": "Rhaid i {{#label}} ar gyfer [[fieldLabel]] fod rhwng [[min]] a [[max]]",
+      "wrongCountry": "Rhaid i leoliad fod y tu mewn i [[country]]"
     },
 
     "nationalGridField": {
@@ -220,9 +272,9 @@
 
     "yesNoField": {
       "yes": "Ie",
-      "no": "Na",
+      "no": "Nage",
       "validation": {
-        "selectYesNoRequired": "{{#label}} - dewiswch ie neu na"
+        "selectYesNoRequired": "{{#label}} - dewiswch ie neu nage"
       }
     },
 
@@ -236,7 +288,11 @@
     },
 
     "geospatialField": {
+      "added_zero": "Ni ychwanegwyd unrhyw leoliadau",
       "added_one": "Ychwanegwyd [[count]] lleoliad",
+      "added_two": "Ychwanegwyd dau leoliad",
+      "added_few": "Ychwanegwyd [[count]] lleoliad",
+      "added_many": "Ychwanegwyd [[count]] o leoliadau",
       "added_other": "Ychwanegwyd [[count]] lleoliad",
       "validation": {
         "descriptionRequired": "Rhowch ddisgrifiad ar gyfer lleoliad [[count]]",
@@ -245,7 +301,7 @@
     },
 
     "paymentField": {
-      "detailsRequired": "Angen manylion talu",
+      "detailsRequired": "Angen talu",
       "pendingTransaction": "Mae'n bosibl y gwelwch drafodiad ar y gweill yn eich cyfrif banc ond dim ond pan fyddwch yn cyflwyno'r ffurflen y codir tâl arnoch.",
       "addPaymentDetails": "Ychwanegu manylion talu",
       "cannotTakePayment": "Mae problem ac ni allwn dderbyn taliad. Cysylltwch â ni (manylion yn nhroedyn y ffurflen hon) neu cadwch eich cynnydd a dychwelyd at y ffurflen yn ddiweddarach.",
@@ -261,11 +317,32 @@
     },
 
     "fileUploadField": {
+      "uploading": "Yn uwchlwytho…",
       "uploaded": "Wedi'i uwchlwytho",
       "uploadFailed": "Roedd problem gyda'ch ffeiliau a uwchlwythwyd. Uwchlwythwch nhw eto cyn cyflwyno'r ffurflen.",
       "uploadedFilesHeading": "Ffeiliau a uwchlwythwyd",
+      "filesCount_zero": "Uwchlwythwyd [[count]] o ffeiliau",
       "filesCount_one": "Uwchlwythwyd [[count]] ffeil",
-      "filesCount_other": "Uwchlwythwyd [[count]] ffeil"
+      "filesCount_two": "Uwchlwythwyd [[count]] ffeil",
+      "filesCount_few": "Uwchlwythwyd [[count]] ffeil",
+      "filesCount_many": "Uwchlwythwyd [[count]] o ffeiliau",
+      "filesCount_other": "Uwchlwythwyd [[count]] ffeil",
+      "chooseFile": "Dewiswch ffeil",
+      "dropFile": "neu ollwng ffeil",
+      "noFileChosen": "Dim ffeil wedi'i dewis"
+    },
+
+    "characterCount": {
+      "_comment": "Note the use of %{count} instead of [[count]]. This is because we are passing to the govuk template, not passing to Joi",
+      "underLimit": {
+        "one": "Mae gennych %{count} nod ar ôl",
+        "other": "Mae gennych %{count} nod ar ôl"
+      },
+      "atLimit": "Mae gennych 0 nod ar ôl",
+      "overLimit": {
+        "one": "Mae gennych %{count} nod yn ormod",
+        "other": "Mae gennych %{count} nod yn ormod"
+      }
     }
   }
 }

package/.server/server/plugins/engine/i18n/translations/en-GB.json

@@ -14,7 +14,17 @@
     "numberInteger": "{{#label}} must be a whole number",
     "numberMin": "{{#label}} must be {{#limit}} or higher",
     "numberMax": "{{#label}} must be {{#limit}} or lower",
-    "maxWords": "{{#label}} must be {{#limit}} words or fewer"
+    "maxWords": "{{#label}} must be {{#limit}} words or fewer",
+    "unicode": "{{#label}} includes invalid characters, for example, long dashes",
+    "arrayMin": "Select at least {{#limit}} options from the list",
+    "arrayMax": "Only {{#limit}} can be selected from the list",
+    "arrayLength": "Select only {{#limit}} options from the list",
+    "featuresMin": "Define at least {{#limit}} features",
+    "featuresMax": "Only {{#limit}} features can be defined",
+    "featuresLength": "Define exactly {{#limit}} features",
+    "filesMin": "You must upload {{#limit}} files or more",
+    "filesMax": "You can only upload {{#limit}} files or less",
+    "filesLength": "You must upload exactly {{#limit}} files"
   },
 
   "errors": {
@@ -29,7 +39,14 @@
     "continue": "Continue",
     "saveAndExit": "Save and exit",
     "draft": "draft",
-    "live": "live"
+    "live": "live",
+    "or": "or",
+    "and": "and",
+    "england": "England",
+    "wales": "Wales",
+    "northernIreland": "Northern Ireland",
+    "scotland": "Scotland",
+    "sendFeedback": "Send feedback"
   },
 
   "pages": {
@@ -60,6 +77,8 @@
       "totalAmount": "Total amount",
       "reference": "Reference",
       "dateOfPayment": "Date of payment",
+      "fileUpload_one": "Uploaded [[count]] file",
+      "fileUpload_other": "Uploaded [[count]] files",
       "submissionFailed": "There was a problem and your form was not submitted. Try submitting the form again",
       "submissionFailedContactSuffix": " or you can [[contactUsLink]] and quote your reference number to arrange a refund",
       "contactUsLinkText": "contact us (opens in new tab)",
@@ -89,7 +108,18 @@
 
     "fileUpload": {
       "upload": "Upload file",
-      "maxFilesReached": "You have reached the maximum number of files. Please remove a file to upload more."
+      "maxFilesReached": "You have reached the maximum number of files. Please remove a file to upload more.",
+      "remove": "Remove",
+      "removeFileTitle": "Are you sure you want to remove this file?",
+      "removeFileBody": "You cannot recover removed files.",
+      "removeFileButton": "Remove file",
+      "cancel": "Cancel",
+      "FILE_VIRUS": "The selected file contains a virus",
+      "FILE_EMPTY": "The selected file is empty",
+      "FILE_TOO_LARGE": "The selected file must be smaller than [[maxFileSizeFormatted]]",
+      "FILE_INVALID_TYPE": "The selected file must be a [[fileExtensions]]",
+      "FILE_UPLOAD_FAILED": "The selected file could not be uploaded - try again",
+      "FILE_ERROR_UNKNOWN": "Unknown error"
     },
 
     "exit": {
@@ -111,6 +141,7 @@
         "body": "If you want to receive a test email, [[link]] you want form submissions to go to.",
         "linkText": "enter the email address (opens in new tab)"
       },
+      "bannerTitle": "Important",
       "bannerForce": "This is a preview of a [[previewMode]] form. Do not enter personal information.",
       "bannerText": "This is a preview of a [[previewMode]] form page you are editing.",
       "previousPages": "It depends on answers from earlier pages in the form. In the live version, users will need to complete those questions first."
@@ -199,7 +230,8 @@
       "eastingDigits": "{{#label}} for [[fieldLabel]] must be between 1 and 6 digits",
       "northingDigits": "{{#label}} for [[fieldLabel]] must be between 1 and 7 digits",
       "eastingRange": "{{#label}} for [[fieldLabel]] must be between [[min]] and [[max]]",
-      "northingRange": "{{#label}} for [[fieldLabel]] must be between [[min]] and [[max]]"
+      "northingRange": "{{#label}} for [[fieldLabel]] must be between [[min]] and [[max]]",
+      "wrongCountry": "Location must be within [[country]]"
     },
 
     "nationalGridField": {
@@ -245,7 +277,7 @@
     },
 
     "paymentField": {
-      "detailsRequired": "Payment details required",
+      "detailsRequired": "Payment required",
       "pendingTransaction": "You may see a pending transaction in your bank account but you will only be charged when you submit the form.",
       "addPaymentDetails": "Add payment details",
       "cannotTakePayment": "There is a problem and we cannot take a payment. Contact us (details in the footer of this form) or save your progress and return to the form later.",
@@ -261,11 +293,28 @@
     },
 
     "fileUploadField": {
+      "uploading": "Uploading…",
       "uploaded": "Uploaded",
       "uploadFailed": "There was a problem with your uploaded files. Re-upload them before submitting the form again.",
       "uploadedFilesHeading": "Uploaded files",
       "filesCount_one": "[[count]] file uploaded",
-      "filesCount_other": "[[count]] files uploaded"
+      "filesCount_other": "[[count]] files uploaded",
+      "chooseFile": "Choose file",
+      "dropFile": "or drop file",
+      "noFileChosen": "No file chosen"
+    },
+
+    "characterCount": {
+      "_comment": "Note the use of %{count} instead of [[count]]. This is because we are passing to the govuk template, not passing to Joi",
+      "underLimit": {
+        "one": "You have %{count} character remaining",
+        "other": "You have %{count} characters remaining"
+      },
+      "atLimit": "You have 0 characters remaining",
+      "overLimit": {
+        "one": "You have %{count} character too many",
+        "other": "You have %{count} characters too many"
+      }
     }
   }
 }

package/.server/server/plugins/engine/i18n/types.d.ts

@@ -13,6 +13,8 @@ export type FormDefinitionTranslations = Record<string, {
         hint: string;
         content: string;
         shortDescription: string;
+        errorDescription: string;
+        paymentDescription: string;
     }>>;
     sections: Record<string, Partial<Pick<Section, 'title'>>>;
     listItems: Record<string, Partial<Pick<Item, 'text' | 'hint'>>>;

package/.server/server/plugins/engine/i18n/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../../../src/server/plugins/engine/i18n/types.ts"],"sourcesContent":["import {\n  type ComponentDef,\n  type Item,\n  type Page,\n  type Section\n} from '@defra/forms-model'\n\n/**\n * Structure of the `translations` block in a form definition.\n * Also used to derive the valid property keys for the typed tX functions.\n */\nexport type FormDefinitionTranslations = Record<\n  string,\n  {\n    pages: Record<string, Partial<{ title: string; repeatTitle: string }>>\n    // ComponentDef is a discriminated union; Pick across the full union is not feasible.\n    // The four keys below are the complete set of translatable component properties.\n    components: Record<\n      string,\n      Partial<{\n        title: string\n        hint: string\n        content: string\n        shortDescription: string\n      }>\n    >\n    sections: Record<string, Partial<Pick<Section, 'title'>>>\n    listItems: Record<string, Partial<Pick<Item, 'text' | 'hint'>>>\n    form: Record<string, string>\n  }\n>\n\ntype EntityTranslations = FormDefinitionTranslations[string]\n\n/**\n * Scoped translator returned by model.createTranslator(language).\n * t          — plugin namespace (UI strings, buttons, errors, sub-field labels)\n * tForm      — form namespace: form attributes, currently only form name\n * tPage      — form namespace: page titles\n * tComponent — form namespace: component titles, hints, shortDescriptions\n * tSection   — form namespace: section titles\n * tListItem  — form namespace: list item text\n * language   - current language\n */\nexport interface Translator {\n  t: (key: string, opts?: Record<string, unknown>) => string\n  tForm: (prop: string) => string\n  tPage: (page: Page, prop: keyof EntityTranslations['pages'][string]) => string\n  tComponent: (\n    component: ComponentDef,\n    prop: keyof EntityTranslations['components'][string]\n  ) => string\n  tSection: (\n    section: Section,\n    prop: keyof EntityTranslations['sections'][string]\n  ) => string\n  tListItem: (\n    item: Item,\n    prop: keyof EntityTranslations['listItems'][string]\n  ) => string\n  language: string\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../../../src/server/plugins/engine/i18n/types.ts"],"sourcesContent":["import {\n  type ComponentDef,\n  type Item,\n  type Page,\n  type Section\n} from '@defra/forms-model'\n\n/**\n * Structure of the `translations` block in a form definition.\n * Also used to derive the valid property keys for the typed tX functions.\n */\nexport type FormDefinitionTranslations = Record<\n  string,\n  {\n    pages: Record<string, Partial<{ title: string; repeatTitle: string }>>\n    // ComponentDef is a discriminated union; Pick across the full union is not feasible.\n    // The four keys below are the complete set of translatable component properties.\n    components: Record<\n      string,\n      Partial<{\n        title: string\n        hint: string\n        content: string\n        shortDescription: string\n        errorDescription: string\n        paymentDescription: string\n      }>\n    >\n    sections: Record<string, Partial<Pick<Section, 'title'>>>\n    listItems: Record<string, Partial<Pick<Item, 'text' | 'hint'>>>\n    form: Record<string, string>\n  }\n>\n\ntype EntityTranslations = FormDefinitionTranslations[string]\n\n/**\n * Scoped translator returned by model.createTranslator(language).\n * t          — plugin namespace (UI strings, buttons, errors, sub-field labels)\n * tForm      — form namespace: form attributes, currently only form name\n * tPage      — form namespace: page titles\n * tComponent — form namespace: component titles, hints, shortDescriptions\n * tSection   — form namespace: section titles\n * tListItem  — form namespace: list item text\n * language   - current language\n */\nexport interface Translator {\n  t: (key: string, opts?: Record<string, unknown>) => string\n  tForm: (prop: string) => string\n  tPage: (page: Page, prop: keyof EntityTranslations['pages'][string]) => string\n  tComponent: (\n    component: ComponentDef,\n    prop: keyof EntityTranslations['components'][string]\n  ) => string\n  tSection: (\n    section: Section,\n    prop: keyof EntityTranslations['sections'][string]\n  ) => string\n  tListItem: (\n    item: Item,\n    prop: keyof EntityTranslations['listItems'][string]\n  ) => string\n  language: string\n}\n"],"mappings":"","ignoreList":[]}

package/.server/server/plugins/engine/index.d.ts

@@ -5,6 +5,10 @@ export { getPageHref } from '../../../server/plugins/engine/helpers.js';
 export { context } from '../../../server/plugins/nunjucks/context.js';
 export { getFirstJourneyPage, getFormContext, getFormModel, resolveFormModel } from '../../../server/plugins/engine/form-context.js';
 export * from '../../../server/plugins/engine/form-availability.js';
+export { getAvailableLanguages } from '../../../server/plugins/engine/i18n/languages.js';
+export { extractMetadataBaseTranslations, loadFormTranslations } from '../../../server/plugins/engine/i18n/createFormTranslator.js';
+export { extractBaseTranslations } from '../../../server/plugins/engine/i18n/extractBaseTranslations.js';
+export { applyUrlParam } from '../../../server/plugins/nunjucks/filters/applyUrlParam.js';
 export declare const VIEW_PATH = "src/server/plugins/engine/views";
 export declare const PLUGIN_PATH = "node_modules/@defra/forms-engine-plugin";
 export declare const STATE_NOT_YET_VALIDATED = "__stateNotYetValidated";

package/.server/server/plugins/engine/index.js

@@ -7,6 +7,10 @@ export { getPageHref } from "./helpers.js";
 export { context } from "../nunjucks/context.js";
 export { getFirstJourneyPage, getFormContext, getFormModel, resolveFormModel } from "./form-context.js";
 export * from "./form-availability.js";
+export { getAvailableLanguages } from "./i18n/languages.js";
+export { extractMetadataBaseTranslations, loadFormTranslations } from "./i18n/createFormTranslator.js";
+export { extractBaseTranslations } from "./i18n/extractBaseTranslations.js";
+export { applyUrlParam } from "../nunjucks/filters/applyUrlParam.js";
 const globals = {
   checkComponentTemplates,
   checkErrorTemplates,

package/.server/server/plugins/engine/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["markdownToHtml","engine","plugin","checkComponentTemplates","checkErrorTemplates","evaluate","govukRebrand","tGlobal","filters","getPageHref","context","getFirstJourneyPage","getFormContext","getFormModel","resolveFormModel","globals","t","VIEW_PATH","PLUGIN_PATH","STATE_NOT_YET_VALIDATED","CURRENT_PAGE_PATH_KEY","MAGIC_LINK_GROUP_ID","prepareNunjucksEnvironment","env","pluginOptions","name","nunjucksFilter","Object","entries","addFilter","text","startingHeaderLevel","baseUrl","nunjucksGlobal","addGlobal","filter","registerFilter","forEach","fn"],"sources":["../../../../src/server/plugins/engine/index.ts"],"sourcesContent":["import { markdownToHtml } from '@defra/forms-model'\nimport { type Environment } from 'nunjucks'\n\nimport { engine } from '~/src/server/plugins/engine/helpers.js'\nimport { plugin } from '~/src/server/plugins/engine/plugin.js'\nimport { type PluginOptions } from '~/src/server/plugins/engine/types.js'\nimport {\n  checkComponentTemplates,\n  checkErrorTemplates,\n  evaluate,\n  govukRebrand,\n  tGlobal\n} from '~/src/server/plugins/nunjucks/environment.js'\nimport * as filters from '~/src/server/plugins/nunjucks/filters/index.js'\n\nexport { getPageHref } from '~/src/server/plugins/engine/helpers.js'\nexport { context } from '~/src/server/plugins/nunjucks/context.js'\nexport {\n  getFirstJourneyPage,\n  getFormContext,\n  getFormModel,\n  resolveFormModel\n} from '~/src/server/plugins/engine/form-context.js'\nexport * from '~/src/server/plugins/engine/form-availability.js'\n\nconst globals = {\n  checkComponentTemplates,\n  checkErrorTemplates,\n  evaluate,\n  govukRebrand,\n  t: tGlobal\n}\n\nexport const VIEW_PATH = 'src/server/plugins/engine/views'\nexport const PLUGIN_PATH = 'node_modules/@defra/forms-engine-plugin'\n\nexport const STATE_NOT_YET_VALIDATED = '__stateNotYetValidated'\nexport const CURRENT_PAGE_PATH_KEY = '__currentPagePath'\nexport const MAGIC_LINK_GROUP_ID = '__magicLinkGroupId'\n\nexport const prepareNunjucksEnvironment = function (\n  env: Environment,\n  pluginOptions: PluginOptions\n) {\n  for (const [name, nunjucksFilter] of Object.entries(filters)) {\n    env.addFilter(name, nunjucksFilter)\n  }\n\n  env.addFilter('markdown', (text: string, startingHeaderLevel?: number) =>\n    markdownToHtml(text, {\n      baseUrl: pluginOptions.baseUrl,\n      startingHeaderLevel\n    })\n  )\n\n  for (const [name, nunjucksGlobal] of Object.entries(globals)) {\n    env.addGlobal(name, nunjucksGlobal)\n  }\n\n  // Apply any additional filters to both the liquid and nunjucks engines\n  if (pluginOptions.filters) {\n    for (const [name, filter] of Object.entries(pluginOptions.filters)) {\n      env.addFilter(name, filter)\n      engine.registerFilter(name, filter)\n    }\n  }\n\n  // Apply any additional globals to nunjucks engines\n  if (pluginOptions.globals) {\n    Object.entries(pluginOptions.globals).forEach(([name, fn]) => {\n      env.addGlobal(name, fn)\n    })\n  }\n}\n\nexport default plugin\n"],"mappings":"AAAA,SAASA,cAAc,QAAQ,oBAAoB;AAGnD,SAASC,MAAM;AACf,SAASC,MAAM;AAEf,SACEC,uBAAuB,EACvBC,mBAAmB,EACnBC,QAAQ,EACRC,YAAY,EACZC,OAAO;AAET,OAAO,KAAKC,OAAO;AAEnB,SAASC,WAAW;AACpB,SAASC,OAAO;AAChB,SACEC,mBAAmB,EACnBC,cAAc,EACdC,YAAY,EACZC,gBAAgB;AAElB;AAEA,MAAMC,OAAO,GAAG;EACdZ,uBAAuB;EACvBC,mBAAmB;EACnBC,QAAQ;EACRC,YAAY;EACZU,CAAC,EAAET;AACL,CAAC;AAED,OAAO,MAAMU,SAAS,GAAG,iCAAiC;AAC1D,OAAO,MAAMC,WAAW,GAAG,yCAAyC;AAEpE,OAAO,MAAMC,uBAAuB,GAAG,wBAAwB;AAC/D,OAAO,MAAMC,qBAAqB,GAAG,mBAAmB;AACxD,OAAO,MAAMC,mBAAmB,GAAG,oBAAoB;AAEvD,OAAO,MAAMC,0BAA0B,GAAG,SAAAA,CACxCC,GAAgB,EAChBC,aAA4B,EAC5B;EACA,KAAK,MAAM,CAACC,IAAI,EAAEC,cAAc,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACpB,OAAO,CAAC,EAAE;IAC5De,GAAG,CAACM,SAAS,CAACJ,IAAI,EAAEC,cAAc,CAAC;EACrC;EAEAH,GAAG,CAACM,SAAS,CAAC,UAAU,EAAE,CAACC,IAAY,EAAEC,mBAA4B,KACnE/B,cAAc,CAAC8B,IAAI,EAAE;IACnBE,OAAO,EAAER,aAAa,CAACQ,OAAO;IAC9BD;EACF,CAAC,CACH,CAAC;EAED,KAAK,MAAM,CAACN,IAAI,EAAEQ,cAAc,CAAC,IAAIN,MAAM,CAACC,OAAO,CAACb,OAAO,CAAC,EAAE;IAC5DQ,GAAG,CAACW,SAAS,CAACT,IAAI,EAAEQ,cAAc,CAAC;EACrC;;EAEA;EACA,IAAIT,aAAa,CAAChB,OAAO,EAAE;IACzB,KAAK,MAAM,CAACiB,IAAI,EAAEU,MAAM,CAAC,IAAIR,MAAM,CAACC,OAAO,CAACJ,aAAa,CAAChB,OAAO,CAAC,EAAE;MAClEe,GAAG,CAACM,SAAS,CAACJ,IAAI,EAAEU,MAAM,CAAC;MAC3BlC,MAAM,CAACmC,cAAc,CAACX,IAAI,EAAEU,MAAM,CAAC;IACrC;EACF;;EAEA;EACA,IAAIX,aAAa,CAACT,OAAO,EAAE;IACzBY,MAAM,CAACC,OAAO,CAACJ,aAAa,CAACT,OAAO,CAAC,CAACsB,OAAO,CAAC,CAAC,CAACZ,IAAI,EAAEa,EAAE,CAAC,KAAK;MAC5Df,GAAG,CAACW,SAAS,CAACT,IAAI,EAAEa,EAAE,CAAC;IACzB,CAAC,CAAC;EACJ;AACF,CAAC;AAED,eAAepC,MAAM","ignoreList":[]}
+{"version":3,"file":"index.js","names":["markdownToHtml","engine","plugin","checkComponentTemplates","checkErrorTemplates","evaluate","govukRebrand","tGlobal","filters","getPageHref","context","getFirstJourneyPage","getFormContext","getFormModel","resolveFormModel","getAvailableLanguages","extractMetadataBaseTranslations","loadFormTranslations","extractBaseTranslations","applyUrlParam","globals","t","VIEW_PATH","PLUGIN_PATH","STATE_NOT_YET_VALIDATED","CURRENT_PAGE_PATH_KEY","MAGIC_LINK_GROUP_ID","prepareNunjucksEnvironment","env","pluginOptions","name","nunjucksFilter","Object","entries","addFilter","text","startingHeaderLevel","baseUrl","nunjucksGlobal","addGlobal","filter","registerFilter","forEach","fn"],"sources":["../../../../src/server/plugins/engine/index.ts"],"sourcesContent":["import { markdownToHtml } from '@defra/forms-model'\nimport { type Environment } from 'nunjucks'\n\nimport { engine } from '~/src/server/plugins/engine/helpers.js'\nimport { plugin } from '~/src/server/plugins/engine/plugin.js'\nimport { type PluginOptions } from '~/src/server/plugins/engine/types.js'\nimport {\n  checkComponentTemplates,\n  checkErrorTemplates,\n  evaluate,\n  govukRebrand,\n  tGlobal\n} from '~/src/server/plugins/nunjucks/environment.js'\nimport * as filters from '~/src/server/plugins/nunjucks/filters/index.js'\n\nexport { getPageHref } from '~/src/server/plugins/engine/helpers.js'\nexport { context } from '~/src/server/plugins/nunjucks/context.js'\nexport {\n  getFirstJourneyPage,\n  getFormContext,\n  getFormModel,\n  resolveFormModel\n} from '~/src/server/plugins/engine/form-context.js'\nexport * from '~/src/server/plugins/engine/form-availability.js'\nexport { getAvailableLanguages } from '~/src/server/plugins/engine/i18n/languages.js'\nexport {\n  extractMetadataBaseTranslations,\n  loadFormTranslations\n} from '~/src/server/plugins/engine/i18n/createFormTranslator.js'\nexport { extractBaseTranslations } from '~/src/server/plugins/engine/i18n/extractBaseTranslations.js'\nexport { applyUrlParam } from '~/src/server/plugins/nunjucks/filters/applyUrlParam.js'\n\nconst globals = {\n  checkComponentTemplates,\n  checkErrorTemplates,\n  evaluate,\n  govukRebrand,\n  t: tGlobal\n}\n\nexport const VIEW_PATH = 'src/server/plugins/engine/views'\nexport const PLUGIN_PATH = 'node_modules/@defra/forms-engine-plugin'\n\nexport const STATE_NOT_YET_VALIDATED = '__stateNotYetValidated'\nexport const CURRENT_PAGE_PATH_KEY = '__currentPagePath'\nexport const MAGIC_LINK_GROUP_ID = '__magicLinkGroupId'\n\nexport const prepareNunjucksEnvironment = function (\n  env: Environment,\n  pluginOptions: PluginOptions\n) {\n  for (const [name, nunjucksFilter] of Object.entries(filters)) {\n    env.addFilter(name, nunjucksFilter)\n  }\n\n  env.addFilter('markdown', (text: string, startingHeaderLevel?: number) =>\n    markdownToHtml(text, {\n      baseUrl: pluginOptions.baseUrl,\n      startingHeaderLevel\n    })\n  )\n\n  for (const [name, nunjucksGlobal] of Object.entries(globals)) {\n    env.addGlobal(name, nunjucksGlobal)\n  }\n\n  // Apply any additional filters to both the liquid and nunjucks engines\n  if (pluginOptions.filters) {\n    for (const [name, filter] of Object.entries(pluginOptions.filters)) {\n      env.addFilter(name, filter)\n      engine.registerFilter(name, filter)\n    }\n  }\n\n  // Apply any additional globals to nunjucks engines\n  if (pluginOptions.globals) {\n    Object.entries(pluginOptions.globals).forEach(([name, fn]) => {\n      env.addGlobal(name, fn)\n    })\n  }\n}\n\nexport default plugin\n"],"mappings":"AAAA,SAASA,cAAc,QAAQ,oBAAoB;AAGnD,SAASC,MAAM;AACf,SAASC,MAAM;AAEf,SACEC,uBAAuB,EACvBC,mBAAmB,EACnBC,QAAQ,EACRC,YAAY,EACZC,OAAO;AAET,OAAO,KAAKC,OAAO;AAEnB,SAASC,WAAW;AACpB,SAASC,OAAO;AAChB,SACEC,mBAAmB,EACnBC,cAAc,EACdC,YAAY,EACZC,gBAAgB;AAElB;AACA,SAASC,qBAAqB;AAC9B,SACEC,+BAA+B,EAC/BC,oBAAoB;AAEtB,SAASC,uBAAuB;AAChC,SAASC,aAAa;AAEtB,MAAMC,OAAO,GAAG;EACdjB,uBAAuB;EACvBC,mBAAmB;EACnBC,QAAQ;EACRC,YAAY;EACZe,CAAC,EAAEd;AACL,CAAC;AAED,OAAO,MAAMe,SAAS,GAAG,iCAAiC;AAC1D,OAAO,MAAMC,WAAW,GAAG,yCAAyC;AAEpE,OAAO,MAAMC,uBAAuB,GAAG,wBAAwB;AAC/D,OAAO,MAAMC,qBAAqB,GAAG,mBAAmB;AACxD,OAAO,MAAMC,mBAAmB,GAAG,oBAAoB;AAEvD,OAAO,MAAMC,0BAA0B,GAAG,SAAAA,CACxCC,GAAgB,EAChBC,aAA4B,EAC5B;EACA,KAAK,MAAM,CAACC,IAAI,EAAEC,cAAc,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACzB,OAAO,CAAC,EAAE;IAC5DoB,GAAG,CAACM,SAAS,CAACJ,IAAI,EAAEC,cAAc,CAAC;EACrC;EAEAH,GAAG,CAACM,SAAS,CAAC,UAAU,EAAE,CAACC,IAAY,EAAEC,mBAA4B,KACnEpC,cAAc,CAACmC,IAAI,EAAE;IACnBE,OAAO,EAAER,aAAa,CAACQ,OAAO;IAC9BD;EACF,CAAC,CACH,CAAC;EAED,KAAK,MAAM,CAACN,IAAI,EAAEQ,cAAc,CAAC,IAAIN,MAAM,CAACC,OAAO,CAACb,OAAO,CAAC,EAAE;IAC5DQ,GAAG,CAACW,SAAS,CAACT,IAAI,EAAEQ,cAAc,CAAC;EACrC;;EAEA;EACA,IAAIT,aAAa,CAACrB,OAAO,EAAE;IACzB,KAAK,MAAM,CAACsB,IAAI,EAAEU,MAAM,CAAC,IAAIR,MAAM,CAACC,OAAO,CAACJ,aAAa,CAACrB,OAAO,CAAC,EAAE;MAClEoB,GAAG,CAACM,SAAS,CAACJ,IAAI,EAAEU,MAAM,CAAC;MAC3BvC,MAAM,CAACwC,cAAc,CAACX,IAAI,EAAEU,MAAM,CAAC;IACrC;EACF;;EAEA;EACA,IAAIX,aAAa,CAACT,OAAO,EAAE;IACzBY,MAAM,CAACC,OAAO,CAACJ,aAAa,CAACT,OAAO,CAAC,CAACsB,OAAO,CAAC,CAAC,CAACZ,IAAI,EAAEa,EAAE,CAAC,KAAK;MAC5Df,GAAG,CAACW,SAAS,CAACT,IAAI,EAAEa,EAAE,CAAC;IACzB,CAAC,CAAC;EACJ;AACF,CAAC;AAED,eAAezC,MAAM","ignoreList":[]}

package/.server/server/plugins/engine/models/FormModel.d.ts

@@ -77,7 +77,3 @@ export declare class FormModel {
      */
     moreThanOnePaymentQuestion(): boolean;
 }
-export declare function getAvailableLanguages(def: FormDefinition): {
-    name: string;
-    code: string;
-}[];

package/.server/server/plugins/engine/models/FormModel.js

@@ -3,6 +3,7 @@ import { add, format } from 'date-fns';
 import { Parser } from 'expr-eval-fork';
 import joi from 'joi';
 import { logger } from "../../../common/helpers/logging/logger.js";
+import { EN_GB } from "../../../constants.js";
 import "../components/YesNoField.js";
 import { hasListFormField } from "../components/helpers/components.js";
 import { todayAsDateOnly } from "../date-helper.js";
@@ -11,6 +12,7 @@ import { loadFormTranslations } from "../i18n/createFormTranslator.js";
 import { createTranslator } from "../i18n/createTranslator.js";
 import { extractBaseTranslations } from "../i18n/extractBaseTranslations.js";
 import { createFormI18nInstance } from "../i18n/index.js";
+import { getAvailableLanguages } from "../i18n/languages.js";
 import { createPage } from "../pageControllers/helpers/pages.js";
 import { validationOptions as opts } from "../pageControllers/validationOptions.js";
 import * as defaultServices from "../services/index.js";
@@ -129,7 +131,12 @@ export class FormModel {
   }
 
   /** Returns a scoped translator pair for the given language. */
-  createTranslator(language = 'en-GB') {
+  createTranslator(language = EN_GB) {
+    // @ts-expect-error - dynamic language lookup
+    if (!this.def.metadata?.translations?.[language]) {
+      // If not translations defined in the FormDefinition, always default to English
+      language = EN_GB;
+    }
     return createTranslator(this.i18nInstance, language);
   }
 
@@ -481,7 +488,7 @@ function validateFormState(request, page, context) {
 
   // Add relevant state errors
   if (error) {
-    const errorsState = error.details.map(getError);
+    const errorsState = error.details.map(item => getError(EN_GB, item));
     return {
       ...context,
       errors: errors.concat(errorsState)
@@ -495,17 +502,4 @@ function getReferenceNumber(state) {
   }
   return state.$$__referenceNumber;
 }
-export function getAvailableLanguages(def) {
-  // @ts-expect-error - dynamic property
-  if (def.metadata?.translations?.cy) {
-    return [{
-      name: 'English',
-      code: 'en-GB'
-    }, {
-      name: 'Cymraeg',
-      code: 'cy'
-    }];
-  }
-  return [];
-}
 //# sourceMappingURL=FormModel.js.map