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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (278) hide show
  1. package/.public/javascripts/application.min.js +1 -1
  2. package/.public/javascripts/application.min.js.map +1 -1
  3. package/.public/javascripts/shared.min.js +1 -1
  4. package/.public/javascripts/shared.min.js.map +1 -1
  5. package/.public/stylesheets/application.min.css.map +1 -1
  6. package/.server/client/javascripts/file-upload.js +5 -3
  7. package/.server/client/javascripts/file-upload.js.map +1 -1
  8. package/.server/client/javascripts/geospatial-map.js +31 -26
  9. package/.server/client/javascripts/geospatial-map.js.map +1 -1
  10. package/.server/client/javascripts/location-map.js +9 -1
  11. package/.server/client/javascripts/location-map.js.map +1 -1
  12. package/.server/client/javascripts/maps.d.ts +5 -0
  13. package/.server/client/javascripts/maps.js +6 -0
  14. package/.server/client/javascripts/maps.js.map +1 -0
  15. package/.server/client/javascripts/shared.d.ts +1 -3
  16. package/.server/client/javascripts/shared.js +1 -3
  17. package/.server/client/javascripts/shared.js.map +1 -1
  18. package/.server/client/javascripts/sssi-dataset.d.ts +18 -20
  19. package/.server/client/javascripts/sssi-dataset.js +37 -39
  20. package/.server/client/javascripts/sssi-dataset.js.map +1 -1
  21. package/.server/client/stylesheets/maps.scss +4 -0
  22. package/.server/client/stylesheets/shared.scss +1 -5
  23. package/.server/server/constants.d.ts +2 -0
  24. package/.server/server/constants.js +2 -0
  25. package/.server/server/constants.js.map +1 -1
  26. package/.server/server/plugins/engine/components/AutocompleteField.d.ts +9 -3
  27. package/.server/server/plugins/engine/components/AutocompleteField.js +12 -0
  28. package/.server/server/plugins/engine/components/AutocompleteField.js.map +1 -1
  29. package/.server/server/plugins/engine/components/CheckboxesField.d.ts +4 -1
  30. package/.server/server/plugins/engine/components/CheckboxesField.js +13 -0
  31. package/.server/server/plugins/engine/components/CheckboxesField.js.map +1 -1
  32. package/.server/server/plugins/engine/components/ComponentBase.d.ts +1 -0
  33. package/.server/server/plugins/engine/components/ComponentBase.js +2 -0
  34. package/.server/server/plugins/engine/components/ComponentBase.js.map +1 -1
  35. package/.server/server/plugins/engine/components/ComponentCollection.js +11 -6
  36. package/.server/server/plugins/engine/components/ComponentCollection.js.map +1 -1
  37. package/.server/server/plugins/engine/components/DatePartsField.d.ts +6 -3
  38. package/.server/server/plugins/engine/components/DatePartsField.js +12 -7
  39. package/.server/server/plugins/engine/components/DatePartsField.js.map +1 -1
  40. package/.server/server/plugins/engine/components/DeclarationField.d.ts +5 -2
  41. package/.server/server/plugins/engine/components/DeclarationField.js +6 -4
  42. package/.server/server/plugins/engine/components/DeclarationField.js.map +1 -1
  43. package/.server/server/plugins/engine/components/Details.d.ts +1 -0
  44. package/.server/server/plugins/engine/components/EastingNorthingField.d.ts +26 -2
  45. package/.server/server/plugins/engine/components/EastingNorthingField.js +93 -54
  46. package/.server/server/plugins/engine/components/EastingNorthingField.js.map +1 -1
  47. package/.server/server/plugins/engine/components/EmailAddressField.d.ts +4 -1
  48. package/.server/server/plugins/engine/components/EmailAddressField.js +2 -1
  49. package/.server/server/plugins/engine/components/EmailAddressField.js.map +1 -1
  50. package/.server/server/plugins/engine/components/FileUploadField.d.ts +12 -0
  51. package/.server/server/plugins/engine/components/FileUploadField.js +20 -2
  52. package/.server/server/plugins/engine/components/FileUploadField.js.map +1 -1
  53. package/.server/server/plugins/engine/components/FormComponent.d.ts +5 -1
  54. package/.server/server/plugins/engine/components/FormComponent.js +5 -2
  55. package/.server/server/plugins/engine/components/FormComponent.js.map +1 -1
  56. package/.server/server/plugins/engine/components/GeospatialField.d.ts +1 -0
  57. package/.server/server/plugins/engine/components/GeospatialField.js +1 -1
  58. package/.server/server/plugins/engine/components/GeospatialField.js.map +1 -1
  59. package/.server/server/plugins/engine/components/Html.d.ts +1 -0
  60. package/.server/server/plugins/engine/components/InsetText.d.ts +1 -0
  61. package/.server/server/plugins/engine/components/LatLongField.d.ts +26 -2
  62. package/.server/server/plugins/engine/components/LatLongField.js +85 -48
  63. package/.server/server/plugins/engine/components/LatLongField.js.map +1 -1
  64. package/.server/server/plugins/engine/components/List.d.ts +1 -0
  65. package/.server/server/plugins/engine/components/ListFormComponent.d.ts +1 -0
  66. package/.server/server/plugins/engine/components/LocationFieldBase.d.ts +8 -2
  67. package/.server/server/plugins/engine/components/LocationFieldBase.js +18 -5
  68. package/.server/server/plugins/engine/components/LocationFieldBase.js.map +1 -1
  69. package/.server/server/plugins/engine/components/LocationFieldHelpers.d.ts +5 -2
  70. package/.server/server/plugins/engine/components/LocationFieldHelpers.js +10 -11
  71. package/.server/server/plugins/engine/components/LocationFieldHelpers.js.map +1 -1
  72. package/.server/server/plugins/engine/components/Markdown.d.ts +1 -0
  73. package/.server/server/plugins/engine/components/Markdown.js +1 -1
  74. package/.server/server/plugins/engine/components/Markdown.js.map +1 -1
  75. package/.server/server/plugins/engine/components/MonthYearField.d.ts +5 -2
  76. package/.server/server/plugins/engine/components/MonthYearField.js +13 -9
  77. package/.server/server/plugins/engine/components/MonthYearField.js.map +1 -1
  78. package/.server/server/plugins/engine/components/MultilineTextField.d.ts +1 -0
  79. package/.server/server/plugins/engine/components/NationalGridFieldNumberField.d.ts +2 -1
  80. package/.server/server/plugins/engine/components/NationalGridFieldNumberField.js +4 -3
  81. package/.server/server/plugins/engine/components/NationalGridFieldNumberField.js.map +1 -1
  82. package/.server/server/plugins/engine/components/NotificationBanner.d.ts +1 -0
  83. package/.server/server/plugins/engine/components/NumberField.d.ts +5 -0
  84. package/.server/server/plugins/engine/components/NumberField.js +16 -0
  85. package/.server/server/plugins/engine/components/NumberField.js.map +1 -1
  86. package/.server/server/plugins/engine/components/OsGridRefField.d.ts +2 -1
  87. package/.server/server/plugins/engine/components/OsGridRefField.js +4 -3
  88. package/.server/server/plugins/engine/components/OsGridRefField.js.map +1 -1
  89. package/.server/server/plugins/engine/components/PaymentField.d.ts +3 -0
  90. package/.server/server/plugins/engine/components/PaymentField.js +17 -6
  91. package/.server/server/plugins/engine/components/PaymentField.js.map +1 -1
  92. package/.server/server/plugins/engine/components/SelectField.d.ts +1 -0
  93. package/.server/server/plugins/engine/components/SelectionControlField.d.ts +1 -0
  94. package/.server/server/plugins/engine/components/TelephoneNumberField.d.ts +1 -0
  95. package/.server/server/plugins/engine/components/UkAddressField.d.ts +1 -0
  96. package/.server/server/plugins/engine/components/UkAddressField.js +23 -8
  97. package/.server/server/plugins/engine/components/UkAddressField.js.map +1 -1
  98. package/.server/server/plugins/engine/components/YesNoField.d.ts +5 -2
  99. package/.server/server/plugins/engine/components/YesNoField.js +17 -8
  100. package/.server/server/plugins/engine/components/YesNoField.js.map +1 -1
  101. package/.server/server/plugins/engine/components/helpers/components.js +1 -2
  102. package/.server/server/plugins/engine/components/helpers/components.js.map +1 -1
  103. package/.server/server/plugins/engine/components/helpers/index.d.ts +7 -0
  104. package/.server/server/plugins/engine/components/helpers/index.js +13 -1
  105. package/.server/server/plugins/engine/components/helpers/index.js.map +1 -1
  106. package/.server/server/plugins/engine/components/types.d.ts +1 -0
  107. package/.server/server/plugins/engine/components/types.js.map +1 -1
  108. package/.server/server/plugins/engine/helpers.d.ts +22 -2
  109. package/.server/server/plugins/engine/helpers.js +44 -5
  110. package/.server/server/plugins/engine/helpers.js.map +1 -1
  111. package/.server/server/plugins/engine/i18n/buildValidationMessages.d.ts +3 -0
  112. package/.server/server/plugins/engine/i18n/buildValidationMessages.js +10 -7
  113. package/.server/server/plugins/engine/i18n/buildValidationMessages.js.map +1 -1
  114. package/.server/server/plugins/engine/i18n/createFormTranslator.d.ts +4 -4
  115. package/.server/server/plugins/engine/i18n/createFormTranslator.js +33 -4
  116. package/.server/server/plugins/engine/i18n/createFormTranslator.js.map +1 -1
  117. package/.server/server/plugins/engine/i18n/extractBaseTranslations.d.ts +1 -1
  118. package/.server/server/plugins/engine/i18n/extractBaseTranslations.js +9 -0
  119. package/.server/server/plugins/engine/i18n/extractBaseTranslations.js.map +1 -1
  120. package/.server/server/plugins/engine/i18n/form.d.ts +13 -0
  121. package/.server/server/plugins/engine/i18n/form.js +35 -0
  122. package/.server/server/plugins/engine/i18n/form.js.map +1 -0
  123. package/.server/server/plugins/engine/i18n/languages.d.ts +10 -0
  124. package/.server/server/plugins/engine/i18n/languages.js +19 -0
  125. package/.server/server/plugins/engine/i18n/languages.js.map +1 -0
  126. package/.server/server/plugins/engine/i18n/translations/cy.json +73 -6
  127. package/.server/server/plugins/engine/i18n/translations/en-GB.json +43 -4
  128. package/.server/server/plugins/engine/i18n/types.d.ts +2 -0
  129. package/.server/server/plugins/engine/i18n/types.js.map +1 -1
  130. package/.server/server/plugins/engine/index.d.ts +4 -0
  131. package/.server/server/plugins/engine/index.js +4 -0
  132. package/.server/server/plugins/engine/index.js.map +1 -1
  133. package/.server/server/plugins/engine/models/FormModel.d.ts +0 -4
  134. package/.server/server/plugins/engine/models/FormModel.js +9 -15
  135. package/.server/server/plugins/engine/models/FormModel.js.map +1 -1
  136. package/.server/server/plugins/engine/models/SummaryViewModel.js +9 -4
  137. package/.server/server/plugins/engine/models/SummaryViewModel.js.map +1 -1
  138. package/.server/server/plugins/engine/outputFormatters/adapter/v1.js +3 -5
  139. package/.server/server/plugins/engine/outputFormatters/adapter/v1.js.map +1 -1
  140. package/.server/server/plugins/engine/outputFormatters/human/v1.js +2 -1
  141. package/.server/server/plugins/engine/outputFormatters/human/v1.js.map +1 -1
  142. package/.server/server/plugins/engine/outputFormatters/machine/v2.d.ts +2 -0
  143. package/.server/server/plugins/engine/outputFormatters/machine/v2.js +2 -0
  144. package/.server/server/plugins/engine/outputFormatters/machine/v2.js.map +1 -1
  145. package/.server/server/plugins/engine/pageControllers/FileUploadPageController.d.ts +1 -1
  146. package/.server/server/plugins/engine/pageControllers/FileUploadPageController.js +22 -9
  147. package/.server/server/plugins/engine/pageControllers/FileUploadPageController.js.map +1 -1
  148. package/.server/server/plugins/engine/pageControllers/QuestionPageController.d.ts +1 -1
  149. package/.server/server/plugins/engine/pageControllers/QuestionPageController.js +7 -3
  150. package/.server/server/plugins/engine/pageControllers/QuestionPageController.js.map +1 -1
  151. package/.server/server/plugins/engine/pageControllers/RepeatPageController.js +3 -4
  152. package/.server/server/plugins/engine/pageControllers/RepeatPageController.js.map +1 -1
  153. package/.server/server/plugins/engine/pageControllers/SummaryPageController.js +10 -4
  154. package/.server/server/plugins/engine/pageControllers/SummaryPageController.js.map +1 -1
  155. package/.server/server/plugins/engine/pageControllers/helpers/submission.d.ts +1 -1
  156. package/.server/server/plugins/engine/pageControllers/helpers/submission.js +3 -3
  157. package/.server/server/plugins/engine/pageControllers/helpers/submission.js.map +1 -1
  158. package/.server/server/plugins/engine/pageControllers/validationOptions.js +23 -2
  159. package/.server/server/plugins/engine/pageControllers/validationOptions.js.map +1 -1
  160. package/.server/server/plugins/engine/types/schema.js +1 -0
  161. package/.server/server/plugins/engine/types/schema.js.map +1 -1
  162. package/.server/server/plugins/engine/types.d.ts +1 -0
  163. package/.server/server/plugins/engine/types.js.map +1 -1
  164. package/.server/server/plugins/engine/views/components/fileuploadfield.html +1 -1
  165. package/.server/server/plugins/engine/views/components/multilinetextfield.html +12 -1
  166. package/.server/server/plugins/engine/views/components/paymentfield.html +1 -1
  167. package/.server/server/plugins/engine/views/components/ukaddressfield.html +1 -1
  168. package/.server/server/plugins/engine/views/partials/preview-banner.html +3 -1
  169. package/.server/server/plugins/nunjucks/filters/applyUrlParam.d.ts +9 -0
  170. package/.server/server/plugins/nunjucks/filters/applyUrlParam.js +17 -0
  171. package/.server/server/plugins/nunjucks/filters/applyUrlParam.js.map +1 -0
  172. package/.server/server/plugins/nunjucks/filters/applyUrlParam.test.js +17 -0
  173. package/.server/server/plugins/nunjucks/filters/applyUrlParam.test.js.map +1 -0
  174. package/.server/server/plugins/nunjucks/filters/field.d.ts +1 -1
  175. package/.server/server/plugins/nunjucks/filters/index.d.ts +1 -0
  176. package/.server/server/plugins/nunjucks/filters/index.js +1 -0
  177. package/.server/server/plugins/nunjucks/filters/index.js.map +1 -1
  178. package/.server/server/plugins/payment/helper.d.ts +11 -1
  179. package/.server/server/plugins/payment/helper.js +18 -2
  180. package/.server/server/plugins/payment/helper.js.map +1 -1
  181. package/.server/server/plugins/payment/helper.test.js +2 -1
  182. package/.server/server/plugins/payment/helper.test.js.map +1 -1
  183. package/.server/server/plugins/payment/service.d.ts +2 -1
  184. package/.server/server/plugins/payment/service.js +5 -2
  185. package/.server/server/plugins/payment/service.js.map +1 -1
  186. package/.server/server/plugins/payment/service.test.js +7 -3
  187. package/.server/server/plugins/payment/service.test.js.map +1 -1
  188. package/.server/server/plugins/payment/types.d.ts +4 -0
  189. package/.server/server/plugins/payment/types.js +1 -0
  190. package/.server/server/plugins/payment/types.js.map +1 -1
  191. package/.server/server/plugins/postcode-lookup/models/index.d.ts +249 -3
  192. package/.server/server/plugins/postcode-lookup/models/index.js +87 -33
  193. package/.server/server/plugins/postcode-lookup/models/index.js.map +1 -1
  194. package/.server/server/plugins/postcode-lookup/routes/index.d.ts +15 -1
  195. package/.server/server/plugins/postcode-lookup/routes/index.js +47 -15
  196. package/.server/server/plugins/postcode-lookup/routes/index.js.map +1 -1
  197. package/.server/server/plugins/postcode-lookup/routes/index.test.js +84 -0
  198. package/.server/server/plugins/postcode-lookup/routes/index.test.js.map +1 -0
  199. package/.server/server/plugins/postcode-lookup/types.d.ts +12 -0
  200. package/.server/server/plugins/postcode-lookup/types.js +6 -1
  201. package/.server/server/plugins/postcode-lookup/types.js.map +1 -1
  202. package/.server/server/plugins/postcode-lookup/views/postcode-lookup-details.html +3 -3
  203. package/.server/server/utils/type-utils.d.ts +1 -2
  204. package/.server/server/utils/type-utils.js +0 -3
  205. package/.server/server/utils/type-utils.js.map +1 -1
  206. package/package.json +8 -2
  207. package/src/client/javascripts/file-upload.js +10 -3
  208. package/src/client/javascripts/geospatial-map.js +32 -30
  209. package/src/client/javascripts/location-map.js +7 -1
  210. package/src/client/javascripts/maps.js +5 -0
  211. package/src/client/javascripts/shared.js +1 -3
  212. package/src/client/javascripts/sssi-dataset.js +39 -41
  213. package/src/client/stylesheets/maps.scss +4 -0
  214. package/src/client/stylesheets/shared.scss +1 -5
  215. package/src/server/constants.js +2 -0
  216. package/src/server/plugins/engine/components/AutocompleteField.ts +13 -0
  217. package/src/server/plugins/engine/components/CheckboxesField.ts +13 -1
  218. package/src/server/plugins/engine/components/ComponentBase.ts +2 -0
  219. package/src/server/plugins/engine/components/ComponentCollection.ts +16 -11
  220. package/src/server/plugins/engine/components/DatePartsField.ts +20 -9
  221. package/src/server/plugins/engine/components/DeclarationField.ts +7 -6
  222. package/src/server/plugins/engine/components/EastingNorthingField.ts +154 -89
  223. package/src/server/plugins/engine/components/EmailAddressField.ts +2 -1
  224. package/src/server/plugins/engine/components/FileUploadField.ts +21 -2
  225. package/src/server/plugins/engine/components/FormComponent.ts +6 -5
  226. package/src/server/plugins/engine/components/GeospatialField.ts +6 -1
  227. package/src/server/plugins/engine/components/LatLongField.ts +128 -58
  228. package/src/server/plugins/engine/components/LocationFieldBase.ts +23 -6
  229. package/src/server/plugins/engine/components/LocationFieldHelpers.ts +14 -11
  230. package/src/server/plugins/engine/components/Markdown.ts +2 -3
  231. package/src/server/plugins/engine/components/MonthYearField.ts +20 -15
  232. package/src/server/plugins/engine/components/NationalGridFieldNumberField.ts +9 -3
  233. package/src/server/plugins/engine/components/NumberField.ts +21 -1
  234. package/src/server/plugins/engine/components/OsGridRefField.ts +9 -3
  235. package/src/server/plugins/engine/components/PaymentField.ts +15 -5
  236. package/src/server/plugins/engine/components/UkAddressField.ts +30 -7
  237. package/src/server/plugins/engine/components/YesNoField.ts +17 -9
  238. package/src/server/plugins/engine/components/helpers/components.ts +1 -2
  239. package/src/server/plugins/engine/components/helpers/index.ts +19 -0
  240. package/src/server/plugins/engine/components/types.ts +1 -0
  241. package/src/server/plugins/engine/helpers.ts +52 -5
  242. package/src/server/plugins/engine/i18n/buildValidationMessages.ts +10 -7
  243. package/src/server/plugins/engine/i18n/createFormTranslator.ts +62 -11
  244. package/src/server/plugins/engine/i18n/extractBaseTranslations.ts +7 -1
  245. package/src/server/plugins/engine/i18n/form.ts +54 -0
  246. package/src/server/plugins/engine/i18n/languages.ts +19 -0
  247. package/src/server/plugins/engine/i18n/translations/cy.json +73 -6
  248. package/src/server/plugins/engine/i18n/translations/en-GB.json +43 -4
  249. package/src/server/plugins/engine/i18n/types.ts +2 -0
  250. package/src/server/plugins/engine/index.ts +7 -0
  251. package/src/server/plugins/engine/models/FormModel.ts +9 -15
  252. package/src/server/plugins/engine/models/SummaryViewModel.ts +6 -5
  253. package/src/server/plugins/engine/outputFormatters/adapter/v1.ts +3 -6
  254. package/src/server/plugins/engine/outputFormatters/human/v1.ts +2 -1
  255. package/src/server/plugins/engine/outputFormatters/machine/v2.ts +3 -0
  256. package/src/server/plugins/engine/pageControllers/FileUploadPageController.ts +18 -8
  257. package/src/server/plugins/engine/pageControllers/QuestionPageController.ts +10 -5
  258. package/src/server/plugins/engine/pageControllers/RepeatPageController.ts +2 -2
  259. package/src/server/plugins/engine/pageControllers/SummaryPageController.ts +15 -4
  260. package/src/server/plugins/engine/pageControllers/helpers/submission.ts +6 -3
  261. package/src/server/plugins/engine/pageControllers/validationOptions.ts +27 -2
  262. package/src/server/plugins/engine/types/schema.ts +1 -0
  263. package/src/server/plugins/engine/types.ts +1 -0
  264. package/src/server/plugins/engine/views/components/fileuploadfield.html +1 -1
  265. package/src/server/plugins/engine/views/components/multilinetextfield.html +12 -1
  266. package/src/server/plugins/engine/views/components/paymentfield.html +1 -1
  267. package/src/server/plugins/engine/views/components/ukaddressfield.html +1 -1
  268. package/src/server/plugins/engine/views/partials/preview-banner.html +3 -1
  269. package/src/server/plugins/nunjucks/filters/applyUrlParam.js +17 -0
  270. package/src/server/plugins/nunjucks/filters/index.js +1 -0
  271. package/src/server/plugins/payment/helper.js +22 -2
  272. package/src/server/plugins/payment/service.js +6 -2
  273. package/src/server/plugins/payment/types.js +1 -0
  274. package/src/server/plugins/postcode-lookup/models/index.js +75 -43
  275. package/src/server/plugins/postcode-lookup/routes/index.js +73 -16
  276. package/src/server/plugins/postcode-lookup/types.js +6 -1
  277. package/src/server/plugins/postcode-lookup/views/postcode-lookup-details.html +3 -3
  278. package/src/server/utils/type-utils.ts +1 -11
