Simplify message variables

paulrobertlloyd · paulrobertlloyd · commit 349738590bdc · 2026-03-09T23:14:03.000Z
diff --git a/app/emails/consent/_contact-details.njk b/app/emails/consent/_contact-details.njk
@@ -1,3 +1,3 @@
-{{ data.team.name }}<br>
-{{ data.team.email }}<br>
-{{ data.team.tel }}
+{{ team.name }}<br>
+{{ team.email }}<br>
+{{ team.tel }}
diff --git a/app/emails/consent/_get-in-touch.njk b/app/emails/consent/_get-in-touch.njk
@@ -1,3 +1,3 @@
 ## Get in touch with us
 
-Speak to a member of our team by calling {{ data.team.tel }}, or email {{ data.team.email }}.
+Speak to a member of our team by calling {{ team.tel }}, or email {{ team.email }}.
diff --git a/app/emails/consent/_your-data.njk b/app/emails/consent/_your-data.njk
@@ -1,3 +1,3 @@
 ## Your data
 
-By responding, you’re agreeing to your data being processed as set out in our [privacy notice]({{ data.team.privacyPolicyUrl }}).
+By responding, you’re agreeing to your data being processed as set out in our [privacy notice]({{ team.privacyPolicyUrl }}).
diff --git a/app/emails/consent/consent-already-vaccinated.njk b/app/emails/consent/consent-already-vaccinated.njk
@@ -1,7 +1,7 @@
-You’ve told us that {{ consent.child.firstName }} has had both doses of the MMR vaccine.
+You’ve told us that {{ child.firstName }} has had both doses of the MMR vaccine.
 
 We’ll update our records so you no longer get consent requests for MMR catch-up vaccinations.
 
-If you did not mean to send this response, or you think that {{ consent.child.firstName }} is not fully vaccinated against MMR, contact our team using the details below.
+If you did not mean to send this response, or you think that {{ child.firstName }} is not fully vaccinated against MMR, contact our team using the details below.
 
 {% include "emails/consent/_contact-details.njk" %}
diff --git a/app/emails/consent/consent-given-changed-school.njk b/app/emails/consent/consent-given-changed-school.njk
@@ -1,8 +1,8 @@
-You’ve given consent for {{ consent.child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }}.
+You’ve given consent for {{ child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }}.
 
 We don’t currently have any sessions scheduled at your child’s school, but this might change. We’ll contact you again to let you know if we’re returning to the school. If we’re not, we’ll give you a chance to book into a community clinic.
 
-If {{ consent.child.firstName }}’s health changes in the meantime, or you arrange for them to be vaccinated elsewhere, tell us using the contact details below.
+If {{ child.firstName }}’s health changes in the meantime, or you arrange for them to be vaccinated elsewhere, tell us using the contact details below.
 
 If you want to withdraw your consent, please phone us.
 
diff --git a/app/emails/consent/consent-given.njk b/app/emails/consent/consent-given.njk
@@ -1,8 +1,8 @@
-You’ve given consent for {{ consent.child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }}.
+You’ve given consent for {{ child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }}.
 
 Please let them know what to expect. We’ll send you confirmation once your child has been vaccinated.
 
-If {{ consent.child.firstName }}’s health changes, or you arrange for them to be vaccinated elsewhere, let our team know using the details below. You should also tell us if your child receives any other vaccinations before the session.
+If {{ child.firstName }}’s health changes, or you arrange for them to be vaccinated elsewhere, let our team know using the details below. You should also tell us if your child receives any other vaccinations before the session.
 
 If you want to withdraw your consent, please phone us.
 
diff --git a/app/emails/consent/consent-needs-triage.njk b/app/emails/consent/consent-needs-triage.njk
@@ -1,6 +1,6 @@
-You’ve given consent for {{ consent.child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }}.
+You’ve given consent for {{ child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }}.
 
