@defra/forms-engine-plugin 5.0.0-alpha.3 → 5.0.0-alpha.30

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

@@ -1,25 +1,47 @@
 import { yesNoListNoItemId, yesNoListYesItemId } from '@defra/forms-model';
+import { CY } from "../../../constants.js";
 import { createTranslator } from "./createTranslator.js";
 import { extractBaseTranslations } from "./extractBaseTranslations.js";
 import { createFormI18nInstance } from "./index.js";
-export function createFormTranslator(def, language) {
-  const baseTranslations = extractBaseTranslations(def);
+export function createFormTranslator(metadata, definition, language) {
+  const baseTranslations = extractBaseTranslations(definition);
   const i18nInstance = createFormI18nInstance(baseTranslations);
-  loadFormTranslations(def, i18nInstance);
-  return createTranslator(i18nInstance, language);
+  loadFormTranslations(definition, i18nInstance);
+  extractMetadataBaseTranslations(metadata, i18nInstance);
+  const translator = createTranslator(i18nInstance, language);
+  return translator;
 }
 export function loadFormTranslations(def, i18nInstance) {
+  if (!def) {
+    return;
+  }
   const formTranslations = def.metadata?.translations;
   if (formTranslations) {
     for (const [lng, resources] of Object.entries(formTranslations)) {
       i18nInstance.addResourceBundle(lng, 'form', resources, true, true);
 
       // Temporary workaround - until we develop a better solution
-      if (lng === 'cy') {
+      if (lng === CY) {
         i18nInstance.addResource(lng, 'form', `listItems.${yesNoListYesItemId}.text`, 'Ie');
         i18nInstance.addResource(lng, 'form', `listItems.${yesNoListNoItemId}.text`, 'Nage');
       }
     }
   }
 }
+export function extractMetadataBaseTranslations(metadata, i18nInstance) {
+  if (metadata) {
+    const translations = {
+      'form.title': metadata.title,
+      'form.contact.email.address': metadata.contact?.email?.address ?? '',
+      'form.contact.email.responseTime': metadata.contact?.email?.responseTime ?? '',
+      'form.contact.online.url': metadata.contact?.online?.url ?? '',
+      'form.contact.online.text': metadata.contact?.online?.text ?? '',
+      'form.contact.phone': metadata.contact?.phone ?? '',
+      'form.submissionGuidance': metadata.submissionGuidance ?? '',
+      'form.privacyNoticeText': metadata.privacyNoticeText ?? '',
+      'form.privacyNoticeUrl': metadata.privacyNoticeUrl ?? ''
+    };
+    i18nInstance.addResourceBundle('en-GB', 'form', translations, true, true);
+  }
+}
 //# sourceMappingURL=createFormTranslator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"createFormTranslator.js","names":["yesNoListNoItemId","yesNoListYesItemId","createTranslator","extractBaseTranslations","createFormI18nInstance","createFormTranslator","def","language","baseTranslations","i18nInstance","loadFormTranslations","formTranslations","metadata","translations","lng","resources","Object","entries","addResourceBundle","addResource"],"sources":["../../../../../src/server/plugins/engine/i18n/createFormTranslator.ts"],"sourcesContent":["import {\n  yesNoListNoItemId,\n  yesNoListYesItemId,\n  type FormDefinition\n} from '@defra/forms-model'\nimport { type i18n } from 'i18next'\n\nimport { createTranslator } from '~/src/server/plugins/engine/i18n/createTranslator.js'\nimport { extractBaseTranslations } from '~/src/server/plugins/engine/i18n/extractBaseTranslations.js'\nimport { createFormI18nInstance } from '~/src/server/plugins/engine/i18n/index.js'\nimport {\n  type FormDefinitionTranslations,\n  type Translator\n} from '~/src/server/plugins/engine/i18n/types.js'\n\nexport function createFormTranslator(\n  def: FormDefinition,\n  language: string\n): Translator {\n  const baseTranslations = extractBaseTranslations(def)\n  const i18nInstance = createFormI18nInstance(baseTranslations)\n  loadFormTranslations(def, i18nInstance)\n\n  return createTranslator(i18nInstance, language)\n}\n\nexport function loadFormTranslations(def: FormDefinition, i18nInstance: i18n) {\n  const formTranslations = def.metadata?.translations as\n    | FormDefinitionTranslations\n    | undefined\n\n  if (formTranslations) {\n    for (const [lng, resources] of Object.entries(formTranslations)) {\n      i18nInstance.addResourceBundle(lng, 'form', resources, true, true)\n\n      // Temporary workaround - until we develop a better solution\n      if (lng === 'cy') {\n        i18nInstance.addResource(\n          lng,\n          'form',\n          `listItems.${yesNoListYesItemId}.text`,\n          'Ie'\n        )\n        i18nInstance.addResource(\n          lng,\n          'form',\n          `listItems.${yesNoListNoItemId}.text`,\n          'Nage'\n        )\n      }\n    }\n  }\n}\n"],"mappings":"AAAA,SACEA,iBAAiB,EACjBC,kBAAkB,QAEb,oBAAoB;AAG3B,SAASC,gBAAgB;AACzB,SAASC,uBAAuB;AAChC,SAASC,sBAAsB;AAM/B,OAAO,SAASC,oBAAoBA,CAClCC,GAAmB,EACnBC,QAAgB,EACJ;EACZ,MAAMC,gBAAgB,GAAGL,uBAAuB,CAACG,GAAG,CAAC;EACrD,MAAMG,YAAY,GAAGL,sBAAsB,CAACI,gBAAgB,CAAC;EAC7DE,oBAAoB,CAACJ,GAAG,EAAEG,YAAY,CAAC;EAEvC,OAAOP,gBAAgB,CAACO,YAAY,EAAEF,QAAQ,CAAC;AACjD;AAEA,OAAO,SAASG,oBAAoBA,CAACJ,GAAmB,EAAEG,YAAkB,EAAE;EAC5E,MAAME,gBAAgB,GAAGL,GAAG,CAACM,QAAQ,EAAEC,YAE1B;EAEb,IAAIF,gBAAgB,EAAE;IACpB,KAAK,MAAM,CAACG,GAAG,EAAEC,SAAS,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACN,gBAAgB,CAAC,EAAE;MAC/DF,YAAY,CAACS,iBAAiB,CAACJ,GAAG,EAAE,MAAM,EAAEC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;;MAElE;MACA,IAAID,GAAG,KAAK,IAAI,EAAE;QAChBL,YAAY,CAACU,WAAW,CACtBL,GAAG,EACH,MAAM,EACN,aAAab,kBAAkB,OAAO,EACtC,IACF,CAAC;QACDQ,YAAY,CAACU,WAAW,CACtBL,GAAG,EACH,MAAM,EACN,aAAad,iBAAiB,OAAO,EACrC,MACF,CAAC;MACH;IACF;EACF;AACF","ignoreList":[]}
+{"version":3,"file":"createFormTranslator.js","names":["yesNoListNoItemId","yesNoListYesItemId","CY","createTranslator","extractBaseTranslations","createFormI18nInstance","createFormTranslator","metadata","definition","language","baseTranslations","i18nInstance","loadFormTranslations","extractMetadataBaseTranslations","translator","def","formTranslations","translations","lng","resources","Object","entries","addResourceBundle","addResource","title","contact","email","address","responseTime","online","url","text","phone","submissionGuidance","privacyNoticeText","privacyNoticeUrl"],"sources":["../../../../../src/server/plugins/engine/i18n/createFormTranslator.ts"],"sourcesContent":["import {\n  yesNoListNoItemId,\n  yesNoListYesItemId,\n  type FormDefinition,\n  type FormMetadata\n} from '@defra/forms-model'\nimport { type i18n } from 'i18next'\n\nimport { CY } from '~/src/server/constants.js'\nimport { createTranslator } from '~/src/server/plugins/engine/i18n/createTranslator.js'\nimport { extractBaseTranslations } from '~/src/server/plugins/engine/i18n/extractBaseTranslations.js'\nimport { createFormI18nInstance } from '~/src/server/plugins/engine/i18n/index.js'\nimport { type FormDefinitionTranslations } from '~/src/server/plugins/engine/i18n/types.js'\n\nexport function createFormTranslator(\n  metadata: FormMetadata,\n  definition: FormDefinition | undefined,\n  language: string\n) {\n  const baseTranslations = extractBaseTranslations(definition)\n  const i18nInstance = createFormI18nInstance(baseTranslations)\n  loadFormTranslations(definition, i18nInstance)\n  extractMetadataBaseTranslations(metadata, i18nInstance)\n\n  const translator = createTranslator(i18nInstance, language)\n\n  return translator\n}\n\nexport function loadFormTranslations(\n  def: FormDefinition | undefined,\n  i18nInstance: i18n\n) {\n  if (!def) {\n    return\n  }\n\n  const formTranslations = def.metadata?.translations as\n    | FormDefinitionTranslations\n    | undefined\n\n  if (formTranslations) {\n    for (const [lng, resources] of Object.entries(formTranslations)) {\n      i18nInstance.addResourceBundle(lng, 'form', resources, true, true)\n\n      // Temporary workaround - until we develop a better solution\n      if (lng === CY) {\n        i18nInstance.addResource(\n          lng,\n          'form',\n          `listItems.${yesNoListYesItemId}.text`,\n          'Ie'\n        )\n        i18nInstance.addResource(\n          lng,\n          'form',\n          `listItems.${yesNoListNoItemId}.text`,\n          'Nage'\n        )\n      }\n    }\n  }\n}\n\nexport function extractMetadataBaseTranslations(\n  metadata: FormMetadata | undefined,\n  i18nInstance: i18n\n) {\n  if (metadata) {\n    const translations = {\n      'form.title': metadata.title,\n      'form.contact.email.address': metadata.contact?.email?.address ?? '',\n      'form.contact.email.responseTime':\n        metadata.contact?.email?.responseTime ?? '',\n      'form.contact.online.url': metadata.contact?.online?.url ?? '',\n      'form.contact.online.text': metadata.contact?.online?.text ?? '',\n      'form.contact.phone': metadata.contact?.phone ?? '',\n      'form.submissionGuidance': metadata.submissionGuidance ?? '',\n      'form.privacyNoticeText': metadata.privacyNoticeText ?? '',\n      'form.privacyNoticeUrl': metadata.privacyNoticeUrl ?? ''\n    }\n    i18nInstance.addResourceBundle('en-GB', 'form', translations, true, true)\n  }\n}\n"],"mappings":"AAAA,SACEA,iBAAiB,EACjBC,kBAAkB,QAGb,oBAAoB;AAG3B,SAASC,EAAE;AACX,SAASC,gBAAgB;AACzB,SAASC,uBAAuB;AAChC,SAASC,sBAAsB;AAG/B,OAAO,SAASC,oBAAoBA,CAClCC,QAAsB,EACtBC,UAAsC,EACtCC,QAAgB,EAChB;EACA,MAAMC,gBAAgB,GAAGN,uBAAuB,CAACI,UAAU,CAAC;EAC5D,MAAMG,YAAY,GAAGN,sBAAsB,CAACK,gBAAgB,CAAC;EAC7DE,oBAAoB,CAACJ,UAAU,EAAEG,YAAY,CAAC;EAC9CE,+BAA+B,CAACN,QAAQ,EAAEI,YAAY,CAAC;EAEvD,MAAMG,UAAU,GAAGX,gBAAgB,CAACQ,YAAY,EAAEF,QAAQ,CAAC;EAE3D,OAAOK,UAAU;AACnB;AAEA,OAAO,SAASF,oBAAoBA,CAClCG,GAA+B,EAC/BJ,YAAkB,EAClB;EACA,IAAI,CAACI,GAAG,EAAE;IACR;EACF;EAEA,MAAMC,gBAAgB,GAAGD,GAAG,CAACR,QAAQ,EAAEU,YAE1B;EAEb,IAAID,gBAAgB,EAAE;IACpB,KAAK,MAAM,CAACE,GAAG,EAAEC,SAAS,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACL,gBAAgB,CAAC,EAAE;MAC/DL,YAAY,CAACW,iBAAiB,CAACJ,GAAG,EAAE,MAAM,EAAEC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;;MAElE;MACA,IAAID,GAAG,KAAKhB,EAAE,EAAE;QACdS,YAAY,CAACY,WAAW,CACtBL,GAAG,EACH,MAAM,EACN,aAAajB,kBAAkB,OAAO,EACtC,IACF,CAAC;QACDU,YAAY,CAACY,WAAW,CACtBL,GAAG,EACH,MAAM,EACN,aAAalB,iBAAiB,OAAO,EACrC,MACF,CAAC;MACH;IACF;EACF;AACF;AAEA,OAAO,SAASa,+BAA+BA,CAC7CN,QAAkC,EAClCI,YAAkB,EAClB;EACA,IAAIJ,QAAQ,EAAE;IACZ,MAAMU,YAAY,GAAG;MACnB,YAAY,EAAEV,QAAQ,CAACiB,KAAK;MAC5B,4BAA4B,EAAEjB,QAAQ,CAACkB,OAAO,EAAEC,KAAK,EAAEC,OAAO,IAAI,EAAE;MACpE,iCAAiC,EAC/BpB,QAAQ,CAACkB,OAAO,EAAEC,KAAK,EAAEE,YAAY,IAAI,EAAE;MAC7C,yBAAyB,EAAErB,QAAQ,CAACkB,OAAO,EAAEI,MAAM,EAAEC,GAAG,IAAI,EAAE;MAC9D,0BAA0B,EAAEvB,QAAQ,CAACkB,OAAO,EAAEI,MAAM,EAAEE,IAAI,IAAI,EAAE;MAChE,oBAAoB,EAAExB,QAAQ,CAACkB,OAAO,EAAEO,KAAK,IAAI,EAAE;MACnD,yBAAyB,EAAEzB,QAAQ,CAAC0B,kBAAkB,IAAI,EAAE;MAC5D,wBAAwB,EAAE1B,QAAQ,CAAC2B,iBAAiB,IAAI,EAAE;MAC1D,uBAAuB,EAAE3B,QAAQ,CAAC4B,gBAAgB,IAAI;IACxD,CAAC;IACDxB,YAAY,CAACW,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAEL,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC;EAC3E;AACF","ignoreList":[]}

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

@@ -1,5 +1,5 @@
 import { type FormDefinition } from '@defra/forms-model';
 import { type FormDefinitionTranslations } from '../../../../server/plugins/engine/i18n/types.js';
 type BaseTranslations = FormDefinitionTranslations[string];
-export declare function extractBaseTranslations(def: FormDefinition): BaseTranslations;
+export declare function extractBaseTranslations(def: FormDefinition | undefined): BaseTranslations;
 export {};

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

@@ -5,6 +5,15 @@ export function extractBaseTranslations(def) {
   const sections = {};
   const listItems = {};
   const form = {};
+  if (!def) {
+    return {
+      pages,
+      components,
+      sections,
+      listItems,
+      form
+    };
+  }
   for (const page of def.pages) {
     if (page.id && page.title) {
       pages[page.id] = {

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

@@ -1 +1 @@
-{"version":3,"file":"extractBaseTranslations.js","names":["hasComponentsEvenIfNoNext","extractBaseTranslations","def","pages","components","sections","listItems","form","page","id","title","component","entry","hint","content","shortDescription","Object","keys","length","section","list","lists","item","items","text","name"],"sources":["../../../../../src/server/plugins/engine/i18n/extractBaseTranslations.ts"],"sourcesContent":["import {\n  hasComponentsEvenIfNoNext,\n  type FormDefinition\n} from '@defra/forms-model'\n\nimport { type FormDefinitionTranslations } from '~/src/server/plugins/engine/i18n/types.js'\n\ntype BaseTranslations = FormDefinitionTranslations[string]\n\nexport function extractBaseTranslations(def: FormDefinition): BaseTranslations {\n  const pages: BaseTranslations['pages'] = {}\n  const components: BaseTranslations['components'] = {}\n  const sections: BaseTranslations['sections'] = {}\n  const listItems: BaseTranslations['listItems'] = {}\n  const form: BaseTranslations['form'] = {}\n\n  for (const page of def.pages) {\n    if (page.id && page.title) {\n      pages[page.id] = { title: page.title }\n    }\n\n    if (hasComponentsEvenIfNoNext(page)) {\n      for (const component of page.components) {\n        if (!component.id) continue\n\n        const entry: BaseTranslations['components'][string] = {}\n\n        if (component.title) entry.title = component.title\n        if ('hint' in component && component.hint) entry.hint = component.hint\n        if ('content' in component && component.content) {\n          entry.content = component.content\n        }\n        if ('shortDescription' in component && component.shortDescription) {\n          entry.shortDescription = component.shortDescription\n        }\n\n        if (Object.keys(entry).length) {\n          components[component.id] = entry\n        }\n      }\n    }\n  }\n\n  for (const section of def.sections) {\n    if (section.id && section.title) {\n      sections[section.id] = { title: section.title }\n    }\n  }\n\n  for (const list of def.lists) {\n    for (const item of list.items) {\n      if (item.id && item.text) {\n        listItems[item.id] = { text: item.text }\n      }\n    }\n  }\n\n  form.title = def.name ?? ''\n\n  return { pages, components, sections, listItems, form }\n}\n"],"mappings":"AAAA,SACEA,yBAAyB,QAEpB,oBAAoB;AAM3B,OAAO,SAASC,uBAAuBA,CAACC,GAAmB,EAAoB;EAC7E,MAAMC,KAAgC,GAAG,CAAC,CAAC;EAC3C,MAAMC,UAA0C,GAAG,CAAC,CAAC;EACrD,MAAMC,QAAsC,GAAG,CAAC,CAAC;EACjD,MAAMC,SAAwC,GAAG,CAAC,CAAC;EACnD,MAAMC,IAA8B,GAAG,CAAC,CAAC;EAEzC,KAAK,MAAMC,IAAI,IAAIN,GAAG,CAACC,KAAK,EAAE;IAC5B,IAAIK,IAAI,CAACC,EAAE,IAAID,IAAI,CAACE,KAAK,EAAE;MACzBP,KAAK,CAACK,IAAI,CAACC,EAAE,CAAC,GAAG;QAAEC,KAAK,EAAEF,IAAI,CAACE;MAAM,CAAC;IACxC;IAEA,IAAIV,yBAAyB,CAACQ,IAAI,CAAC,EAAE;MACnC,KAAK,MAAMG,SAAS,IAAIH,IAAI,CAACJ,UAAU,EAAE;QACvC,IAAI,CAACO,SAAS,CAACF,EAAE,EAAE;QAEnB,MAAMG,KAA6C,GAAG,CAAC,CAAC;QAExD,IAAID,SAAS,CAACD,KAAK,EAAEE,KAAK,CAACF,KAAK,GAAGC,SAAS,CAACD,KAAK;QAClD,IAAI,MAAM,IAAIC,SAAS,IAAIA,SAAS,CAACE,IAAI,EAAED,KAAK,CAACC,IAAI,GAAGF,SAAS,CAACE,IAAI;QACtE,IAAI,SAAS,IAAIF,SAAS,IAAIA,SAAS,CAACG,OAAO,EAAE;UAC/CF,KAAK,CAACE,OAAO,GAAGH,SAAS,CAACG,OAAO;QACnC;QACA,IAAI,kBAAkB,IAAIH,SAAS,IAAIA,SAAS,CAACI,gBAAgB,EAAE;UACjEH,KAAK,CAACG,gBAAgB,GAAGJ,SAAS,CAACI,gBAAgB;QACrD;QAEA,IAAIC,MAAM,CAACC,IAAI,CAACL,KAAK,CAAC,CAACM,MAAM,EAAE;UAC7Bd,UAAU,CAACO,SAAS,CAACF,EAAE,CAAC,GAAGG,KAAK;QAClC;MACF;IACF;EACF;EAEA,KAAK,MAAMO,OAAO,IAAIjB,GAAG,CAACG,QAAQ,EAAE;IAClC,IAAIc,OAAO,CAACV,EAAE,IAAIU,OAAO,CAACT,KAAK,EAAE;MAC/BL,QAAQ,CAACc,OAAO,CAACV,EAAE,CAAC,GAAG;QAAEC,KAAK,EAAES,OAAO,CAACT;MAAM,CAAC;IACjD;EACF;EAEA,KAAK,MAAMU,IAAI,IAAIlB,GAAG,CAACmB,KAAK,EAAE;IAC5B,KAAK,MAAMC,IAAI,IAAIF,IAAI,CAACG,KAAK,EAAE;MAC7B,IAAID,IAAI,CAACb,EAAE,IAAIa,IAAI,CAACE,IAAI,EAAE;QACxBlB,SAAS,CAACgB,IAAI,CAACb,EAAE,CAAC,GAAG;UAAEe,IAAI,EAAEF,IAAI,CAACE;QAAK,CAAC;MAC1C;IACF;EACF;EAEAjB,IAAI,CAACG,KAAK,GAAGR,GAAG,CAACuB,IAAI,IAAI,EAAE;EAE3B,OAAO;IAAEtB,KAAK;IAAEC,UAAU;IAAEC,QAAQ;IAAEC,SAAS;IAAEC;EAAK,CAAC;AACzD","ignoreList":[]}
+{"version":3,"file":"extractBaseTranslations.js","names":["hasComponentsEvenIfNoNext","extractBaseTranslations","def","pages","components","sections","listItems","form","page","id","title","component","entry","hint","content","shortDescription","Object","keys","length","section","list","lists","item","items","text","name"],"sources":["../../../../../src/server/plugins/engine/i18n/extractBaseTranslations.ts"],"sourcesContent":["import {\n  hasComponentsEvenIfNoNext,\n  type FormDefinition\n} from '@defra/forms-model'\n\nimport { type FormDefinitionTranslations } from '~/src/server/plugins/engine/i18n/types.js'\n\ntype BaseTranslations = FormDefinitionTranslations[string]\n\nexport function extractBaseTranslations(\n  def: FormDefinition | undefined\n): BaseTranslations {\n  const pages: BaseTranslations['pages'] = {}\n  const components: BaseTranslations['components'] = {}\n  const sections: BaseTranslations['sections'] = {}\n  const listItems: BaseTranslations['listItems'] = {}\n  const form: BaseTranslations['form'] = {}\n\n  if (!def) {\n    return { pages, components, sections, listItems, form }\n  }\n\n  for (const page of def.pages) {\n    if (page.id && page.title) {\n      pages[page.id] = { title: page.title }\n    }\n\n    if (hasComponentsEvenIfNoNext(page)) {\n      for (const component of page.components) {\n        if (!component.id) continue\n\n        const entry: BaseTranslations['components'][string] = {}\n\n        if (component.title) entry.title = component.title\n        if ('hint' in component && component.hint) entry.hint = component.hint\n        if ('content' in component && component.content) {\n          entry.content = component.content\n        }\n        if ('shortDescription' in component && component.shortDescription) {\n          entry.shortDescription = component.shortDescription\n        }\n\n        if (Object.keys(entry).length) {\n          components[component.id] = entry\n        }\n      }\n    }\n  }\n\n  for (const section of def.sections) {\n    if (section.id && section.title) {\n      sections[section.id] = { title: section.title }\n    }\n  }\n\n  for (const list of def.lists) {\n    for (const item of list.items) {\n      if (item.id && item.text) {\n        listItems[item.id] = { text: item.text }\n      }\n    }\n  }\n\n  form.title = def.name ?? ''\n\n  return { pages, components, sections, listItems, form }\n}\n"],"mappings":"AAAA,SACEA,yBAAyB,QAEpB,oBAAoB;AAM3B,OAAO,SAASC,uBAAuBA,CACrCC,GAA+B,EACb;EAClB,MAAMC,KAAgC,GAAG,CAAC,CAAC;EAC3C,MAAMC,UAA0C,GAAG,CAAC,CAAC;EACrD,MAAMC,QAAsC,GAAG,CAAC,CAAC;EACjD,MAAMC,SAAwC,GAAG,CAAC,CAAC;EACnD,MAAMC,IAA8B,GAAG,CAAC,CAAC;EAEzC,IAAI,CAACL,GAAG,EAAE;IACR,OAAO;MAAEC,KAAK;MAAEC,UAAU;MAAEC,QAAQ;MAAEC,SAAS;MAAEC;IAAK,CAAC;EACzD;EAEA,KAAK,MAAMC,IAAI,IAAIN,GAAG,CAACC,KAAK,EAAE;IAC5B,IAAIK,IAAI,CAACC,EAAE,IAAID,IAAI,CAACE,KAAK,EAAE;MACzBP,KAAK,CAACK,IAAI,CAACC,EAAE,CAAC,GAAG;QAAEC,KAAK,EAAEF,IAAI,CAACE;MAAM,CAAC;IACxC;IAEA,IAAIV,yBAAyB,CAACQ,IAAI,CAAC,EAAE;MACnC,KAAK,MAAMG,SAAS,IAAIH,IAAI,CAACJ,UAAU,EAAE;QACvC,IAAI,CAACO,SAAS,CAACF,EAAE,EAAE;QAEnB,MAAMG,KAA6C,GAAG,CAAC,CAAC;QAExD,IAAID,SAAS,CAACD,KAAK,EAAEE,KAAK,CAACF,KAAK,GAAGC,SAAS,CAACD,KAAK;QAClD,IAAI,MAAM,IAAIC,SAAS,IAAIA,SAAS,CAACE,IAAI,EAAED,KAAK,CAACC,IAAI,GAAGF,SAAS,CAACE,IAAI;QACtE,IAAI,SAAS,IAAIF,SAAS,IAAIA,SAAS,CAACG,OAAO,EAAE;UAC/CF,KAAK,CAACE,OAAO,GAAGH,SAAS,CAACG,OAAO;QACnC;QACA,IAAI,kBAAkB,IAAIH,SAAS,IAAIA,SAAS,CAACI,gBAAgB,EAAE;UACjEH,KAAK,CAACG,gBAAgB,GAAGJ,SAAS,CAACI,gBAAgB;QACrD;QAEA,IAAIC,MAAM,CAACC,IAAI,CAACL,KAAK,CAAC,CAACM,MAAM,EAAE;UAC7Bd,UAAU,CAACO,SAAS,CAACF,EAAE,CAAC,GAAGG,KAAK;QAClC;MACF;IACF;EACF;EAEA,KAAK,MAAMO,OAAO,IAAIjB,GAAG,CAACG,QAAQ,EAAE;IAClC,IAAIc,OAAO,CAACV,EAAE,IAAIU,OAAO,CAACT,KAAK,EAAE;MAC/BL,QAAQ,CAACc,OAAO,CAACV,EAAE,CAAC,GAAG;QAAEC,KAAK,EAAES,OAAO,CAACT;MAAM,CAAC;IACjD;EACF;EAEA,KAAK,MAAMU,IAAI,IAAIlB,GAAG,CAACmB,KAAK,EAAE;IAC5B,KAAK,MAAMC,IAAI,IAAIF,IAAI,CAACG,KAAK,EAAE;MAC7B,IAAID,IAAI,CAACb,EAAE,IAAIa,IAAI,CAACE,IAAI,EAAE;QACxBlB,SAAS,CAACgB,IAAI,CAACb,EAAE,CAAC,GAAG;UAAEe,IAAI,EAAEF,IAAI,CAACE;QAAK,CAAC;MAC1C;IACF;EACF;EAEAjB,IAAI,CAACG,KAAK,GAAGR,GAAG,CAACuB,IAAI,IAAI,EAAE;EAE3B,OAAO;IAAEtB,KAAK;IAAEC,UAAU;IAAEC,QAAQ;IAAEC,SAAS;IAAEC;EAAK,CAAC;AACzD","ignoreList":[]}

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,63 @@
     "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_zero": "Dewiswch o leiaf 1 opsiwn o'r rhestr",
+    "arrayMin_one": "Dewiswch o leiaf {{#limit}} opsiwn o'r rhestr",
+    "arrayMin_two": "Dewiswch o leiaf ddau opsiwn o'r rhestr",
+    "arrayMin_few": "Dewiswch o leiaf {{#limit}} opsiwn o'r rhestr",
+    "arrayMin_many": "Dewiswch o leiaf {{#limit}} opsiwn o'r rhestr",
+    "arrayMin_other": "Dewiswch o leiaf {{#limit}} opsiwn o'r rhestr",
+    "arrayMax_zero": "Dim ond {{#limit}} opsiynau y gellir eu dewis o'r rhestr",
+    "arrayMax_one": "Dim ond {{#limit}} opsiwn y gellir ei ddewis o'r rhestr",
+    "arrayMax_two": "Dim ond dwy opsiwn y gellir eu dewis o'r rhestr",
+    "arrayMax_few": "Dim ond {{#limit}} opsiwn y gellir eu dewis o'r rhestr",
+    "arrayMax_many": "Dim ond {{#limit}} opsiwn y gellir eu dewis o'r rhestr",
+    "arrayMax_other": "Dim ond {{#limit}} opsiwn y gellir eu dewis o'r rhestr",
+    "arrayLength_zero": "Dewiswch 0 opsiwn yn unig o'r rhestr",
+    "arrayLength_one": "Dewiswch un opsiwn yn unig o'r rhestr",
+    "arrayLength_two": "Dewiswch {{#limit}} opsiwn yn unig o'r rhestr",
+    "arrayLength_few": "Dewiswch {{#limit}} opsiwn yn unig o'r rhestr",
+    "arrayLength_many": "Dewiswch {{#limit}} opsiwn yn unig o'r rhestr",
+    "arrayLength_other": "Dewiswch {{#limit}} opsiwn yn unig o'r rhestr",
+
+    "featuresMin_zero": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMin_one": "Diffiniwch o leiaf un nodwedd",
+    "featuresMin_two": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMin_few": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMin_many": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMin_other": "Diffiniwch o leiaf {{#limit}} nodwedd",
+    "featuresMax_zero": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresMax_one": "Dim ond {{#limit}} nodwedd y gellir ei diffinio",
+    "featuresMax_two": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresMax_few": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresMax_many": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresMax_other": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
+    "featuresLength_zero": "Diffiniwch yn union {{#limit}} nodwedd",
+    "featuresLength_one": "Diffiniwch un nodwedd yn union",
+    "featuresLength_two": "Diffiniwch nodweddion {{#limit}} yn union",
+    "featuresLength_few": "Diffiniwch nodweddion {{#limit}} yn union",
+    "featuresLength_many": "Diffiniwch nodweddion {{#limit}} yn union",
+    "featuresLength_other": "Diffiniwch nodweddion {{#limit}} yn union",
+    "filesMin_zero": "Rhaid i chi uwchlwytho {{#limit}} ffeil neu fwy",
+    "filesMin_one": "Rhaid i chi uwchlwytho un ffeil neu fwy",
+    "filesMin_two": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
+    "filesMin_few": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
+    "filesMin_many": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
+    "filesMin_other": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
+    "filesMax_zero": "Dim ond {{#limit}} ffeil neu lai y gallwch eu huwchlwytho",
+    "filesMax_one": "Dim ond un ffeil neu lai y gallwch ei huwchlwytho",
+    "filesMax_two": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
+    "filesMax_few": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
+    "filesMax_many": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
+    "filesMax_other": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
+    "filesLength_zero": "Rhaid i chi uwchlwytho union {{#limit}} ffeil",
+    "filesLength_one": "Rhaid i chi uwchlwytho union un ffeil",
+    "filesLength_two": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau",
+    "filesLength_few": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau",
+    "filesLength_many": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau",
+    "filesLength_other": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau"
   },
 
   "errors": {
@@ -29,7 +85,14 @@
     "continue": "Parhau",
     "saveAndExit": "Cadw a gadael",
     "draft": "ddrafft",
-    "live": "fyw"
+    "live": "fyw",
+    "or": "neu",
+    "and": "a",
+    "england": "Lloegr",
+    "wales": "Cymru",
+    "northern-ireland": "Gogledd Iwerddon",
+    "scotland": "Yr Alban",
+    "sendFeedback": "Anfon adborth"
   },
 
   "pages": {
@@ -60,6 +123,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 +148,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": {
@@ -115,6 +207,16 @@
       "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."
+    },
+
+    "formUnavailable": {
+      "title": "Mae'n ddrwg gennyf, nid yw'r ffurflen hon ar gael",
+      "subHeading": "Nid yw '[[formTitle]]' ar gael mwyach.",
+      "contactDetailsHeading": "Manylion cyswllt ar gyfer [[organisationName]]",
+      "telephone": "Ffôn",
+      "callCharges": "Dysgwch am gostau galwadau",
+      "email": "E-bost",
+      "onlineContactForm": "Ffurflen gyswllt ar-lein"
     }
   },
 
@@ -135,7 +237,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",
@@ -200,7 +306,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": {
@@ -216,14 +323,23 @@
     },
 
     "locationFieldBase": {
-      "howToFind": "Sut i ddod o hyd i fanylion lleoliad"
+      "howToFind": "Sut i ddod o hyd i fanylion lleoliad",
+      "map": {
+        "helpPanel": {
+          "label": "Sut i ddefnyddio'r map hwn",
+          "point1": "Chwilio am sir, lle neu god post",
+          "point2": "Defnyddiwch yr eiconau + a - i chwyddo i mewn ac allan",
+          "point3": "Defnyddiwch lyfliwr neu allweddlon i ganolbwyntio'r pwynt yn y lleoliad",
+          "point4": "Cliciwch i ychwanegu'r lleoliad i'r map"
+        }
+      }
     },
 
     "yesNoField": {
       "yes": "Ie",
       "no": "Nage",
       "validation": {
-        "selectYesNoRequired": "{{#label}} - dewiswch ie neu na"
+        "selectYesNoRequired": "{{#label}} - dewiswch ie neu nage"
       }
     },
 
@@ -237,8 +353,53 @@
     },
 
     "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",
+      "map": {
+        "helpPanel": {
+          "label": "Sut i ddefnyddio'r map hwn",
+          "ledeIntro": "Gallwch ychwanegu",
+          "ledeOutro": "i'r map.",
+          "lineText": "llinell",
+          "shapeText": "siâp",
+          "lineOrShapeText": "llinell neu siâp",
+          "typesPhrasePoint": "pwyntiau",
+          "typesPhraseLine": "lliniau",
+          "typesPhraseShape": "siâpiau",
+          "typesPhraseOr": "neu",
+          "point1": "Chwilio am sir, lle neu god post",
+          "point2": "Defnyddiwch yr eiconau + a - i chwyddo i mewn ac allan",
+          "point3": "Cliciwch ddwywaith, neu dewiswch 'Wedi gorffen', pan fyddwch wedi",
+          "point4": "Rhowch enw i'r lleoliad"
+        },
+        "typeDescriptions": {
+          "point": "Pwynt",
+          "line": "Llinell",
+          "polygon": "Siâp"
+        },
+        "buttons": {
+          "point": "Ychwanegu pwynt",
+          "line": "Ychwanegu llinell",
+          "polygon": "Ychwanegu siâp"
+        },
+        "itemLabel1": "Lleoliad",
+        "itemLabel2": "disgrifiad",
+        "itemUpdateLink": "Diweddaru",
+        "itemDeleteLink": "Dileu",
+        "itemFocusLink": "Dangos",
+        "itemVisuallyHidden": "lleoliad",
+        "details": {
+          "summary": "Cyfesurynnau",
+          "type": "Math",
+          "centroidGridReference": "Canol cyfeirnod grid",
+          "firstPointGridReference": "Cyfeirnod grid y pwynt cyntaf",
+          "detailedCoordinates": "Cyfesurynnau manwl"
+        }
+      },
       "validation": {
         "descriptionRequired": "Rhowch ddisgrifiad ar gyfer lleoliad [[count]]",
         "wrongCountry": "Rhaid i leoliad [[count]] fod y tu mewn i [[country]]"
@@ -262,11 +423,19 @@
     },
 
     "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": {