@defra-fish/gafl-webapp-service 1.23.0 → 1.24.0-rc.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.23.0",
+  "version": "1.24.0-rc.10",
   "description": "The websales frontend for the GAFL service",
   "type": "module",
   "engines": {
@@ -36,8 +36,8 @@
     "prepare": "gulp --gulpfile build/gulpfile.cjs"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.23.0",
-    "@defra-fish/connectors-lib": "1.23.0",
+    "@defra-fish/business-rules-lib": "1.24.0-rc.10",
+    "@defra-fish/connectors-lib": "1.24.0-rc.10",
     "@defra/hapi-gapi": "^1.1.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -76,5 +76,5 @@
     "gulp-sourcemaps": "^3.0.0",
     "node-sass": "^6.0.1"
   },
-  "gitHead": "17bfa0e0f8071495932dd25f05f70f936f42d676"
+  "gitHead": "5ecb6077c8bf4a27f4c44510750bd57141e54c30"
 }

package/src/constants.js

@@ -56,6 +56,12 @@ export const ShowDigitalLicencePages = {
   NO: 'show-digital-licence-no'
 }
 
+export const RENEWAL_ERROR_REASON = {
+  NOT_DUE: 'not-due',
+  EXPIRED: 'expired',
+  NOT_ANNUAL: 'not-annual'
+}
+
 // If the user has seen the summary page these are set in the status
 export const CONTACT_SUMMARY_SEEN = 'contact-summary'
 export const LICENCE_SUMMARY_SEEN = 'licence-summary'

package/src/handlers/authentication-handler.js

@@ -1,5 +1,6 @@
 import { setUpCacheFromAuthenticationResult, setUpPayloads } from '../processors/renewals-write-cache.js'
 import { IDENTIFY, CONTROLLER, RENEWAL_INACTIVE } from '../uri.js'
+import { RENEWAL_ERROR_REASON } from '../constants.js'
 import { validation, RENEW_BEFORE_DAYS, RENEW_AFTER_DAYS, SERVICE_LOCAL_TIME } from '@defra-fish/business-rules-lib'
 import Joi from 'joi'
 import { salesApi } from '@defra-fish/connectors-lib'
@@ -47,21 +48,16 @@ export default async (request, h) => {
     return h.redirect(IDENTIFY.uri)
   } else {
     // Test for 12 month licence
-    const daysDiff = moment(authenticationResult.permission.endDate).diff(
-      moment()
-        .tz(SERVICE_LOCAL_TIME)
-        .startOf('day'),
-      'days'
-    )
+    const daysDiff = moment(authenticationResult.permission.endDate).diff(moment().tz(SERVICE_LOCAL_TIME).startOf('day'), 'days')
     if (
       authenticationResult.permission.permit.durationDesignator.description === 'M' &&
       authenticationResult.permission.permit.durationMagnitude === 12
     ) {
       // Test for active renewal
       if (daysDiff > RENEW_BEFORE_DAYS) {
-        return linkInactive('not-due')
+        return linkInactive(RENEWAL_ERROR_REASON.NOT_DUE)
       } else if (daysDiff < -RENEW_AFTER_DAYS) {
-        return linkInactive('expired')
+        return linkInactive(RENEWAL_ERROR_REASON.EXPIRED)
       } else {
         await setUpCacheFromAuthenticationResult(request, authenticationResult)
         await setUpPayloads(request)
@@ -69,7 +65,7 @@ export default async (request, h) => {
         return h.redirect(CONTROLLER.uri)
       }
     } else {
-      return linkInactive('not-annual')
+      return linkInactive(RENEWAL_ERROR_REASON.NOT_ANNUAL)
     }
   }
 }

package/src/locales/cy.json