-As you answered ‘yes’ to one or more of the health questions, we need to review your answers so we can decide what’s best for {{ consent.child.firstName }}. We’ll let you know once we’ve done this.
+As you answered ‘yes’ to one or more of the health questions, we need to review your answers so we can decide what’s best for {{ child.firstName }}. We’ll let you know once we’ve done this.
 
 If you want to withdraw your consent in the meantime, please phone us.
 
diff --git a/app/emails/consent/consent-refused.njk b/app/emails/consent/consent-refused.njk
@@ -1,4 +1,4 @@
-You have told us you do not want {{ consent.child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }}.
+You have told us you do not want {{ child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }}.
 
 If you change your mind, please contact us.
 
diff --git a/app/emails/consent/consent-unknown-contact.njk b/app/emails/consent/consent-unknown-contact.njk
@@ -1,9 +1,9 @@
-We have received a response to our request for consent for {{ consent.child.firstName }} to have their {{ session.vaccinationNames.sentenceCase }}.
+We have received a response to our request for consent for {{ child.firstName }} to have their {{ session.vaccinationNames.sentenceCase }}.
 
 > We’re contacting you because the contact details in the response are different from those we have in our records.
 
-If you think the response was sent by someone without parental responsibility, please contact us immediately on {{ data.team.tel }} or {{ data.team.email }}.
+If you think the response was sent by someone without parental responsibility, please contact us immediately on {{ team.tel }} or {{ team.email }}.
 
 If the response came from you or someone you trust, you do not need to do anything.
 
-{{ data.team.name }}
+{{ team.name }}
diff --git a/app/emails/consent/information-child.njk b/app/emails/consent/information-child.njk
@@ -47,4 +47,4 @@ Have a read of the leaflet about HPV that comes with this email to find out more
 
 ## You can talk to your local health team
 
-If you want to speak to someone from your local health team, you can call {{ data.team.tel }}. You can also email {{ data.team.email }}.
+If you want to speak to someone from your local health team, you can call {{ team.tel }}. You can also email {{ team.email }}.
diff --git a/app/emails/consent/invite-catch-up.njk b/app/emails/consent/invite-catch-up.njk
@@ -12,7 +12,7 @@ Our records show your child has not had their HPV vaccination. Pupils usually ha
 [Learn more about the {{ programme.vaccineName.sentenceCase }} on GOV.UK]({{ programme.guidance.url }}) ({{ programme.guidance.hint }})
 {% endfor %}
 
-{% if consent.child.school.phase == SchoolPhase.Secondary %}
+{% if child.school.phase == SchoolPhase.Secondary %}
 {% include "emails/consent/_talk-to-your-child.njk" %}
 {% endif %}
 
diff --git a/app/emails/consent/invite-clinic-consent.njk b/app/emails/consent/invite-clinic-consent.njk
@@ -1,6 +1,6 @@
-You recently booked {{ consent.child.fullAndPreferredNames }} into a clinic so they can get their {{ session.vaccinationNames.sentenceCase }}.
+You recently booked {{ child.fullAndPreferredNames }} into a clinic so they can get their {{ session.vaccinationNames.sentenceCase }}.
 
-Please give consent for {{ consent.child.firstName }} to be vaccinated ahead of your clinic appointment.
+Please give consent for {{ child.firstName }} to be vaccinated ahead of your clinic appointment.
 
 [Give consent for the {{ session.vaccinationNames.sentenceCase }}]({{ session.consentUrl }}/start)
 
diff --git a/app/emails/consent/invite-clinic-reminder.njk b/app/emails/consent/invite-clinic-reminder.njk
@@ -1,4 +1,4 @@
-It’s not too late for {{ consent.child.fullAndPreferredNames }} to get their {{ session.vaccinationNames.sentenceCase }} at a community clinic.
+It’s not too late for {{ child.fullAndPreferredNames }} to get their {{ session.vaccinationNames.sentenceCase }} at a community clinic.
 
 If you’d like to book a clinic appointment, please contact us using the details below.
 
