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

package/src/server/plugins/engine/views/partials/preview-banner.html

@@ -9,23 +9,23 @@
 {%- endmacro -%}
 
 {% call govukNotificationBanner() %}
+  {% set previewModeTranslated = t('common.' + previewMode) %}
   {% if not context.isForceAccess %}
     <p class="govuk-notification-banner__heading govuk-!-margin-bottom-0">
-      This is a preview of a {{ previewMode }} form. Do not enter personal information.
+      {{ t('pages.preview.bannerForce', { previewMode: previewModeTranslated }) }}
     </p>
 
     {{ _closeLink() }}
   {% else %}
     <p class="govuk-notification-banner__heading govuk-!-margin-bottom-0">
-      This is a preview of a {{ previewMode }} form page you are editing.
+      {{ t('pages.preview.bannerText', { previewMode: previewModeTranslated }) }}
     </p>
 
     {{ _closeLink() }}
 
     {% if hasPreviousPages %}
       <p class="govuk-body govuk-!-margin-top-2">
-        It depends on answers from earlier pages in the form. In the live
-        version, users will need to complete those questions first.
+        {{ t('pages.preview.previousPages') }}
       </p>
     {% endif %}
   {% endif %}

package/src/server/plugins/engine/views/partials/warn-missing-notification-email.html