@@ -1,58 +1,60 @@
 {
   "access_statement_ability_net_link": "AbilityNet",
-  "access_statement_ability_net": " has advice on making your device easier to use if you have a disability.",
-  "access_statement_body": "This service is run by the Environment Agency. We want as many people as possible to be able to use this website. For example, that means you should be able to:",
-  "access_statement_bulletpoint_1": "change colours, contrast levels and fonts",
-  "access_statement_bulletpoint_2": "zoom in up to 200% without the text spilling off the screen",
-  "access_statement_bulletpoint_3": "navigate most of the website using just a keyboard",
-  "access_statement_bulletpoint_4": "navigate most of the website using speech recognition software",
-  "access_statement_bulletpoint_5": "listen to most of the website using a screen reader (including the most recent versions of JAWS, NVDA and VoiceOver)",
-  "access_statement_burden_title": "Disproportionate burden",
-  "access_statement_compliance_body_1": "This service is partially compliant with the ",
-  "access_statement_compliance_body_2": " AA standard, due to the non-compliances listed.",
-  "access_statement_compliance_body_link": "Web Content Accessibility Guidelines version 2.1",
-  "access_statement_compliance_heading": "Compliance status",
-  "access_statement_enforcement_subheading": "Enforcement procedure",
-  "access_statement_enforcement_body": "The Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the 'accessibility regulations'). If you’re not happy with how we respond to your complaint, contact the ",
-  "access_statement_enforcement_link": "Equality Advisory and Support Service (EASS)",
-  "access_statement_how_subheading": "How accessible this website is",
+  "access_statement_ability_net_1": "Mae gan ",
+  "access_statement_ability_net_2": " gyngor ar sicrhau bod eich dyfais yn hawdd ei defnyddio os oes gennych anabledd.",
+  "access_statement_body": "Cynhelir y gwasanaeth hwn gan Asiantaeth yr Amgylchedd. Rydym am weld cymaint o bobl â phosib yn defnyddio’r wefan hon. Er enghraifft, mae hynny’n golygu y dylech fod yn gallu gwneud y canlynol:",
+  "access_statement_bulletpoint_1": "newid lliwiau, lefelau cyferbynnedd a ffontiau",
+  "access_statement_bulletpoint_2": "chwyddo mewn hyd at 200% heb i’r testun fynd oddi ar y sgrin",
+  "access_statement_bulletpoint_3": "gwe-lywio’r rhan fwyaf o’r wefan gan ddefnyddio bysellfwrdd yn unig",
+  "access_statement_bulletpoint_4": "gwe-lywio’r rhan fwyaf o’r wefan gan ddefnyddio meddalwedd adnabod llais",
+  "access_statement_bulletpoint_5": "gwrando ar y rhan fwyaf o’r wefan gan ddefnyddio darllenydd sgrin (gan gynnwys y fersiynau diweddaraf o JAWS, NVDA a VoiceOver)",
+  "access_statement_burden_title": "Baich anghymesurol",
+  "access_statement_compliance_body_1": "Mae’r wefan hon yn cydymffurfio’n rhannol â safon AA ",
+  "access_statement_compliance_body_2": " , yn sgil yr achosion o ddiffyg cydymffurfio sydd wedi’u rhestru isod.",
+  "access_statement_compliance_body_link": "fersiwn 2.1 o Ganllawiau Hygyrchedd Cynnwys Gwefannau (WCAG)",
+  "access_statement_compliance_heading": "Statws cydymffurfio",
+  "access_statement_enforcement_subheading": "Gweithdrefn gorfodi",
+  "access_statement_enforcement_body": "Mae’r Comisiwn Cydraddoldeb a Hawliau Dynol yn gyfrifol am orfodi Rheoliadau Hygyrchedd Cyrff Sector Cyhoeddus (Gwefannau ac Apiau Symudol (Rhif 2) 2018 (y ‘rheoliadau hygyrchedd’).  Os ydych yn anhapus â’r ffordd rydym yn ymateb i’ch cwyn, cysylltwch â’r ",
+  "access_statement_enforcement_link": "Gwasanaeth Cynghori a Chefnogi Cydraddoldeb (EASS)",
+  "access_statement_how_subheading": "Pa mor hygyrch yw’r wefan hon?",
   "access_statement_feedback_info_bulletpoint_1_link": "enquiries@environment-agency.gov.uk",
-  "access_statement_feedback_info_bulletpoint_1": "email: ",
-  "access_statement_feedback_info_bulletpoint_2_call": "call ",
+  "access_statement_feedback_info_bulletpoint_1": "e-bostio: ",
+  "access_statement_feedback_info_bulletpoint_2_call": "ffonio ",
   "access_statement_feedback_info_bulletpoint_2_link": "03708 506 506",
-  "access_statement_feedback_info_bulletpoint_2_times": " (Monday to Friday, 8am to 6pm)",
-  "access_statement_feedback_info": "If you need information on this website in a different format like accessible PDF, large print, easy read, audio recording or braille:",
-  "access_statement_feedback_subheading": "Feedback and contact information",
-  "access_statement_heading": "Accessibility statement for Get a rod fishing licence",
-  "access_statement_how_info_bulletpoint_1": "On the licence start date page, the calendar date picker is not accessible to those using keyboards or screen readers. Users with accessibility requirements are able to enter this date using the standard day, month and year fields.",
-  "access_statement_how_info_bulletpoint_2": "The historical calendar dates are too low in contrast",
-  "access_statement_how_info": "All users with access needs can complete the process of buying a fishing rod licence using this service. However we know that some parts of this website are not fully accessible:",
-  "access_statement_made_simple": "We have also made the website text as simple as possible to understand.",
-  "access_statement_nonaccess_body": "The content listed below is non-accessible for the following reasons.",
-  "access_statement_nonaccess_heading": "Non-accessible content",
-  "access_statement_noncompliance_body_1": "Users are not always notified when conditionally revealed content associated with a radio button or checkbox is expanded or collapsed. This fails ",
-  "access_statement_noncompliance_body_2": ". We will review this by the end of January 2022.",
-  "access_statement_noncompliance_body_link": "WCAG 2.1 success criterion 4.1.2 Name, Role, Value",
-  "access_statement_noncompliance_heading": "Non-compliance with the accessibility regulations",
-  "access_statement_none": "None.",
-  "access_statement_not_in_scope_title": "Content that’s not within the scope of the accessibility regulations",
-  "access_statement_prep_body_1": "This statement was prepared on 23 September 2020. It was last reviewed on 13 October 2021.",
-  "access_statement_prep_body_2": "The service was audited for accessibility by the Digital Accessibility Centre on 13 April 2021 and by the Department for the Environment Food and Rural Affairs’ web compliance team on 22 April 2021.",
-  "access_statement_prep_body_3": "We tested the most common steps for getting these types of licence:",
-  "access_statement_prep_body_4": "The non-compliant elements will be included in ongoing testing and fixing.",
-  "access_statement_prep_bulletpoint_1": "12 month: coarse and trout",
-  "access_statement_prep_bulletpoint_2": "12 month: salmon and sea trout ",
-  "access_statement_prep_bulletpoint_3": "junior",
-  "access_statement_prep_heading": "Preparation of this accessibility statement",
-  "access_statement_reporting_info": "We are always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact:",
-  "access_statement_reporting_subheading": "Reporting accessibility problems with this website",
-  "access_statement_tech_body": "The Environment Agency is committed to making its website accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.",
-  "access_statement_tech_heading": "Technical information about this website’s accessibility",
+  "access_statement_feedback_info_bulletpoint_2_times": " (dydd Llun i ddydd Gwener, 8am tan 6pm)",
+  "access_statement_feedback_info": "Os oes arnoch angen gwybodaeth ar y wefan hon mewn fformat arall fel PDF hygyrch, print bras, fersiwn hawdd ei deall, recordiad sain neu Braille, cysylltwch drwy un o’r dulliau canlynol:",
+  "access_statement_feedback_subheading": "Adborth a manylion cyswllt",
+  "access_statement_heading": "Datganiad hygyrchedd ar gyfer cyflwyno cais am drwydded bysgota â gwialen",
+  "access_statement_how_info_bulletpoint_1": "Ar dudalen dyddiad dechrau’r drwydded, nid yw dewiswr dyddiad y calendr yn hygyrch i’r rheiny sy’n defnyddio bysellfyrddau neu ddarllenwyr sgrin. Gall defnyddwyr ag anghenion hygyrchedd nodi’r dyddiad hwn gan ddefnyddio’r meysydd diwrnod, mis a blwyddyn safonol.",
+  "access_statement_how_info_bulletpoint_2": "Mae’r dyddiadau calendr hanesyddol yn rhy isel o ran cyferbyniad",
+  "access_statement_how_info": "Gall yr holl ddefnyddwyr ag anghenion mynediad gwblhau’r broses o brynu trwydded gwialen bysgota trwy ddefnyddio’r gwasanaeth hwn. Fodd bynnag, rydym yn gwybod nad yw rhai rhannau o’r wefan hon yn gwbl hygyrch:",
+  "access_statement_made_simple": "Rydym hefyd wedi sicrhau bod y testun ar y wefan mor syml â phosib i’w ddeall.",
+  "access_statement_nonaccess_body": "Nid yw’r cynnwys a restrir isod yn hygyrch am y rhesymau canlynol.",
+  "access_statement_nonaccess_heading": "Cynnwys nad yw’n hygyrch",
+  "access_statement_noncompliance_body_1": "Nid yw defnyddwyr bob tro’n gwybod pan fo cynnwys amodol sy’n gysylltiedig â botwm radio neu flwch gwirio wedi’i ehangu neu ei gwympo. Mae hyn yn methu ",
+  "access_statement_noncompliance_body_2": ". Byddwn yn adolygu hyn erbyn diwedd mis Ionawr 2022. ",
+  "access_statement_noncompliance_body_link": "maen prawf llwyddiant 4.1.2: Enw, Rôl, Gwerth WCAG 2.1",
+  "access_statement_noncompliance_heading": "Diffyg cydymffurfio â’r rheoliadau hygyrchedd",
+  "access_statement_none": "Dim.",
+  "access_statement_not_in_scope_title": "Cynnwys nad o fewn cwmpas y rheoliadau hygyrchedd",
+  "access_statement_prep_body_1": "Paratowyd y datganiad hwn ar 23 Medi 2020. Fe’i hadolygwyd ddiwethaf ar 13 Hydref 2021.",
+  "access_statement_prep_body_2": "Archwiliwyd y gwasanaeth am hygyrchedd gan y Ganolfan Hygyrchedd Digidol ar 13 Ebrill 2021 a chan dîm cydymffurfedd gwe Adran yr Amgylchedd Bwyd a Materion Gwledig ar 22 Ebrill 2021.",
+  "access_statement_prep_body_3": "Gwnaethom brofi’r camau mwyaf cyffredin ar gyfer cyflwyno cais am y mathau hyn o drwydded:",
+  "access_statement_prep_body_4": "Caiff yr elfennau o ddiffyg cydymffurfio eu cynnwys mewn gwaith profi a thrwsio parhaus.",
+  "access_statement_prep_bulletpoint_1": "12 mis: pysgod bras a brithyllod",
+  "access_statement_prep_bulletpoint_2": "12 mis: eogiaid a brithyllod y môr",
+  "access_statement_prep_bulletpoint_3": "iau",
+  "access_statement_prep_heading": "Llunio’r datganiad hygyrchedd hwn",
+  "access_statement_reporting_info": "Rydym yn awyddus bob amser i wella hygyrchedd y wefan hon. Os ydych yn cael unrhyw broblemau nad ydynt wedi’u rhestru ar y dudalen hon neu os nad ydych yn meddwl ein bod yn bodloni gofynion hygyrchedd, cysylltwch drwy un o’r dulliau canlynol:",
+  "access_statement_reporting_subheading": "Adrodd am broblemau hygyrchedd gyda’r wefan hon",
+  "access_statement_tech_body": "Mae Asiantaeth yr Amgylchedd yn ymrwymedig i sicrhau bod ei gwefan yn hygyrch, yn unol â Rheoliadau Hygyrchedd Cyrff Sector Cyhoeddus (Gwefannau ac Apiau Symudol) (Rhif 2) 2018.",
+  "access_statement_tech_heading": "Gwybodaeth dechnegol am hygyrchedd y wefan hon",
   "access_statement_title": "Accessibility statement - GOV.UK",
-  "access_statement_visit_info_link": "office access and opening times",
-  "access_statement_visit_info_text_serivce": "We do not currently have a text relay service for people who are deaf, hearing impaired or have a speech impediment.",
-  "access_statement_visit_info": "See the Environment Agency’s ",
-  "access_statement_visit": "If you visit our offices and need assistance or a British Sign Language interpreter, you should contact us before you visit.",
+  "access_statement_visit_info_link": "mynediad ac oriau agor swyddfeydd",
+  "access_statement_visit_info_text_serivce": "Nid ydym yn darparu gwasanaeth cyfnewid testun i bobl sy’n fyddar, sydd â nam ar eu clyw, neu sydd â nam lleferydd ar hyn o bryd.",
+  "access_statement_visit_info_1": "Gweler ",
+  "access_statement_visit_info_2": " Asiantaeth yr Amgylchedd.",
+  "access_statement_visit": "Os ydych yn ymweld â’n swyddfeydd ac mae angen cymorth arnoch neu ddehonglydd Iaith Arwyddion Prydain, dylech gysylltu â ni cyn eich ymweliad.",
   "account_disabled_body_1": "You were successfully signed in but your account is not enabled in Microsoft Dynamics.",
   "account_disabled_title": "Account not enabled",
   "address_entry_content_and_postcode": "and postcode",
@@ -123,8 +125,8 @@
   "client_error_title_unauth": "Unauthorized",
   "concession_applied": "Consesiwn wedi’i gynnwys",
   "contact_summary_title": "Check the contact details",
-  "contact_us_body": "You can contact us by:",
-  "contact_us_heading": "Contact us",
+  "contact_us_body": "Gallwch gysylltu â ni drwy’r dulliau canlynol:",
+  "contact_us_heading": "Cysylltu â ni",
   "continue": "Parhau",
   "cookie_banner_close_ex": "cookie banner",
   "cookie_banner_close": "Close",
@@ -242,17 +244,17 @@
   "identify_subheading_problem": "Problem with the licence details?",
   "identify_title": "Renew your rod fishing licence?",
   "important_info_contact_error_choose": "Dewiswch sut y dylem gysylltu â deiliad y drwydded",
-  "important_info_contact_error_email": "Rhowch gyfeiriad e-bost yn y fformat cywi",
+  "important_info_contact_error_email": "Rhowch gyfeiriad e-bost yn y fformat cywir",
   "important_info_contact_error_mobile": "Nodwch rif ffôn symudol yn y DU",
   "important_info_contact_input_email_hint": "Er enghraifft enw@enghraifft.com",
-  "important_info_contact_input_email": "cyfeiriad ebost",
+  "important_info_contact_input_email": "Cyfeiriad e-bost",
   "important_info_contact_input_mobile_hint": "Er enghraifft 07700 900 900",
   "important_info_contact_input_mobile_note": "Mobile phone number",
-  "important_info_contact_input_mobile": "Rhif ffôn symudol y DU",
+  "important_info_contact_input_mobile": "Rhif ffôn symudol yn y DU",
   "important_info_contact_item_email": "E-bost",
   "important_info_contact_item_txt": "Neges destun",
   "important_info_contact_licence_needed": "The rod licence holder will need to confirm the licence number if asked by an enforcement officer.",
-  "important_info_contact_none_msg": "We will show you the licence number on confirmation.",
+  "important_info_contact_none_msg": "Byddwn yn dangos rhif y drwydded i chi ar ôl cadarnhau.",
   "important_info_contact_note_tip": "Gwnewch nodyn o rif y drwydded",
   "important_info_contact_post_confirm_8d": "We don’t provide physical cards for 1 or 8 day licences.",
   "important_info_contact_post_confirm_jr": "We don’t provide physical cards for junior licences.",
@@ -262,15 +264,15 @@
   "important_info_contact_post": "Post",
   "important_info_contact_title_other": "Sut y dylem gysylltu â deiliad y drwydded ynghylch nodiadau atgoffa a newidiadau pwysig?",
   "important_info_contact_title_you": "Sut dylen ni gysylltu â chi am nodiadau atgoffa a newidiadau pwysig?",
-  "licence_confirm_method_error_choose": "Dewiswch sut dylen ni anfon y drwydded",
-  "licence_confirm_method_how_body_item": "I will make a note of the licence number",
-  "licence_confirm_method_how_body_text": "This is where we will send confirmation of the fishing licence",
+  "licence_confirm_method_error_choose": "Dewiswch sut dylen anfon y drwydded",
+  "licence_confirm_method_how_body_item": "Byddaf yn gwneud nodyn o rif y drwydded",
+  "licence_confirm_method_how_body_text": "Dyma lle y byddwn yn anfon cadarnhad o’ch trwydded bysgota",
   "licence_confirm_method_how_title_other": "How do they want their fishing licence confirmation?",
-  "licence_confirm_method_how_title_you": "How do you want your fishing licence confirmation?",
+  "licence_confirm_method_how_title_you": "Sut hoffech chi dderbyn cadarnhad o'ch trwydded bysgota?",
   "licence_confirm_method_where_body_hint_other": "Licence information will be sent by email or text message only. We will not send a licence card.",
   "licence_confirm_method_where_body_hint_you": "Byddwch yn derbyn gwybodaeth am eich trwydded drwy e-bost neu neges destun yn unig. Ni fyddwch yn derbyn cerdyn trwydded.",
   "licence_confirm_method_where_body_text": "Dyma ble byddwn yn anfon y drwydded ar ôl derbyn y taliad.",
-  "licence_confirm_method_where_title_other": "Where should we send the fishing licence?",
+  "licence_confirm_method_where_title_other": "I ble y dylen ni anfon y drwydded bysgota?",
   "licence_confirm_method_where_title_you": "I ble y dylen ni anfon eich trwydded bysgota?",
   "licence_date_picker": "Click to open date picker",
   "licence_details_body": "This is proof of the fishing licence. You might find it useful to take a screenshot or print out this page.",
@@ -302,7 +304,7 @@
   "licence_length_eight_day": "Mae trwyddedau wyth niwrnod yn ddilys am wyth niwrnod yn olynol o’r amser cychwyn a ddewiswch",
   "licence_length_error_choose": "Dewiswch hyd y drwydded",
   "licence_length_one_day": "Mae trwyddedau un diwrnod yn ddilys am 24 awr o’r amser cychwyn a ddewiswch",
-  "licence_length_title_other": "How long do they want the licence for?",
+  "licence_length_title_other": "Am ba hyd y maent am gael y drwydded?",
   "licence_length_title_you": "Am ba hyd yr hoffech chi gael y drwydded?",
   "licence_num": "Licence number",
   "licence_start_days": " diwrnod nesaf",
@@ -358,7 +360,7 @@
   "licence_summary_type": "Type",
   "licence_type_12m": "12 mis",
   "licence_type_1d": "1 diwrnod",
-  "licence_type_8d": "8 diwrnod",
+  "licence_type_8d": "8 niwrnod",
   "licence_type_attended_rods_note": "Mae’r gwialenni i’w defnyddio gan ddeiliad y drwydded yn unig ac mae’n rhaid eu goruchwylio ar bob adeg.",
   "licence_type_byelaws": "is-ddeddfau pysgota lleol (yn agor mewn tab newydd)",
   "licence_type_error_choose": "Dewiswch un o’r mathau o drwyddedau pysgota",
@@ -430,7 +432,7 @@
   "our_address_3": "Deanery Road",
   "our_address_4": "Bristol",
   "our_address_5": "BS1 5AH",
-  "over_65": "Dros 65, ",
+  "over_65": "Dros 65",
   "payment_cancelled_title": "Your payment has been cancelled",
   "payment_failed_expired": "The payment was not completed within 90 minutes of being created",
   "payment_failed_not_taken": "No money has been taken from your account.",
@@ -496,26 +498,27 @@
   "privacy_where_stored_body_2": "The organisations we share personal data with process and store data in the UK. Our processor may also store this data outside the UK in Switzerland.",
   "privacy_where_stored_body_3": "We do not store payment details.",
   "purpose": "Purpose",
-  "refund_bulletpoint_1": "The Environment Agency can only refund the cost of a licence to the purchaser. All refund applications should be directed to the Environment Agency, except where the licence has been bought through a third party (other than the Post Office), in which case refund applications should be directed to them. Contact the Environment Agency on 03708 506506.",
-  "refund_bulletpoint_2_1": "The Environment Agency will not charge a fee when you purchase a licence through our ",
-  "refund_bulletpoint_2_2": " or the Post Office. We do not recommend purchasing your licence through third-party sites, which may charge a fee on top of the licence cost. If you purchased your licence through a third party, please contact them directly to request a refund of the licence cost and/or fee.  The Environment Agency will not refund licence holders for licences purchased through third parties.  ",
-  "refund_bulletpoint_2_link": "website",
-  "refund_bulletpoint_3": "If you purchase a licence in error or buy the wrong type of licence, for yourself or someone else, the purchaser can request a refund within 14 days of the original purchase date.",
-  "refund_bulletpoint_4": "Where an error has occurred that is attributable to the Environment Agency or the Post Office, please contact us directly within 14 days of the original purchase date to request a full refund. Contact the Environment Agency on 03708 506506.",
-  "refund_bulletpoint_5": "No refunds are offered on 1-day or 8-day licences. If you upgrade to a 12-month licence within 14 days of the expiry date of the short-term licence, we will refund the cost of the short-term licence after you have purchased the 12-month licence.",
-  "refund_bulletpoint_6": "You can request a refund if you upgrade a 2-rod licence to a 3-rod licence, within 14 days of the original purchase date. We will refund the cost of the 2-rod licence after you have purchased the 3-rod licence.",
-  "refund_bulletpoint_7": "You can request a refund if you upgrade a coarse fish licence to a salmon and sea trout licence within 14 days of the original purchase date. We will refund the cost of the coarse fish licence after you have purchased the salmon and sea trout licence.",
-  "refund_heading": "Refund policy",
+  "refund_bulletpoint_1": "Gall Asiantaeth yr Amgylchedd ad-dalu cost trwydded i’r prynwr yn unig. Dylai’r holl geisiadau am ad-daliad gael eu cyfeirio i Asiantaeth yr Amgylchedd, ac eithrio mewn achosion lle mae’r drwydded wedi cael ei phrynu drwy drydydd parti (ac eithrio Swyddfa’r Post), pan ddylai ceisiadau am ad-daliadau gael eu cyfeirio iddyn nhw. Ffoniwch Asiantaeth yr Amgylchedd ar 03708 506506.",
+  "refund_bulletpoint_2_1": "Ni fydd Asiantaeth yr Amgylchedd yn codi ffi pan fyddwch yn prynu trwydded drwy ein ",
+  "refund_bulletpoint_2_2": " neu Swyddfa’r Post. Nid ydym yn argymell prynu eich trwydded drwy wefannau trydydd parti, efallai y byddant yn codi ffi ar ben cost y drwydded. Os gwnaethoch brynu eich trwydded drwy drydydd parti, cysylltwch ag ef yn uniongyrchol i ofyn iddo ad-dalu cost y drwydded a/neu’r ffi. Ni fydd Asiantaeth yr Amgylchedd yn ad-dalu deiliaid trwyddedau ar gyfer trwyddedau a brynwyd drwy drydydd partïon.",
+  "refund_bulletpoint_2_link": "gwefan",
+  "refund_bulletpoint_3": "Os ydych yn prynu trwydded ar gam neu’n prynu’r math anghywir o drwydded, ar eich cyfer chi neu rywun arall, gall y prynwr ofyn am ad-daliad o fewn 14 diwrnod o’r dyddiad prynu gwreiddiol.",
+  "refund_bulletpoint_4": "Pan fydd gwall wedi digwydd y gellir ei briodoli i Asiantaeth yr Amgylchedd neu Swyddfa’r Post, cysylltwch â ni’n uniongyrchol o fewn 14 diwrnod o’r dyddiad prynu gwreiddiol i ofyn am ad-daliad llawn. Ffoniwch Asiantaeth yr Amgylchedd ar 03708 506506.",
+  "refund_bulletpoint_5": "Ni chynigir ad-daliadau ar gyfer trwyddedau 1 diwrnod nac 8 niwrnod. Os ydych yn uwchraddio i drwydded 12 mis o fewn 14 diwrnod o ddyddiad dod i ben y drwydded tymor byr, byddwn yn ad-dalu cost y drwydded tymor byr ar ôl i chi brynu’r drwydded 12 mis.",
+  "refund_bulletpoint_6": "Gallwch ofyn am ad-daliad os ydych yn uwchraddio trwydded 2 wialen i drwydded 3 gwialen o fewn 14 diwrnod o’r dyddiad prynu gwreiddiol. Byddwn yn ad-dalu cost y drwydded 2 wialen ar ôl i chi brynu’r drwydded 3 gwialen.",
+  "refund_bulletpoint_7": "Gallwch ofyn am ad-daliad os ydych yn uwchraddio trwydded pysgod bras i drwydded eogiaid a brithyllod y môr o fewn 14 diwrnod o’r dyddiad prynu gwreiddiol. Byddwn yn ad-dalu cost y drwydded pysgod bras ar ôl i chi brynu’r drwydded eogiaid a brithyllod y môr.",
+  "refund_heading": "Polisi ad-dalu",
   "refund_title": "Refund policy - GOV.UK",
   "renewal_inactive_has_expired_1": " has expired on ",
   "renewal_inactive_has_expired_2": " and can no longer be renewed",
-  "renewal_inactive_not_annual_1": " is not a 12 month licence and cannot be renewed",
+  "renewal_inactive_not_annual_1": " is not a 12 month licence and cannot be renewed.",
   "renewal_inactive_not_due_1": "The licence ending in ",
   "renewal_inactive_not_due_2": " does not expire until ",
-  "renewal_inactive_not_due_3": "Click continue to buy a another licence",
   "renewal_inactive_title_1": "You are renewing this licence too early",
   "renewal_inactive_title_2": "The licence renewal has expired",
   "renewal_inactive_title_3": "You cannot renew an 8 day or 1 day licence",
+  "renewal_inactive_title_4": "You can ",
+  "renewal_inactive_title_link": "buy a new licence.",
   "renewal_start_date_error_format": "Not a valid date. Enter the date you want the licence to start on and include a day, month and year",
   "renewal_start_date_error_hint_1": "Enter a date between ",
   "renewal_start_date_error_max_1": "Your new licence must start within ",

package/src/locales/en.json

@@ -1,6 +1,7 @@
 {
   "access_statement_ability_net_link": "AbilityNet",
-  "access_statement_ability_net": " has advice on making your device easier to use if you have a disability.",
+  "access_statement_ability_net_1": " has advice on making your device easier to use if you have a disability.",
+  "access_statement_ability_net_2": " has advice on making your device easier to use if you have a disability.",
   "access_statement_body": "This service is run by the Environment Agency. We want as many people as possible to be able to use this website. For example, that means you should be able to:",
   "access_statement_bulletpoint_1": "change colours, contrast levels and fonts",
   "access_statement_bulletpoint_2": "zoom in up to 200% without the text spilling off the screen",
@@ -51,7 +52,8 @@
   "access_statement_title": "Accessibility statement - GOV.UK",
   "access_statement_visit_info_link": "office access and opening times",
   "access_statement_visit_info_text_serivce": "We do not currently have a text relay service for people who are deaf, hearing impaired or have a speech impediment.",
-  "access_statement_visit_info": "See the Environment Agency’s ",
+  "access_statement_visit_info_1": "See the Environment Agency’s ",
+  "access_statement_visit_info_2": ".",
   "access_statement_visit": "If you visit our offices and need assistance or a British Sign Language interpreter, you should contact us before you visit.",
   "account_disabled_body_1": "You were successfully signed in but your account is not enabled in Microsoft Dynamics.",
   "account_disabled_title": "Account not enabled",
@@ -430,7 +432,7 @@
   "our_address_3": "Deanery Road",
   "our_address_4": "Bristol",
   "our_address_5": "BS1 5AH",
-  "over_65": "Over 65, ",
+  "over_65": "Over 65",
   "payment_cancelled_title": "Your payment has been cancelled",
   "payment_failed_expired": "The payment was not completed within 90 minutes of being created",
   "payment_failed_not_taken": "No money has been taken from your account.",
@@ -509,13 +511,14 @@
   "refund_title": "Refund policy - GOV.UK",
   "renewal_inactive_has_expired_1": " has expired on ",
   "renewal_inactive_has_expired_2": " and can no longer be renewed",
-  "renewal_inactive_not_annual_1": " is not a 12 month licence and cannot be renewed",
+  "renewal_inactive_not_annual_1": " is not a 12 month licence and cannot be renewed.",
   "renewal_inactive_not_due_1": "The licence ending in ",
   "renewal_inactive_not_due_2": " does not expire until ",
-  "renewal_inactive_not_due_3": "Click continue to buy a another licence",
   "renewal_inactive_title_1": "You are renewing this licence too early",
   "renewal_inactive_title_2": "The licence renewal has expired",
   "renewal_inactive_title_3": "You cannot renew an 8 day or 1 day licence",
+  "renewal_inactive_title_4": "You can ",
+  "renewal_inactive_title_link": "buy a new licence.",
   "renewal_start_date_error_format": "Not a valid date. Enter the date you want the licence to start on and include a day, month and year",
   "renewal_start_date_error_hint_1": "Enter a date between ",
   "renewal_start_date_error_max_1": "Your new licence must start within ",

package/src/pages/contact/digital-licence/check-confirmation-contact/__tests__/__snapshots__/check-confirmation-contact.spec.js.snap

@@ -8,8 +8,8 @@ Object {
     "preferredMethodOfConfirmation": "email",
   },
   "uri": Object {
-    "contact": "/buy/contact",
-    "licenceConfirmationMethod": "/buy/confirmation-method",
+    "change": "licence-confirmation-method.url?change=mobile",
+    "contact": "contact.url",
   },
 }
 `;

package/src/pages/contact/digital-licence/check-confirmation-contact/__tests__/check-confirmation-contact.spec.js

@@ -1,7 +1,22 @@
-import { CONTACT } from '../../../../../uri.js'
+import { CONTACT, LICENCE_CONFIRMATION_METHOD } from '../../../../../uri.js'
 import { HOW_CONTACTED } from '../../../../../processors/mapping-constants.js'
 import { getData } from '../route.js'
 import GetDataRedirect from '../../../../../handlers/get-data-redirect.js'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+
+jest.mock('../../../../../processors/uri-helper.js')
+jest.mock('../../../../../processors/mapping-constants.js', () => ({
+  HOW_CONTACTED: {
+    none: 'nada',
+    email: 'e-mail',
+    text: 'mobile-phone'
+  }
+}))
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CONTACT: { uri: 'contact.url' },
+  LICENCE_CONFIRMATION_METHOD: { uri: 'licence-confirmation-method.url' }
+}))
 
 describe('.getData', () => {
   const createRequestMock = (options = {}) => ({
@@ -20,13 +35,42 @@ describe('.getData', () => {
     }))
   })
 
+  beforeEach(jest.resetAllMocks)
+
   it('if preferred method of confirmation is none, redirects to contact page', async () => {
     const getDataRedirectError = new GetDataRedirect(CONTACT.uri)
     const func = async () => await getData(createRequestMock({ preferredMethodOfConfirmation: HOW_CONTACTED.none }))
     await expect(func).rejects.toThrow(getDataRedirectError)
   })
 
+  describe.each([
+    { urlName: 'change', url: `${LICENCE_CONFIRMATION_METHOD.uri}?change=email`, preferredMethodOfConfirmation: HOW_CONTACTED.email },
+    { urlName: 'change', url: `${LICENCE_CONFIRMATION_METHOD.uri}?change=mobile`, preferredMethodOfConfirmation: HOW_CONTACTED.text },
+    { urlName: 'contact', url: CONTACT.uri, preferredMethodOfConfirmation: HOW_CONTACTED.email }
+  ])('$urlName $confirmation is decorated by addLanguageCodeToUri', ({ urlName, url, preferredMethodOfConfirmation }) => {
+    it(`passes request and ${urlName} url to addLanguageCodeToUri`, async () => {
+      const request = createRequestMock({ preferredMethodOfConfirmation })
+      await getData(request)
+      expect(addLanguageCodeToUri).toHaveBeenCalledWith(request, url)
+    })
+
+    it(`returns decorated value for ${urlName} from addLanguageCodeToUri`, async () => {
+      const expectedUrl = Symbol(urlName)
+      addLanguageCodeToUri.mockReturnValue(expectedUrl)
+      const request = createRequestMock()
+      const data = await getData(request)
+      expect(data).toEqual(
+        expect.objectContaining({
+          uri: expect.objectContaining({
+            [urlName]: expectedUrl
+          })
+        })
+      )
+    })
+  })
+
   it('returns the expected data', async () => {
+    addLanguageCodeToUri.mockImplementation((_request, uri) => uri)
     expect(await getData(createRequestMock())).toMatchSnapshot()
   })
 })

package/src/pages/contact/digital-licence/check-confirmation-contact/check-confirmation-contact.njk

@@ -1,15 +1,12 @@
 {% extends "standard-form.njk" %}
 {% from "back-link/macro.njk" import govukBackLink %}
 
-
 {% if data.licensee.preferredMethodOfConfirmation == 'Email' %} 
   {% set contactType = mssgs.email_address %}
   {% set contactInfo = data.licensee.email  %}
-  {% set changeLinkUrl = data.uri.licenceConfirmationMethod + '?change=email' %}
 {% else %}
   {% set contactType = mssgs.phone_number  %}
   {% set contactInfo = data.licensee.mobilePhone %}
-  {% set changeLinkUrl = data.uri.licenceConfirmationMethod + '?change=mobile' %}
 {% endif %}
 
 {% set title = mssgs.check_conf_contact_title_1 + contactType + mssgs.check_conf_contact_title_2 %}
@@ -36,7 +33,7 @@
       </p>
 
       <p class="govuk-body govuk-!-margin-bottom-6">
-        <a class="govuk-link" href="{{ changeLinkUrl }}">
+        <a class="govuk-link" href="{{ data.uri.change }}">
           {{ mssgs.licence_summary_change }} {{ contactType }}
         </a>
       </p>

package/src/pages/contact/digital-licence/check-confirmation-contact/route.js

@@ -3,6 +3,7 @@ import { HOW_CONTACTED } from '../../../../processors/mapping-constants.js'
 import GetDataRedirect from '../../../../handlers/get-data-redirect.js'
 import pageRoute from '../../../../routes/page-route.js'
 import { nextPage } from '../../../../routes/next-page.js'
+import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
 
 export const getData = async request => {
   const { licensee } = await request.cache().helpers.transaction.getCurrentPermission()
@@ -11,11 +12,14 @@ export const getData = async request => {
     throw new GetDataRedirect(CONTACT.uri)
   }
 
+  const whatToChange = licensee.preferredMethodOfConfirmation === HOW_CONTACTED.email ? '?change=email' : '?change=mobile'
+  const change = addLanguageCodeToUri(request, `${LICENCE_CONFIRMATION_METHOD.uri}${whatToChange}`)
+
   return {
     licensee,
     uri: {
-      licenceConfirmationMethod: LICENCE_CONFIRMATION_METHOD.uri,
-      contact: CONTACT.uri
+      contact: addLanguageCodeToUri(request, CONTACT.uri),
+      change
     }
   }
 }

package/src/pages/guidance/accessibility-statement.njk

@@ -24,7 +24,7 @@
         </ul>
 
         <p class="govuk-body">{{ mssgs.access_statement_made_simple }}</p>
-        <p class="govuk-body"><a href="https://mcmw.abilitynet.org.uk/" class="govuk-link">{{ mssgs.access_statement_ability_net_link}}</a>{{ mssgs.access_statement_ability_net }}</p>
+        <p class="govuk-body">{{ mssgs.access_statement_ability_net_1 }}<a href="https://mcmw.abilitynet.org.uk/" class="govuk-link">{{ mssgs.access_statement_ability_net_link}}</a>{{ mssgs.access_statement_ability_net_2 }}</p>
 
         <h2 class="govuk-heading-m">{{ mssgs.access_statement_how_subheading }}</h2>
         <p class="govuk-body">{{ mssgs.access_statement_how_info }}</p>
@@ -58,7 +58,7 @@
             <li>{{ mssgs.facebook_bulletpoint }}<a href="https://www.facebook.com/environmentagency" class="govuk-link">{{ mssgs.facebook_bulletpoint_link }}</a></li>
         </ul>
         <p class="govuk-body">{{ mssgs.access_statement_visit }}</p>
-        <p class="govuk-body">{{ mssgs.access_statement_visit_info }}<a href="https://www.gov.uk/government/organisations/environment-agency/about/access-and-opening" class="govuk-link">{{ mssgs.access_statement_visit_info_link }}</a>{{ mssgs.period }}</p>
+        <p class="govuk-body">{{ mssgs.access_statement_visit_info_1 }}<a href="https://www.gov.uk/government/organisations/environment-agency/about/access-and-opening" class="govuk-link">{{ mssgs.access_statement_visit_info_link }}</a>{{ mssgs.access_statement_visit_info_2 }}</p>
         <p class="govuk-body">{{ mssgs.access_statement_visit_info_text_serivce }}</p>
 
         <h2 class="govuk-heading-m">{{ mssgs.access_statement_tech_heading }}</h2>

package/src/pages/licence-details/licence-length/__tests__/route.spec.js

@@ -1,6 +1,6 @@
 import { getData } from '../route'
 import '../../../../processors/pricing-summary.js'
-import '../../../../processors/licence-type-display.js'
+import { licenceTypeDisplay } from '../../../../processors/licence-type-display.js'
 
 jest.mock('../../../../processors/pricing-summary.js')
 jest.mock('../../../../processors/licence-type-display.js')
@@ -15,7 +15,10 @@ describe('licence-length > route', () => {
           getCurrentPermission: mockTransactionCacheGet
         }
       }
-    })
+    }),
+    i18n: {
+      getCatalog: () => ({})
+    }
   }
 
   describe('getData', () => {
@@ -30,5 +33,32 @@ describe('licence-length > route', () => {
       const result = await getData(mockRequest)
       expect(result.isLicenceForYou).toBeFalsy()
     })
+
+    it('licenceTypeDisplay is called with the expected arguments', async () => {
+      const catalog = Symbol('mock catalog')
+      const permission = Symbol('mock permission')
+      const sampleRequest = {
+        ...mockRequest,
+        i18n: {
+          getCatalog: () => catalog
+        }
+      }
+      mockTransactionCacheGet.mockImplementationOnce(() => permission)
+
+      await getData(sampleRequest)
+
+      expect(licenceTypeDisplay).toHaveBeenCalledWith(permission, catalog)
+    })
+
+    it('return value of licenceTypeDisplay is used for licenceTypeStr', async () => {
+      const returnValue = Symbol('return value')
+      licenceTypeDisplay.mockReturnValueOnce(returnValue)
+      mockTransactionCacheGet.mockImplementationOnce(() => ({ isLicenceForYou: false }))
+
+      const result = await getData(mockRequest)
+      const ret = result.licenceTypeStr
+
+      expect(ret).toEqual(returnValue)
+    })
   })
 })