@@ -8,13 +8,14 @@ import {
8
8
  } from '@defra/forms-model'
9
9
  import Boom from '@hapi/boom'
10
10
  import { type ResponseToolkit, type Server } from '@hapi/hapi'
11
- import { format, parseISO } from 'date-fns'
11
+ import { format, parseISO, type Locale } from 'date-fns'
12
+ import { cy, enGB } from 'date-fns/locale'
12
13
  import { StatusCodes } from 'http-status-codes'
13
14
  import { type Schema, type ValidationErrorItem } from 'joi'
14
15
  import { Liquid } from 'liquidjs'
15
16
 
16
17
  import { logger } from '../../common/helpers/logging/logger.js'
17
- import { FORM_VERSION_METADATA_KEY } from '../../constants.js'
18
+ import { CY, EN_GB, FORM_VERSION_METADATA_KEY } from '../../constants.js'
18
19
  import {
19
20
  getAnswer,
20
21
  type Field
@@ -300,19 +301,24 @@ export function checkEmailAddressForLiveFormSubmission(
300
301
 
301
302
  /**
302
303
  * Parses the errors from {@link Schema.validate} so they can be rendered by govuk-frontend templates
304
+ * @param language - the target language for translations
303
305
  * @param [details] - provided by {@link Schema.validate}
304
306
  */
305
307
  export function getErrors(
308
+ language: string | undefined,
306
309
  details?: ValidationErrorItem[]
307
310
  ): FormSubmissionError[] | undefined {
308
311
  if (!details?.length) {
309
312
  return
310
313
  }
311
314
 
312
- return details.map(getError)
315
+ return details.map((detail) => getError(language, detail))
313
316
  }
314
317
 
315
- export function getError(detail: ValidationErrorItem): FormSubmissionError {
318
+ export function getError(
319
+ language: string | undefined,
320
+ detail: ValidationErrorItem
321
+ ): FormSubmissionError {
316
322
  const { context, message, path } = detail
317
323
 
318
324
  const name = context?.key ?? ''
@@ -320,7 +326,10 @@ export function getError(detail: ValidationErrorItem): FormSubmissionError {
320
326
 
321
327
  const text = message.replace(
322
328
  /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/,
323
- (text) => format(parseISO(text), 'd MMMM yyyy')
329
+ (text) =>
330
+ format(parseISO(text), 'd MMMM yyyy', {
331
+ locale: toLanguageLocale(language)
332
+ })
324
333
  )
325
334
 
326
335
  return {
@@ -410,3 +419,41 @@ export function getFormVersion(
410
419
  | FormVersionMetadata
411
420
  | undefined
412
421
  }
422
+
423
+ const payLanguageCodes = {
424
+ [EN_GB]: 'en',
425
+ [CY]: 'cy'
426
+ } as Record<string, string>
427
+
428
+ const languageLocales = {
429
+ [EN_GB]: enGB,
430
+ [CY]: cy
431
+ } as Record<string, Locale>
432
+
433
+ const defaultLanguageCode = 'en'
434
+ const defaultLanguageLocale = enGB
435
+
436
+ /**
437
+ * Converts a BCP 47 language tag to the ISO 639-1 code GOV.UK Pay accepts.
438
+ * Defaults to English if the language is not supported.
439
+ * @param { string | undefined } language - BCP 47 language code
440
+ * @returns {string} language code required by GOV.UK Pay
441
+ */
442
+ export function toPayLanguageCode(language: string | undefined): string {
443
+ return payLanguageCodes[language ?? 'unknown'] ?? defaultLanguageCode
444
+ }
445
+
446
+ /**
447
+ * Converts a BCP 47 language tag to the date-fns Locale (for date formatting).
448
+ * Defaults to English if the language is not supported.
449
+ * @param { string | undefined } language - BCP 47 language code
450
+ * @returns {Locale} language locale
451
+ */
452
+ export function toLanguageLocale(language: string | undefined): Locale {
453
+ return languageLocales[language ?? 'unknown'] ?? defaultLanguageLocale
454
+ }
455
+
456
+ /**
457
+ * @import { FormsService } from '../../types.js'
458
+ * @import { Locale } from 'date-fns/locale'
459
+ */
@@ -56,13 +56,16 @@ export function buildValidationMessages(t: (key: string) => string) {
56
56
  dateMin: t('components.dateField.validation.dateMin'),
57
57
  dateMax: t('components.dateField.validation.dateMax'),
58
58
 
59
- unicode: 'validation.unicode',
60
- arrayMin: 'validation.array.min',
61
- arrayMax: 'validation.array.max',
62
- arrayLength: 'validation.array.length',
63
- featuresMin: 'validation.features.min',
64
- featuresMax: 'validation.features.max',
65
- featuresLength: 'validation.features.length'
59
+ unicode: t('validation.unicode'),
60
+ arrayMin: t('validation.arrayMin'),
61
+ arrayMax: t('validation.arrayMax'),
62
+ arrayLength: t('validation.arrayLength'),
63
+ featuresMin: t('validation.featuresMin'),
64
+ featuresMax: t('validation.featuresMax'),
65
+ featuresLength: t('validation.featuresLength'),
66
+ filesMin: t('validation.filesMin'),
67
+ filesMax: t('validation.filesMax'),
68
+ filesLength: t('validation.filesLength')
66
69
  }
67
70
  }
68
71
 
@@ -1,26 +1,40 @@
1
- import { type FormDefinition } from '@defra/forms-model'
1
+ import {
2
+ yesNoListNoItemId,
3
+ yesNoListYesItemId,
4
+ type FormDefinition,
5
+ type FormMetadata
6
+ } from '@defra/forms-model'
2
7
  import { type i18n } from 'i18next'
3
8
 
9
+ import { CY } from '../../../constants.js'
4
10
  import { createTranslator } from './createTranslator.js'
5
11
  import { extractBaseTranslations } from './extractBaseTranslations.js'
6
12
  import { createFormI18nInstance } from './index.js'
7
- import {
8
- type FormDefinitionTranslations,
9
- type Translator
10
- } from './types.js'
13
+ import { type FormDefinitionTranslations } from './types.js'
11
14
 
12
15
  export function createFormTranslator(
13
- def: FormDefinition,
16
+ metadata: FormMetadata,
17
+ definition: FormDefinition | undefined,
14
18
  language: string
15
- ): Translator {
16
- const baseTranslations = extractBaseTranslations(def)
19
+ ) {
20
+ const baseTranslations = extractBaseTranslations(definition)
17
21
  const i18nInstance = createFormI18nInstance(baseTranslations)
18
- loadFormTranslations(def, i18nInstance)
22
+ loadFormTranslations(definition, i18nInstance)
23
+ extractMetadataBaseTranslations(metadata, i18nInstance)
24
+
25
+ const translator = createTranslator(i18nInstance, language)
19
26
 
20
- return createTranslator(i18nInstance, language)
27
+ return translator
21
28
  }
22
29
 
23
- export function loadFormTranslations(def: FormDefinition, i18nInstance: i18n) {
30
+ export function loadFormTranslations(
31
+ def: FormDefinition | undefined,
32
+ i18nInstance: i18n
33
+ ) {
34
+ if (!def) {
35
+ return
36
+ }
37
+
24
38
  const formTranslations = def.metadata?.translations as
25
39
  | FormDefinitionTranslations
26
40
  | undefined
@@ -28,6 +42,43 @@ export function loadFormTranslations(def: FormDefinition, i18nInstance: i18n) {
28
42
  if (formTranslations) {
29
43
  for (const [lng, resources] of Object.entries(formTranslations)) {
30
44
  i18nInstance.addResourceBundle(lng, 'form', resources, true, true)
45
+
46
+ // Temporary workaround - until we develop a better solution
47
+ if (lng === CY) {
48
+ i18nInstance.addResource(
49
+ lng,
50
+ 'form',
51
+ `listItems.${yesNoListYesItemId}.text`,
52
+ 'Ie'
53
+ )
54
+ i18nInstance.addResource(
55
+ lng,
56
+ 'form',
57
+ `listItems.${yesNoListNoItemId}.text`,
58
+ 'Nage'
59
+ )
60
+ }
61
+ }
62
+ }
63
+ }
64
+
65
+ export function extractMetadataBaseTranslations(
66
+ metadata: FormMetadata | undefined,
67
+ i18nInstance: i18n
68
+ ) {
69
+ if (metadata) {
70
+ const translations = {
71
+ 'form.title': metadata.title,
72
+ 'form.contact.email.address': metadata.contact?.email?.address ?? '',
73
+ 'form.contact.email.responseTime':
74
+ metadata.contact?.email?.responseTime ?? '',
75
+ 'form.contact.online.url': metadata.contact?.online?.url ?? '',
76
+ 'form.contact.online.text': metadata.contact?.online?.text ?? '',
77
+ 'form.contact.phone': metadata.contact?.phone ?? '',
78
+ 'form.submissionGuidance': metadata.submissionGuidance ?? '',
79
+ 'form.privacyNoticeText': metadata.privacyNoticeText ?? '',
80
+ 'form.privacyNoticeUrl': metadata.privacyNoticeUrl ?? ''
31
81
  }
82
+ i18nInstance.addResourceBundle('en-GB', 'form', translations, true, true)
32
83
  }
33
84
  }
@@ -7,13 +7,19 @@ import { type FormDefinitionTranslations } from './types.js'
7
7
 
8
8
  type BaseTranslations = FormDefinitionTranslations[string]
9
9
 
10
- export function extractBaseTranslations(def: FormDefinition): BaseTranslations {
10
+ export function extractBaseTranslations(
11
+ def: FormDefinition | undefined
12
+ ): BaseTranslations {
11
13
  const pages: BaseTranslations['pages'] = {}
12
14
  const components: BaseTranslations['components'] = {}
13
15
  const sections: BaseTranslations['sections'] = {}
14
16
  const listItems: BaseTranslations['listItems'] = {}
15
17
  const form: BaseTranslations['form'] = {}
16
18
 
19
+ if (!def) {
20
+ return { pages, components, sections, listItems, form }
21
+ }
22
+
17
23
  for (const page of def.pages) {
18
24
  if (page.id && page.title) {
19
25
  pages[page.id] = { title: page.title }
@@ -0,0 +1,54 @@
1
+ import { type FormMetadata, type FormStatus } from '@defra/forms-model'
2
+ import Boom from '@hapi/boom'
3
+ import { LRUCache } from 'lru-cache'
4
+
5
+ import { getPluginOptions } from '../helpers.js'
6
+ import { createFormTranslator } from './createFormTranslator.js'
7
+ import { type Translator } from './types.js'
8
+ import { type AnyFormRequest } from '../types.js'
9
+
10
+ const cache = new LRUCache({
11
+ max: 100,
12
+ ttl: 1000 * 60 * 15 // 15 minutes
13
+ })
14
+
15
+ /**
16
+ * Get translator for plugin, for the current form's metadata (as well as the plugin-specific boilerplate).
17
+ * This is an async call so we can read the form definition inside this call.
18
+ * See docs/features/multi-language.md for the language and translation flow overview.
19
+ * @param {AnyFormRequest} request
20
+ * @param {FormMetadata} metadata - the metadata of the form
21
+ * @param {FormStatus} status - the form status to use when retrieving the definition
22
+ * @param {string} language - the language to use for the translator
23
+ */
24
+ export async function getCachedPluginTranslator(
25
+ request: AnyFormRequest,
26
+ metadata: FormMetadata,
27
+ status: FormStatus,
28
+ language: string
29
+ ) {
30
+ const key = `${metadata.id}-${status}-${language}-plugin-meta`
31
+
32
+ if (cache.has(key)) {
33
+ return cache.get(key) as unknown as Translator
34
+ }
35
+
36
+ const { services } = getPluginOptions(request.server)
37
+
38
+ const definition = await services?.formsService.getFormDefinition(
39
+ metadata.id,
40
+ status
41
+ )
42
+
43
+ if (!definition) {
44
+ throw Boom.notFound(
45
+ `FormDefinition not found for form ${metadata.id} and status ${status}`
46
+ )
47
+ }
48
+
49
+ const translator = createFormTranslator(metadata, definition, language)
50
+
51
+ cache.set(key, translator)
52
+
53
+ return translator
54
+ }
@@ -0,0 +1,19 @@
1
+ import { type FormDefinition } from '@defra/forms-model'
2
+
3
+ /**
4
+ * Return a list of available languages.
5
+ * Empty array if only English, or an array of English and Welsh if translations have been defined.
6
+ * @param {FormDefinition} def
7
+ */
8
+ export function getAvailableLanguages(
9
+ def: FormDefinition
10
+ ): { name: string; code: string }[] {
11
+ // @ts-expect-error - dynamic property
12
+ if (def.metadata?.translations?.cy) {
13
+ return [
14
+ { name: 'English', code: 'en-GB' },
15
+ { name: 'Cymraeg', code: 'cy' }
16
+ ]
17
+ }
18
+ return []
19
+ }
@@ -14,7 +14,17 @@
14
14
  "numberInteger": "Rhaid i {{#label}} fod yn rhif cyfan",
15
15
  "numberMin": "Rhaid i {{#label}} fod yn {{#limit}} neu uwch",
16
16
  "numberMax": "Rhaid i {{#label}} fod yn {{#limit}} neu is",
17
- "maxWords": "Rhaid i {{#label}} fod yn {{#limit}} o eiriau neu lai"
17
+ "maxWords": "Rhaid i {{#label}} fod yn {{#limit}} o eiriau neu lai",
18
+ "unicode": "Mae {{#label}} yn cynnwys nodau annilys, er enghraifft, dashes hirion",
19
+ "arrayMin": "Dewiswch o leiaf {{#limit}} o opsiynau o'r rhestr",
20
+ "arrayMax": "Dim ond {{#limit}} y gellir eu dewis o'r rhestr",
21
+ "arrayLength": "Dewiswch ddim ond {{#limit}} o opsiynau o'r rhestr",
22
+ "featuresMin": "Diffiniwch o leiaf {{#limit}} nodwedd",
23
+ "featuresMax": "Dim ond {{#limit}} nodwedd y gellir eu diffinio",
24
+ "featuresLength": "Diffiniwch nodweddion {{#limit}} yn union",
25
+ "filesMin": "Rhaid i chi uwchlwytho {{#limit}} o ffeiliau neu fwy",
26
+ "filesMax": "Dim ond {{#limit}} o ffeiliau neu lai y gallwch eu huwchlwytho",
27
+ "filesLength": "Rhaid i chi uwchlwytho'n union {{#limit}} o ffeiliau"
18
28
  },
19
29
 
20
30
  "errors": {
@@ -29,7 +39,14 @@
29
39
  "continue": "Parhau",
30
40
  "saveAndExit": "Cadw a gadael",
31
41
  "draft": "ddrafft",
32
- "live": "fyw"
42
+ "live": "fyw",
43
+ "or": "neu",
44
+ "and": "a",
45
+ "england": "Lloegr",
46
+ "wales": "Cymru",
47
+ "northernIreland": "Gogledd Iwerddon",
48
+ "scotland": "Yr Alban",
49
+ "sendFeedback": "Anfon adborth"
33
50
  },
34
51
 
35
52
  "pages": {
@@ -60,6 +77,12 @@
60
77
  "totalAmount": "Cyfanswm",
61
78
  "reference": "Cyfeirnod",
62
79
  "dateOfPayment": "Dyddiad talu",
80
+ "fileUpload_zero": "Ni uwchlwythwyd unrhyw ffeiliau",
81
+ "fileUpload_one": "Uwchlwythwyd [[count]] ffeil",
82
+ "fileUpload_two": "Uwchlwythwyd dwy feil",
83
+ "fileUpload_few": "Uwchlwythwyd [[count]] ffeil",
84
+ "fileUpload_many": "Uwchlwythwyd [[count]] o ffeiliau",
85
+ "fileUpload_other": "Uwchlwythwyd [[count]] ffeil",
63
86
  "submissionFailed": "Roedd problem ac ni chyflwynwyd eich ffurflen. Ceisiwch gyflwyno'r ffurflen eto",
64
87
  "submissionFailedContactSuffix": " neu gallwch [[contactUsLink]] a dyfynnu'ch cyfeirnod i drefnu ad-daliad",
65
88
  "contactUsLinkText": "cysylltu â ni (yn agor mewn tab newydd)",
@@ -79,17 +102,34 @@
79
102
  "change": "Newid",
80
103
  "notProvided": "Heb ei ddarparu",
81
104
  "visuallyHiddenItem": "eitem [[index]]",
105
+ "pageTitle_zero": "Nid ydych wedi ychwanegu unrhyw atebion",
82
106
  "pageTitle_one": "Rydych wedi ychwanegu [[count]] ateb",
107
+ "pageTitle_two": "Rydych wedi ychwanegu dau ateb",
108
+ "pageTitle_few": "Rydych wedi ychwanegu [[count]] ateb",
109
+ "pageTitle_many": "Rydych wedi ychwanegu [[count]] o atebion",
83
110
  "pageTitle_other": "Rydych wedi ychwanegu [[count]] ateb",
111
+ "tooMany_zero": "Ni allwch ychwanegu unrhyw atebion",
84
112
  "tooMany_one": "Dim ond hyd at [[count]] ateb y gallwch ei ychwanegu",
113
+ "tooMany_two": "Dim ond hyd at ddau gateb y gallwch eu hychwanegu",
114
+ "tooMany_few": "Dim ond hyd at [[count]] ateb y gallwch eu hychwanegu",
115
+ "tooMany_many": "Dim ond hyd at [[count]] o atebion y gallwch eu hychwanegu",
85
116
  "tooMany_other": "Dim ond hyd at [[count]] ateb y gallwch eu hychwanegu",
117
+ "tooFew_zero": "Rhaid i chi ychwanegu atebion",
86
118
  "tooFew_one": "Rhaid i chi ychwanegu o leiaf [[count]] ateb",
119
+ "tooFew_two": "Rhaid i chi ychwanegu o leiaf ddau gateb",
120
+ "tooFew_few": "Rhaid i chi ychwanegu o leiaf [[count]] ateb",
121
+ "tooFew_many": "Rhaid i chi ychwanegu o leiaf [[count]] o atebion",
87
122
  "tooFew_other": "Rhaid i chi ychwanegu o leiaf [[count]] ateb"
88
123
  },
89
124
 
90
125
  "fileUpload": {
91
126
  "upload": "Uwchlwytho ffeil",
92
- "maxFilesReached": "Rydych wedi cyrraedd nifer uchaf y ffeiliau. Tynnwch ffeil i uwchlwytho rhagor."
127
+ "maxFilesReached": "Rydych wedi cyrraedd nifer uchaf y ffeiliau. Tynnwch ffeil i uwchlwytho rhagor.",
128
+ "remove": "Tynnu",
129
+ "removeFileTitle": "Ydych chi'n siŵr eich bod chi eisiau dileu'r ffeil hon?",
130
+ "removeFileBody": "Ni allwch adfer ffeiliau a dynnwyd.",
131
+ "removeFileButton": "Dileu ffeil",
132
+ "cancel": "Canslo"
93
133
  },
94
134
 
95
135
  "exit": {
@@ -111,6 +151,7 @@
111
151
  "body": "Os hoffech dderbyn e-bost prawf, [[link]] yr hoffech i gyflwyniadau ffurflen fynd iddo.",
112
152
  "linkText": "nodwch y cyfeiriad e-bost (yn agor mewn tab newydd)"
113
153
  },
154
+ "bannerTitle": "Pwysig",
114
155
  "bannerForce": "Rhagolwg o ffurflen [[previewMode]] yw hon. Peidiwch â rhoi gwybodaeth bersonol.",
115
156
  "bannerText": "Dyma ragolwg o dudalen ffurflen [[previewMode]] rydych chi'n ei golygu.",
116
157
  "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 +175,11 @@
134
175
  "findAnAddressInstead": "dod o hyd i gyfeiriad yn lle hynny",
135
176
  "noAddressFoundTitle": "Ni chanfuwyd cyfeiriad",
136
177
  "noAddressFoundBody": "Ni allem ddod o hyd i gyfeiriad cyfatebol",
178
+ "addressFound_zero": "Ni chanfuwyd unrhyw gyfeiriadau ar gyfer",
137
179
  "addressFound_one": "Canfuwyd [[count]] cyfeiriad ar gyfer",
180
+ "addressFound_two": "Canfuwyd dau gyfeiriad ar gyfer",
181
+ "addressFound_few": "Canfuwyd [[count]] chyfeiriad ar gyfer",
182
+ "addressFound_many": "Canfuwyd [[count]] o gyfeiriadau ar gyfer",
138
183
  "addressFound_other": "Canfuwyd [[count]] cyfeiriad ar gyfer",
139
184
  "validation": {
140
185
  "invalidPostcode": "Nodwch god post dilys neu nodwch gyfeiriad â llaw",
@@ -220,9 +265,9 @@
220
265
 
221
266
  "yesNoField": {
222
267
  "yes": "Ie",
223
- "no": "Na",
268
+ "no": "Nage",
224
269
  "validation": {
225
- "selectYesNoRequired": "{{#label}} - dewiswch ie neu na"
270
+ "selectYesNoRequired": "{{#label}} - dewiswch ie neu nage"
226
271
  }
227
272
  },
228
273
 
@@ -236,7 +281,11 @@
236
281
  },
237
282
 
238
283
  "geospatialField": {
284
+ "added_zero": "Ni ychwanegwyd unrhyw leoliadau",
239
285
  "added_one": "Ychwanegwyd [[count]] lleoliad",
286
+ "added_two": "Ychwanegwyd dau leoliad",
287
+ "added_few": "Ychwanegwyd [[count]] lleoliad",
288
+ "added_many": "Ychwanegwyd [[count]] o leoliadau",
240
289
  "added_other": "Ychwanegwyd [[count]] lleoliad",
241
290
  "validation": {
242
291
  "descriptionRequired": "Rhowch ddisgrifiad ar gyfer lleoliad [[count]]",
@@ -245,7 +294,7 @@
245
294
  },
246
295
 
247
296
  "paymentField": {
248
- "detailsRequired": "Angen manylion talu",
297
+ "detailsRequired": "Angen talu",
249
298
  "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.",
250
299
  "addPaymentDetails": "Ychwanegu manylion talu",
251
300
  "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 +310,29 @@
261
310
  },
262
311
 
263
312
  "fileUploadField": {
313
+ "uploading": "Yn uwchlwytho…",
264
314
  "uploaded": "Wedi'i uwchlwytho",
265
315
  "uploadFailed": "Roedd problem gyda'ch ffeiliau a uwchlwythwyd. Uwchlwythwch nhw eto cyn cyflwyno'r ffurflen.",
266
316
  "uploadedFilesHeading": "Ffeiliau a uwchlwythwyd",
317
+ "filesCount_zero": "Uwchlwythwyd [[count]] o ffeiliau",
267
318
  "filesCount_one": "Uwchlwythwyd [[count]] ffeil",
319
+ "filesCount_two": "Uwchlwythwyd [[count]] ffeil",
320
+ "filesCount_few": "Uwchlwythwyd [[count]] ffeil",
321
+ "filesCount_many": "Uwchlwythwyd [[count]] o ffeiliau",
268
322
  "filesCount_other": "Uwchlwythwyd [[count]] ffeil"
323
+ },
324
+
325
+ "characterCount": {
326
+ "_comment": "Note the use of %{count} instead of [[count]]. This is because we are passing to the govuk template, not passing to Joi",
327
+ "underLimit": {
328
+ "one": "Mae gennych %{count} nod ar ôl",
329
+ "other": "Mae gennych %{count} nod ar ôl"
330
+ },
331
+ "atLimit": "Mae gennych 0 nod ar ôl",
332
+ "overLimit": {
333
+ "one": "Mae gennych %{count} nod yn ormod",
334
+ "other": "Mae gennych %{count} nod yn ormod"
335
+ }
269
336
  }
270
337
  }
271
338
  }
@@ -14,7 +14,17 @@
14
14
  "numberInteger": "{{#label}} must be a whole number",
15
15
  "numberMin": "{{#label}} must be {{#limit}} or higher",
16
16
  "numberMax": "{{#label}} must be {{#limit}} or lower",
17
- "maxWords": "{{#label}} must be {{#limit}} words or fewer"
17
+ "maxWords": "{{#label}} must be {{#limit}} words or fewer",
18
+ "unicode": "{{#label}} includes invalid characters, for example, long dashes",
19
+ "arrayMin": "Select at least {{#limit}} options from the list",
20
+ "arrayMax": "Only {{#limit}} can be selected from the list",
21
+ "arrayLength": "Select only {{#limit}} options from the list",
22
+ "featuresMin": "Define at least {{#limit}} features",
23
+ "featuresMax": "Only {{#limit}} features can be defined",
24
+ "featuresLength": "Define exactly {{#limit}} features",
25
+ "filesMin": "You must upload {{#limit}} files or more",
26
+ "filesMax": "You can only upload {{#limit}} files or less",
27
+ "filesLength": "You must upload exactly {{#limit}} files"
18
28
  },
19
29
 
20
30
  "errors": {
@@ -29,7 +39,14 @@
29
39
  "continue": "Continue",
30
40
  "saveAndExit": "Save and exit",
31
41
  "draft": "draft",
32
- "live": "live"
42
+ "live": "live",
43
+ "or": "or",
44
+ "and": "and",
45
+ "england": "England",
46
+ "wales": "Wales",
47
+ "northernIreland": "Northern Ireland",
48
+ "scotland": "Scotland",
49
+ "sendFeedback": "Send feedback"
33
50
  },
34
51
 
35
52
  "pages": {
@@ -60,6 +77,8 @@
60
77
  "totalAmount": "Total amount",
61
78
  "reference": "Reference",
62
79
  "dateOfPayment": "Date of payment",
80
+ "fileUpload_one": "Uploaded [[count]] file",
81
+ "fileUpload_other": "Uploaded [[count]] files",
63
82
  "submissionFailed": "There was a problem and your form was not submitted. Try submitting the form again",
64
83
  "submissionFailedContactSuffix": " or you can [[contactUsLink]] and quote your reference number to arrange a refund",
65
84
  "contactUsLinkText": "contact us (opens in new tab)",
@@ -89,7 +108,12 @@
89
108
 
90
109
  "fileUpload": {
91
110
  "upload": "Upload file",
92
- "maxFilesReached": "You have reached the maximum number of files. Please remove a file to upload more."
111
+ "maxFilesReached": "You have reached the maximum number of files. Please remove a file to upload more.",
112
+ "remove": "Remove",
113
+ "removeFileTitle": "Are you sure you want to remove this file?",
114
+ "removeFileBody": "You cannot recover removed files.",
115
+ "removeFileButton": "Remove file",
116
+ "cancel": "Cancel"
93
117
  },
94
118
 
95
119
  "exit": {
@@ -111,6 +135,7 @@
111
135
  "body": "If you want to receive a test email, [[link]] you want form submissions to go to.",
112
136
  "linkText": "enter the email address (opens in new tab)"
113
137
  },
138
+ "bannerTitle": "Important",
114
139
  "bannerForce": "This is a preview of a [[previewMode]] form. Do not enter personal information.",
115
140
  "bannerText": "This is a preview of a [[previewMode]] form page you are editing.",
116
141
  "previousPages": "It depends on answers from earlier pages in the form. In the live version, users will need to complete those questions first."
@@ -245,7 +270,7 @@
245
270
  },
246
271
 
247
272
  "paymentField": {
248
- "detailsRequired": "Payment details required",
273
+ "detailsRequired": "Payment required",
249
274
  "pendingTransaction": "You may see a pending transaction in your bank account but you will only be charged when you submit the form.",
250
275
  "addPaymentDetails": "Add payment details",
251
276
  "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 +286,25 @@
261
286
  },
262
287
 
263
288
  "fileUploadField": {
289
+ "uploading": "Uploading…",
264
290
  "uploaded": "Uploaded",
265
291
  "uploadFailed": "There was a problem with your uploaded files. Re-upload them before submitting the form again.",
266
292
  "uploadedFilesHeading": "Uploaded files",
267
293
  "filesCount_one": "[[count]] file uploaded",
268
294
  "filesCount_other": "[[count]] files uploaded"
295
+ },
296
+
297
+ "characterCount": {
298
+ "_comment": "Note the use of %{count} instead of [[count]]. This is because we are passing to the govuk template, not passing to Joi",
299
+ "underLimit": {
300
+ "one": "You have %{count} character remaining",
301
+ "other": "You have %{count} characters remaining"
302
+ },
303
+ "atLimit": "You have 0 characters remaining",
304
+ "overLimit": {
305
+ "one": "You have %{count} character too many",
306
+ "other": "You have %{count} characters too many"
307
+ }
269
308
  }
270
309
  }
271
310
  }
@@ -22,6 +22,8 @@ export type FormDefinitionTranslations = Record<
22
22
  hint: string
23
23
  content: string
24
24
  shortDescription: string
25
+ errorDescription: string
26
+ paymentDescription: string
25
27
  }>
26
28
  >
27
29
  sections: Record<string, Partial<Pick<Section, 'title'>>>
@@ -22,6 +22,13 @@ export {
22
22
  resolveFormModel
23
23
  } from './form-context.js'
24
24
  export * from './form-availability.js'
25
+ export { getAvailableLanguages } from './i18n/languages.js'
26
+ export {
27
+ extractMetadataBaseTranslations,
28
+ loadFormTranslations
29
+ } from './i18n/createFormTranslator.js'
30
+ export { extractBaseTranslations } from './i18n/extractBaseTranslations.js'
31
+ export { applyUrlParam } from '../nunjucks/filters/applyUrlParam.js'
25
32
 
26
33
  const globals = {
27
34
  checkComponentTemplates,
@@ -31,6 +31,7 @@ import { type i18n } from 'i18next'
31
31
  import joi from 'joi'
32
32
 
33
33
  import { logger } from '../../../common/helpers/logging/logger.js'
34
+ import { EN_GB } from '../../../constants.js'
34
35
  import { type ListFormComponent } from '../components/ListFormComponent.js'
35
36
  import {} from '../components/YesNoField.js'
36
37
  import {
@@ -47,6 +48,7 @@ import { loadFormTranslations } from '../i18n/createFormTranslator.js'
47
48
  import { createTranslator } from '../i18n/createTranslator.js'
48
49
  import { extractBaseTranslations } from '../i18n/extractBaseTranslations.js'
49
50
  import { createFormI18nInstance } from '../i18n/index.js'
51
+ import { getAvailableLanguages } from '../i18n/languages.js'
50
52
  import { type Translator } from '../i18n/types.js'
51
53
  import { type ExecutableCondition } from './types.js'
52
54
  import { type PageController } from '../pageControllers/PageController.js'
@@ -240,7 +242,12 @@ export class FormModel {
240
242
  }
241
243
 
242
244
  /** Returns a scoped translator pair for the given language. */
243
- createTranslator(language = 'en-GB'): Translator {
245
+ createTranslator(language = EN_GB): Translator {
246
+ // @ts-expect-error - dynamic language lookup
247
+ if (!this.def.metadata?.translations?.[language]) {
248
+ // If not translations defined in the FormDefinition, always default to English
249
+ language = EN_GB
250
+ }
244
251
  return createTranslator(this.i18nInstance, language)
245
252
  }
246
253
 
@@ -662,7 +669,7 @@ function validateFormState(
662
669
 
663
670
  // Add relevant state errors
664
671
  if (error) {
665
- const errorsState = error.details.map(getError)
672
+ const errorsState = error.details.map((item) => getError(EN_GB, item))
666
673
  return { ...context, errors: errors.concat(errorsState) }
667
674
  }
668
675
 
@@ -679,16 +686,3 @@ function getReferenceNumber(state: FormSubmissionState): string {
679
686
 
680
687
  return state.$$__referenceNumber
681
688
  }
682
-
683
- export function getAvailableLanguages(
684
- def: FormDefinition
685
- ): { name: string; code: string }[] {
686
- // @ts-expect-error - dynamic property
687
- if (def.metadata?.translations?.cy) {
688
- return [
689
- { name: 'English', code: 'en-GB' },
690
- { name: 'Cymraeg', code: 'cy' }
691
- ]
692
- }
693
- return []
694
- }