@@ -1,10 +1,9 @@
 {% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
 
-{% set html %}
-    If you want to receive a test email, <a target="_blank" rel="noopener noreferrer" class="govuk-link" href="{{ config.designerUrl }}/library/{{ slug }}/edit/notification-email">enter the email address (opens in new tab)</a> you want form submissions to go to.
-{% endset %}
+{% set linkText %}{{ t('pages.preview.warnMissingNotificationEmail.linkText') }}{% endset %}
+{% set linkHtml %}<a target="_blank" rel="noopener noreferrer" class="govuk-link" href="{{ config.designerUrl }}/library/{{ slug }}/edit/notification-email">{{ linkText }}</a>{% endset %}
 
 {{ govukWarningText({
-    html: html,
-    iconFallbackText: "Warning"
+    html: t('pages.preview.warnMissingNotificationEmail.body', { link: linkHtml }),
+    iconFallbackText: t('common.warningIconFallback')
 }) }}

package/src/server/plugins/engine/views/repeat-list-summary.html

@@ -13,7 +13,7 @@
 
       {% if errors %}
         {{ govukErrorSummary({
-          titleText: "There is a problem",
+          titleText: t('errors.title'),
           errorList: errors
         }) }}
       {% endif %}
@@ -29,14 +29,14 @@
 
         <div class="govuk-button-group">
           {{ govukButton({
-            text: "Continue",
+            text: t('pages.repeater.continue'),
             name: "action",
             value: "continue",
             preventDoubleClick: true
           }) }}
 
           {{ govukButton({
-            text: "Add another",
+            text: t('pages.repeater.addAnother'),
             name: "action",
             value: "add-another",
             classes: "govuk-button--secondary",
@@ -45,7 +45,7 @@
 
           {% if allowSaveAndExit %}
             {{ govukButton({
-              text: "Save and exit",
+              text: t('pages.repeater.saveAndExit'),
               classes: "govuk-button--secondary",
               name: "action",
               value: "save-and-exit",

package/src/server/plugins/engine/views/summary.html

@@ -17,14 +17,14 @@
       {% if paymentState and paymentState.preAuth and paymentState.preAuth.status == 'success' %}
         {{ govukNotificationBanner({
           type: "success",
-          titleText: "Success",
-          html: "<h3 class=\"govuk-notification-banner__heading\">We have your payment details</h3><p class=\"govuk-body\">Your payment is on hold. We will charge you when you submit the form.</p>"
+          titleText: t('pages.summary.paymentSuccessBannerTitle'),
+          html: "<h3 class=\"govuk-notification-banner__heading\">" + t('pages.summary.paymentSuccessTitle') + "</h3><p class=\"govuk-body\">" + t('pages.summary.paymentSuccessBody') + "</p>"
         }) }}
       {% endif %}
 
       {% if errors %}
         {{ govukErrorSummary({
-          titleText: "There is a problem",
+          titleText: t('errors.title'),
           errorList: checkErrorTemplates(errors)
         }) }}
       {% endif %}
@@ -65,7 +65,7 @@
         {{ componentList(components) }}
 
         {% if declaration %}
-          <h2 class="govuk-heading-m" id="declaration">Declaration</h2>
+          <h2 class="govuk-heading-m" id="declaration">{{ t('pages.summary.declaration') }}</h2>
           <div class="govuk-body">
           {{ declaration | safe }}
           </div>
@@ -75,12 +75,19 @@
           {% set isDeclaration = declaration or components | length %}
           {% set paymentPending = paymentRequired and not paymentState %}
 
+          {% set submitButtonText = t('pages.summary.submit') %}
+          {% if paymentPending %}
+            {% set submitButtonText = t('pages.summary.payAndSubmit') %}
+          {% endif %}
+          {% if isDeclaration %}
+            {% set submitButtonText = t('pages.summary.acceptAndSubmit') %}
+          {% endif %}
+
           {# The prevent-multiple-clicks CSS class wires up to debounce-click.js to disable the button for 10s.
               For those with JS enabled, it will help prevent multiple submissions when a large form is taking a while to submit.
               When a better fix is implemented, this class can be removed and preventDoubleClick should be set back to true. #}
           {{ govukButton({
-            text: "Pay and submit" if paymentPending else ("Accept and submit" if isDeclaration else "Submit"),
-            classes: "prevent-multiple-clicks",
+            text: submitButtonText,
             name: "action",
             value: "send",
             preventDoubleClick: false
@@ -88,7 +95,7 @@
 
           {% if allowSaveAndExit %}
             {{ govukButton({
-              text: "Save and exit",
+              text: t('pages.summary.saveAndExit'),
               classes: "govuk-button--secondary",
               name: "action",
               value: "save-and-exit",

package/src/server/plugins/map/routes/index.js

@@ -218,5 +218,5 @@ function getGeospatialCountries() {
 /**
  * @import { ServerRoute } from '@hapi/hapi'
  * @import { FeatureCollection } from 'geojson'
- * @import { MapConfiguration, MapProxyGetRequestRefs, MapGeocodeGetRequestRefs, MapReverseGeocodeGetRequestRefs, GeospatialCountriesGetRequestRefs } from '../types.js'
+ * @import { MapConfiguration, MapProxyGetRequestRefs, MapGeocodeGetRequestRefs, GeospatialCountriesGetRequestRefs } from '../types.js'
  */

package/src/server/plugins/map/types.js

@@ -21,13 +21,6 @@
  * @property {string} query - name query
  */
 
-/**
- * Map reverse geocode query params
- * @typedef {object} MapReverseGeocodeQuery
- * @property {number} easting - the Easting point
- * @property {number} northing - the Northing point
- */
-
 /**
  * Geospatial countries query params
  * @typedef {object} GeospatialCountriesQuery
@@ -47,12 +40,6 @@
  * @property {MapGeocodeQuery} Query - Request query
  */
 
-/**
- * Map reverse geocode get request
- * @typedef {object} MapReverseGeocodeGetRequestRefs
- * @property {MapReverseGeocodeQuery} Query - Request query
- */
-
 /**
  * Map countries geojson get request
  * @typedef {object} GeospatialCountriesGetRequestRefs
@@ -62,11 +49,9 @@
 /**
  * @typedef {MapProxyGetRequestRefs} MapProxyRequestRefs
  * @typedef {MapGeocodeGetRequestRefs} MapGeocodeRequestRefs
- * @typedef {MapReverseGeocodeGetRequestRefs} MapReverseGeocodeRequestRefs
  * @typedef {Request<MapGeocodeGetRequestRefs>} MapProxyGetRequest
  * @typedef {Request<MapGeocodeGetRequestRefs>} MapGeocodeGetRequest
- * @typedef {Request<MapReverseGeocodeGetRequestRefs>} MapReverseGeocodeGetRequest
- * @typedef {MapProxyGetRequest | MapGeocodeGetRequest | MapReverseGeocodeGetRequest} MapRequest
+ * @typedef {MapProxyGetRequest | MapGeocodeGetRequest } MapRequest
  */
 
 //

package/src/server/plugins/nunjucks/environment.js

@@ -6,6 +6,7 @@ import resolvePkg from 'resolve'
 
 import { config } from '../../../config/index.js'
 import { evaluateTemplate } from '../engine/helpers.js'
+import { t as i18nT } from '../engine/i18n/index.js'
 import * as filters from './filters/index.js'
 
 const govukFrontendPath = dirname(
@@ -115,6 +116,19 @@ export function govukRebrand() {
 
 environment.addGlobal('govukRebrand', govukRebrand())
 
+/**
+ * Global t() function — en-GB fallback for templates not wired to a specific language.
+ * Per-request page controllers override this by passing t in their view model.
+ * @param {string} key
+ * @param {Record<string, unknown>} [opts]
+ * @returns {string}
+ */
+export function tGlobal(key, opts) {
+  return i18nT(key, 'en-GB', opts)
+}
+
+environment.addGlobal('t', tGlobal)
+
 /**
  * @import { NunjucksContext } from './types.js'
  * @import { FormSubmissionError } from '../engine/types.js'

package/src/server/plugins/nunjucks/filters/answer.js

@@ -18,7 +18,18 @@ export function answer(name) {
     return undefined
   }
 
-  return getAnswer(/** @type {Field} */ (component), context.relevantState)
+  const field = /** @type {Field} */ (component)
+  const { translator } = context
+
+  // Fallback if no translator in the context
+  return getAnswer(
+    field,
+    context.relevantState,
+    translator ?? field.model.createTranslator(),
+    {
+      format: 'summary'
+    }
+  )
 }
 
 /**