diff --git a/app/emails/consent/invite-clinic.njk b/app/emails/consent/invite-clinic.njk
@@ -1,4 +1,4 @@
-Our records show that {{ consent.child.fullAndPreferredNames }} has not had their {{ session.vaccinationNames.sentenceCase }} yet.
+Our records show that {{ child.fullAndPreferredNames }} has not had their {{ session.vaccinationNames.sentenceCase }} yet.
 
 They can have this vaccination at a community clinic. If you’d like to book a clinic appointment, please contact us using the details below.
 
diff --git a/app/emails/consent/invite-reminder.njk b/app/emails/consent/invite-reminder.njk
@@ -16,7 +16,7 @@ If you’ve already responded to the consent request, you can ignore this messag
 {% include "emails/consent/_about-the-nasal-spray.njk" %}
 {% endif %}
 
-{% if consent.child.school.phase == SchoolPhase.Secondary %}
+{% if child.school.phase == SchoolPhase.Secondary %}
 {% include "emails/consent/_talk-to-your-child.njk" %}
 {% endif %}
 
diff --git a/app/emails/consent/invite-subsequent-reminder.njk b/app/emails/consent/invite-subsequent-reminder.njk
@@ -8,13 +8,13 @@ If you want your child to be vaccinated in school, you need to give your consent
 {{ programme.information.description }}
 
 [Find out more about the {{ programme.vaccineName.sentenceCase }} on NHS.UK]({{ programme.information.url }})
-{% endfor %}
 
 {% if programme.type == ProgrammeType.Flu %}
 {% include "emails/consent/_about-the-nasal-spray.njk" %}
 {% endif %}
+{% endfor %}
 
-{% if consent.child.school.phase == SchoolPhase.Secondary %}
+{% if child.school.phase == SchoolPhase.Secondary %}
 {% include "emails/consent/_talk-to-your-child.njk" %}
 {% endif %}
 
