@defra/forms-engine-plugin 5.0.0-alpha.2 → 5.0.0-alpha.21

package/src/server/plugins/engine/i18n/buildValidationMessages.ts

@@ -16,7 +16,9 @@ const opts = {
  * because Joi cannot resolve custom functions from a plain string.
  * Plain strings with only built-in tokens ({{#label}}, {{#limit}}) work without wrapping.
  */
-export function buildValidationMessages(t: (key: string) => string) {
+export function buildValidationMessages(
+  t: (key: string, options?: Record<string, unknown>) => string
+) {
   return {
     // Expressions — contain lowerFirst custom function
     required: joi.expression(t('validation.required'), opts) as JoiExpression,
@@ -56,13 +58,19 @@ export function buildValidationMessages(t: (key: string) => string) {
     dateMin: t('components.dateField.validation.dateMin'),
     dateMax: t('components.dateField.validation.dateMax'),
 
-    unicode: 'validation.unicode',
-    arrayMin: 'validation.array.min',
-    arrayMax: 'validation.array.max',
-    arrayLength: 'validation.array.length',
-    featuresMin: 'validation.features.min',
-    featuresMax: 'validation.features.max',
-    featuresLength: 'validation.features.length'
+    unicode: t('validation.unicode'),
+    // These generic templates are shared across fields with differing limits, so a
+    // fixed singular count is used here — components needing accurate singular/plural
+    // text (e.g. FileUploadField) build their own per-instance messages instead.
+    arrayMin: t('validation.arrayMin', { count: 1 }),
+    arrayMax: t('validation.arrayMax', { count: 1 }),
+    arrayLength: t('validation.arrayLength', { count: 1 }),
+    featuresMin: t('validation.featuresMin', { count: 1 }),
+    featuresMax: t('validation.featuresMax', { count: 1 }),
+    featuresLength: t('validation.featuresLength', { count: 1 }),
+    filesMin: t('validation.filesMin', { count: 1 }),
+    filesMax: t('validation.filesMax', { count: 1 }),
+    filesLength: t('validation.filesLength', { count: 1 })
   }
 }
 

package/src/server/plugins/engine/i18n/createFormTranslator.ts

@@ -1,26 +1,40 @@
-import { type FormDefinition } from '@defra/forms-model'
+import {
+  yesNoListNoItemId,
+  yesNoListYesItemId,
+  type FormDefinition,
+  type FormMetadata
+} from '@defra/forms-model'
 import { type i18n } from 'i18next'
 
+import { CY } from '../../../constants.js'
 import { createTranslator } from './createTranslator.js'
 import { extractBaseTranslations } from './extractBaseTranslations.js'
 import { createFormI18nInstance } from './index.js'
-import {
-  type FormDefinitionTranslations,
-  type Translator
-} from './types.js'
+import { type FormDefinitionTranslations } from './types.js'
 
 export function createFormTranslator(
-  def: FormDefinition,
+  metadata: FormMetadata,
+  definition: FormDefinition | undefined,
   language: string
-): Translator {
-  const baseTranslations = extractBaseTranslations(def)
+) {
+  const baseTranslations = extractBaseTranslations(definition)
   const i18nInstance = createFormI18nInstance(baseTranslations)
-  loadFormTranslations(def, i18nInstance)
+  loadFormTranslations(definition, i18nInstance)
+  extractMetadataBaseTranslations(metadata, i18nInstance)
+
+  const translator = createTranslator(i18nInstance, language)
 
-  return createTranslator(i18nInstance, language)
+  return translator
 }
 
-export function loadFormTranslations(def: FormDefinition, i18nInstance: i18n) {
+export function loadFormTranslations(
+  def: FormDefinition | undefined,
+  i18nInstance: i18n
+) {
+  if (!def) {
+    return
+  }
+
   const formTranslations = def.metadata?.translations as
     | FormDefinitionTranslations
     | undefined
@@ -28,6 +42,43 @@ export function loadFormTranslations(def: FormDefinition, i18nInstance: i18n) {
   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) {
+        i18nInstance.addResource(
+          lng,
+          'form',
+          `listItems.${yesNoListYesItemId}.text`,
+          'Ie'
+        )
+        i18nInstance.addResource(
+          lng,
+          'form',
+          `listItems.${yesNoListNoItemId}.text`,
+          'Nage'
+        )
+      }
+    }
+  }
+}
+
+export function extractMetadataBaseTranslations(
+  metadata: FormMetadata | undefined,
+  i18nInstance: i18n
+) {
+  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)
   }
 }

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

@@ -7,13 +7,19 @@ import { type FormDefinitionTranslations } from './types.js'
 
 type BaseTranslations = FormDefinitionTranslations[string]
 
-export function extractBaseTranslations(def: FormDefinition): BaseTranslations {
+export function extractBaseTranslations(
+  def: FormDefinition | undefined
+): BaseTranslations {
   const pages: BaseTranslations['pages'] = {}
   const components: BaseTranslations['components'] = {}
   const sections: BaseTranslations['sections'] = {}
   const listItems: BaseTranslations['listItems'] = {}
   const form: BaseTranslations['form'] = {}
 
+  if (!def) {
+    return { pages, components, sections, listItems, form }
+  }
+
   for (const page of def.pages) {
     if (page.id && page.title) {
       pages[page.id] = { title: page.title }

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

@@ -0,0 +1,54 @@
+import { type FormMetadata, type FormStatus } from '@defra/forms-model'
+import Boom from '@hapi/boom'
+import { LRUCache } from 'lru-cache'
+
+import { getPluginOptions } from '../helpers.js'
+import { createFormTranslator } from './createFormTranslator.js'
+import { type Translator } from './types.js'
+import { type AnyFormRequest } from '../types.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: AnyFormRequest,
+  metadata: FormMetadata,
+  status: FormStatus,
+  language: string
+) {
+  const key = `${metadata.id}-${status}-${language}-plugin-meta`
+
+  if (cache.has(key)) {
+    return cache.get(key) as unknown as Translator
+  }
+
+  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
+}

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

@@ -0,0 +1,19 @@
+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 function getAvailableLanguages(
+  def: FormDefinition
+): { name: string; code: string }[] {
+  // @ts-expect-error - dynamic property
+  if (def.metadata?.translations?.cy) {
+    return [
+      { name: 'English', code: 'en-GB' },
+      { name: 'Cymraeg', code: 'cy' }
+    ]
+  }
+  return []
+}

package/src/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": {
@@ -111,9 +203,20 @@
         "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."
+    },
+
+    "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"
     }
   },
 
@@ -134,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",
@@ -199,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": {
@@ -215,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": "Na",
+      "no": "Nage",
       "validation": {
-        "selectYesNoRequired": "{{#label}} - dewiswch ie neu na"
+        "selectYesNoRequired": "{{#label}} - dewiswch ie neu nage"
       }
     },
 
@@ -236,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]]"
@@ -245,7 +407,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 +423,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"
+      }
     }
   }
 }