diff --git a/app/emails/consent/invite.njk b/app/emails/consent/invite.njk
@@ -12,7 +12,7 @@ We’re coming to {{ session.location.name }} on {{ session.formatted.nextDate }
 {%- endfor %}
 {% endif %}
 
-We would like your consent to vaccinate {{ consent.child.firstName }}. You can give this by filling in our online form.
+We would like your consent to vaccinate {{ child.firstName }}. You can give this by filling in our online form.
 
 > Do not reply to this email to tell us your decision. The link to the online consent form is below.
 
@@ -32,11 +32,11 @@ We cannot say on which of the above dates your child will have the vaccination b
 [Find out more about the {{ programme.vaccineName.sentenceCase }} on NHS.UK]({{ programme.information.url }})
 
 You can also find a range of [information about the {{ programme.vaccineName.sentenceCase }} on GOV.UK]({{ programme.guidance.url }}) {{ programme.guidance.hint }}.
-{% endfor %}
 
 {% if programme.type == ProgrammeType.Flu %}
 {% include "emails/consent/_about-the-nasal-spray.njk" %}
 {% endif %}
+{% endfor %}
 
 {% include "emails/consent/_talk-to-your-child.njk" %}
 
diff --git a/app/emails/consent/triage-delay-vaccination.njk b/app/emails/consent/triage-delay-vaccination.njk
@@ -1,9 +1,9 @@
-Thank you for giving your consent for {{ consent.child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }}.
+Thank you for giving your consent for {{ child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }}.
 
-Having looked at the answers you gave to the health questions, our nursing team has decided it would be better for {{ consent.child.firstName }} to be vaccinated at a later date.
+Having looked at the answers you gave to the health questions, our nursing team has decided it would be better for {{ child.firstName }} to be vaccinated at a later date.
 
 We’ll contact you again once we have another vaccination date.
 
-If {{ consent.child.firstName }}’s health changes, or you arrange for them to be vaccinated somewhere else, please tell us.
+If {{ child.firstName }}’s health changes, or you arrange for them to be vaccinated somewhere else, please tell us.
 
-You can email {{ data.team.email }} or phone {{ data.team.tel }}.
+You can email {{ team.email }} or phone {{ team.tel }}.
diff --git a/app/emails/consent/triage-do-not-vaccinate.njk b/app/emails/consent/triage-do-not-vaccinate.njk
@@ -1,7 +1,7 @@
-Thank you for responding to our earlier email asking for consent to give {{ consent.child.fullAndPreferredNames }} their {{ session.vaccinationNames.sentenceCase }} in school.
+Thank you for responding to our earlier email asking for consent to give {{ child.fullAndPreferredNames }} their {{ session.vaccinationNames.sentenceCase }} in school.
 
-Having looked at the answers you gave to the health questions about {{ consent.child.firstName }}, our nursing team has decided that {{ consent.child.firstName }} cannot have the {{ session.vaccinationNames.sentenceCase }} on {{ session.formatted.nextDate }}.
+Having looked at the answers you gave to the health questions about {{ child.firstName }}, our nursing team has decided that {{ child.firstName }} cannot have the {{ session.vaccinationNames.sentenceCase }} on {{ session.formatted.nextDate }}.
 
-Please get in touch with our team to discuss what {{ consent.child.firstName }} might be able to have instead. You can call {{ data.team.tel }}, or email {{ data.team.email }}.
+Please get in touch with our team to discuss what {{ child.firstName }} might be able to have instead. You can call {{ team.tel }}, or email {{ team.email }}.
 
 The child health team
diff --git a/app/emails/consent/triage-invite-to-clinic.njk b/app/emails/consent/triage-invite-to-clinic.njk
@@ -1,6 +1,6 @@
-Thank you for giving your consent for {{ consent.child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }}.
+Thank you for giving your consent for {{ child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }}.
 
-Having looked at the answers you gave to the health questions about {{ consent.child.firstName }}, our nursing team has decided it would be better for {{ consent.child.firstName }} to be vaccinated in a clinic rather than at school.
+Having looked at the answers you gave to the health questions about {{ child.firstName }}, our nursing team has decided it would be better for {{ child.firstName }} to be vaccinated in a clinic rather than at school.
 
 To book an appointment, please contact us using the details below.
 
diff --git a/app/emails/consent/triage-vaccinate-second-dose.njk b/app/emails/consent/triage-vaccinate-second-dose.njk
@@ -1,5 +1,5 @@
-We recently gave {{ consent.child.firstName }} their 1st dose of the MMR vaccination. To be fully vaccinated, they need 2 doses.
+We recently gave {{ child.firstName }} their 1st dose of the MMR vaccination. To be fully vaccinated, they need 2 doses.
 
-We’re coming to {{ session.location.name }} on {{ session.formatted.nextDate }} and plan to give {{ consent.child.firstName }} their 2nd dose then. Please let them know about this.
+We’re coming to {{ session.location.name }} on {{ session.formatted.nextDate }} and plan to give {{ child.firstName }} their 2nd dose then. Please let them know about this.
 
-If {{ consent.child.firstName }}’s health changes, or you arrange for them to get their 2nd dose somewhere else, contact us. You can email {{ data.team.email }} or phone {{ data.team.tel }}.
+If {{ child.firstName }}’s health changes, or you arrange for them to get their 2nd dose somewhere else, contact us. You can email {{ team.email }} or phone {{ team.tel }}.
diff --git a/app/emails/consent/triage-vaccinate.njk b/app/emails/consent/triage-vaccinate.njk
@@ -1,11 +1,11 @@
-Thank you for giving your consent for {{ consent.child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }}.
+Thank you for giving your consent for {{ child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }}.
 
-Our nursing team has reviewed the answers you gave to the health questions about {{ consent.child.firstName }} and confirmed it’s safe for {{ consent.child.firstName }} to have the {{ session.vaccinationNames.sentenceCase }}.
+Our nursing team has reviewed the answers you gave to the health questions about {{ child.firstName }} and confirmed it’s safe for {{ child.firstName }} to have the {{ session.vaccinationNames.sentenceCase }}.
 
-This will take place at {{ session.location.name }} on {{ session.formatted.nextDate }}. Please tell {{ consent.child.firstName }} that they’ll be vaccinated then.
+This will take place at {{ session.location.name }} on {{ session.formatted.nextDate }}. Please tell {{ child.firstName }} that they’ll be vaccinated then.
 
-We’ll let you know once {{ consent.child.firstName }} is vaccinated.
+We’ll let you know once {{ child.firstName }} is vaccinated.
 
-If {{ consent.child.firstName }}’s health changes, or you arrange for them to be vaccinated elsewhere, please let us know.
+If {{ child.firstName }}’s health changes, or you arrange for them to be vaccinated elsewhere, please let us know.
 
-You can email {{ data.team.email }} or call {{ data.team.tel }}.
+You can email {{ team.email }} or call {{ team.tel }}.
diff --git a/app/emails/consent/vaccination-already-had.njk b/app/emails/consent/vaccination-already-had.njk
@@ -1,7 +1,7 @@
-We’re contacting you because our records show that {{ consent.child.firstName }} was vaccinated at another location today so we’re cancelling their vaccination appointment at school.
+We’re contacting you because our records show that {{ child.firstName }} was vaccinated at another location today so we’re cancelling their vaccination appointment at school.
 
-If you think this is wrong, please tell us immediately on {{ data.team.tel }} or {{ data.team.email }}.
+If you think this is wrong, please tell us immediately on {{ team.tel }} or {{ team.email }}.
 
-If {{ consent.child.firstName }} was vaccinated today, you do not need to do anything.
+If {{ child.firstName }} was vaccinated today, you do not need to do anything.
 
-{{ data.team.name }}
+{{ team.name }}
diff --git a/app/emails/consent/vaccination-given-many.njk b/app/emails/consent/vaccination-given-many.njk
@@ -1,6 +1,6 @@
-{{ consent.child.fullAndPreferredNames }} had their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }} today.{% if consent.child.school.phase == SchoolPhase.Primary %} They were very brave.{% endif %}
+{{ child.fullAndPreferredNames }} had their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }} today.{% if child.school.phase == SchoolPhase.Primary %} They were very brave.{% endif %}
 
-We suggest you record the following details {% if consent.child.school.phase == SchoolPhase.Primary %}in their red book (also known as their personal child health record){% else %}somewhere{% endif %}:
+We suggest you record the following details {% if child.school.phase == SchoolPhase.Primary %}in their red book (also known as their personal child health record){% else %}somewhere{% endif %}:
 
 {% for programme in session.programmes %}
 > Vaccination: {{ programme.name }}<br>
diff --git a/app/emails/consent/vaccination-given.njk b/app/emails/consent/vaccination-given.njk
@@ -1,6 +1,6 @@
-{{ consent.child.fullAndPreferredNames }} had their {{ programme.name }} vaccination at {{ session.location.name }} today.{% if consent.child.school.phase == SchoolPhase.Primary %} They were very brave.{% endif %}
+{{ child.fullAndPreferredNames }} had their {{ programme.name }} vaccination at {{ session.location.name }} today.{% if child.school.phase == SchoolPhase.Primary %} They were very brave.{% endif %}
 
-We suggest you record the following details {% if consent.child.school.phase == SchoolPhase.Primary %}in their red book (also known as their personal child health record){% else %}somewhere{% endif %}:
+We suggest you record the following details {% if child.school.phase == SchoolPhase.Primary %}in their red book (also known as their personal child health record){% else %}somewhere{% endif %}:
 
 > Vaccination: {{ programme.name }}<br>
 > Vaccine: {{ programme.vaccines[0].brand }}<br>
diff --git a/app/emails/consent/vaccination-not-administered.njk b/app/emails/consent/vaccination-not-administered.njk
@@ -1,4 +1,4 @@
-{{ consent.child.fullAndPreferredNames }} did not have their {{ session.vaccinationNames.sentenceCase }} at school today. This was because they were absent from the session.
+{{ child.fullAndPreferredNames }} did not have their {{ session.vaccinationNames.sentenceCase }} at school today. This was because they were absent from the session.
 
 If you’d still like your child to be vaccinated, you can book an appointment at a catch-up clinic by contacting our team.
 
diff --git a/app/emails/consent/vaccination-reminder.njk b/app/emails/consent/vaccination-reminder.njk
@@ -1,8 +1,8 @@
-This is a quick reminder that {{ consent.child.fullAndPreferredNames }} may get their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }} on {{ session.formatted.nextDate }}.
+This is a quick reminder that {{ child.fullAndPreferredNames }} may get their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }} on {{ session.formatted.nextDate }}.
 
-If you haven’t already told {{ consent.child.firstName }} that they’ll be vaccinated, please let them know what to expect.
+If you haven’t already told {{ child.firstName }} that they’ll be vaccinated, please let them know what to expect.
 
-If {{ consent.child.firstName }}’s health changes, or you arrange for them to be vaccinated elsewhere, please contact us. You should also contact us to ask about alternative sessions if {{ consent.child.firstName }} is absent or unwell on the day of the vaccination session. You can email {{ data.team.email }} or phone {{ data.team.tel }}.
+If {{ child.firstName }}’s health changes, or you arrange for them to be vaccinated elsewhere, please contact us. You should also contact us to ask about alternative sessions if {{ child.firstName }} is absent or unwell on the day of the vaccination session. You can email {{ team.email }} or phone {{ team.tel }}.
 
 ## Helping the session run smoothly
 
@@ -12,7 +12,7 @@ It’s also helpful for them to have breakfast, as this reduces the likelihood o
 
 ## Possible side effects
 
-{{ consent.child.firstName }} might have some of the following side effects after their vaccination:
+{{ child.firstName }} might have some of the following side effects after their vaccination:
 
 {{ sideEffects | safe }}
 
diff --git a/app/locales/en.js b/app/locales/en.js
diff --git a/app/views/parent/emails.njk b/app/views/parent/emails.njk
diff --git a/app/views/parent/texts.njk b/app/views/parent/texts.njk

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`## Get in touch with us`
`2`	`2`
`3`		`-Speak to a member of our team by calling {{ data.team.tel }}, or email {{ data.team.email }}.`
	`3`	`+Speak to a member of our team by calling {{ team.tel }}, or email {{ team.email }}.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`## Your data`
`2`	`2`
`3`		`-By responding, you’re agreeing to your data being processed as set out in our [privacy notice]({{ data.team.privacyPolicyUrl }}).`
	`3`	`+By responding, you’re agreeing to your data being processed as set out in our [privacy notice]({{ team.privacyPolicyUrl }}).`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-You have told us you do not want {{ consent.child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }}.`
	`1`	`+You have told us you do not want {{ child.fullAndPreferredNames }} to have their {{ session.vaccinationNames.sentenceCase }} at {{ session.location.name }}.`
`2`	`2`
`3`	`3`	`If you change your mind, please contact us.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,4 @@ Have a read of the leaflet about HPV that comes with this email to find out more`
`47`	`47`
`48`	`48`	`## You can talk to your local health team`
`49`	`49`
`50`		`-If you want to speak to someone from your local health team, you can call {{ data.team.tel }}. You can also email {{ data.team.email }}.`
	`50`	`+If you want to speak to someone from your local health team, you can call {{ team.tel }}. You can also email {{ team.email }}.`