9751 Amend for content improvements for fandf (#1205)

* 9751 Amend for content improvements for fandf * 9751 Amend click on to select
hmrc · Dec 17, 2024 · 8a810e5 · 8a810e5
1 parent b632e8a
commit 8a810e5
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 104 deletions.
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/FandFTemplates.scala b/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/FandFTemplates.scala
@@ -27,13 +27,13 @@ object FandFTemplates {
     params
       .get("helpeeFirstName")
       .flatMap(fname => params.get("helpeeLastName").map(lname => s"$fname $lname "))
-      .getOrElse("Someone ") + "would like your help with tax online"
+      .getOrElse("Someone ") + "has asked you to be their trusted helper"
 
   private def offer_help_subject(params: Map[String, String]) =
     params
       .get("helperFirstName")
       .flatMap(fname => params.get("helperLastName").map(lname => s"$fname $lname "))
-      .getOrElse("Someone ") + "wants to help you with your tax online"
+      .getOrElse("Someone ") + "has offered to be your trusted helper"
 
   val templates = Seq(
     MessageTemplate.createWithDynamicSubject(

diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFAskHelpMessageAlert.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFAskHelpMessageAlert.scala.html
@@ -15,16 +15,19 @@
  *@
 
 @(params: Map[String, Any])
-@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Someone’s asked you to be their trusted helper") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Someone has asked you to be their trusted helper") {
 <p style="margin: 0 0 30px; font-size: 19px;">Dear @{params("helperFirstName")} @{params("helperLastName")}</p>
-<p style="margin: 0 0 30px; font-size: 19px;">@{params("helpeeFirstName")} @{params("helpeeLastName")} has asked you to be their trusted helper.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">A trusted helper is someone like a friend or family member, who can help with tax online.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">This request is available to accept online for 28 days.</p>
-<h2 id="how-to-accept" style="margin: 0 0 30px; font-size: 24px;">How to accept this request for help</h2>
-<p style="margin: 0 0 30px; font-size: 19px;">Visit the gov.uk website and search for ‘personal tax account’.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">You will need to sign in with your HMRC online services user ID and password to access your personal tax account.</p>
-<h3 id="no-goverment-gateway" style="margin: 0 0 30px; font-size: 20px;">If you do not have an HMRC online services, or personal tax account</h3>
-<p style="margin: 0 0 30px; font-size: 19px;">To set up your personal tax account, visit the gov.uk website and search for ‘personal tax account’.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">You can register for an HMRC online services account when you set up your personal tax account.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">@{params("helpeeFirstName")} @{params("helpeeLastName")} has asked you to help with their tax online.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">This is called being a ‘trusted helper’.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">You have 28 days to accept this request.</p>
+<h2 id="what-to-do-next" style="margin: 0 0 30px; font-size: 24px;">What to do next</h2>
+
+<ol>
+ <li style="margin: 0 0 30px; font-size: 19px;">To find out more, search for ‘trusted helper’ on GOV.UK.</li>
+ <li style="margin: 0 0 30px; font-size: 19px;">Select ‘Help friends or family with their tax’.</li>
+ <li style="margin: 0 0 30px; font-size: 19px;">Sign in to the trusted helper service if you want to accept this request.</li>
+</ol>
+
+<p style="margin: 0 0 30px; font-size: 19px;">If you do not already have sign in details, you’ll be able to create them.</p>
 <p style="margin: 0 0 30px; font-size: 19px;">From HMRC Trusted Helper</p>
 }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFAskHelpMessageAlert.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFAskHelpMessageAlert.scala.txt
@@ -1,24 +1,20 @@
-@(params: Map[String, Any])Someone’s asked you to be their trusted helper
+@(params: Map[String, Any])Someone has asked you to be their trusted helper
 
 Dear @{params("helperFirstName")} @{params("helperLastName")}
 
-@{params("helpeeFirstName")} @{params("helpeeLastName")} has asked you to be their trusted helper.
+@{params("helpeeFirstName")} @{params("helpeeLastName")} has asked you to help with their tax online.
 
-A trusted helper is someone like a friend or family member, who can help with tax online.
+This is called being a ‘trusted helper’.
 
-This request is available to accept online for 28 days.
+You have 28 days to accept this request.
 
-How to accept this request for help
+What to do next
 
-Visit the gov.uk website and search for ‘personal tax account’.
+To find out more, search for ‘trusted helper’ on GOV.UK.
+Select ‘Help friends or family with their tax’.
+Sign in to the trusted helper service if you want to accept this request.
 
-You will need to sign in with your HMRC online services user ID and password to access your personal tax account.
-
-If you do not have an HMRC online services, or personal tax account
-
-To set up your personal tax account, visit the gov.uk website and search for ‘personal tax account’.
-
-You can register for an HMRC online services account when you set up your personal tax account.
+If you do not already have sign in details, you’ll be able to create them.
 
 From HMRC Trusted Helper
 

diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFAskHelpMessageAlertCy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFAskHelpMessageAlertCy.scala.html
@@ -17,14 +17,17 @@
 @(params: Map[String, Any])
 @uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae rhywun wedi gofyn i chi fod yn gynorthwyydd dibynadwy iddynt") {
 <p style="margin: 0 0 30px; font-size: 19px;">Annwyl @{params("helperFirstName")} @{params("helperLastName")}</p>
-<p style="margin: 0 0 30px; font-size: 19px;">Mae @{params("helpeeFirstName")} @{params("helpeeLastName")} wedi gofyn i chi fod yn gynorthwyydd dibynadwy iddynt</p>
-<p style="margin: 0 0 30px; font-size: 19px;">Cynorthwyydd dibynadwy yw rhywun fel ffrind neu aelod o’r teulu a all helpu gyda threth ar-lein.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">Mae’r cais hwn ar gael i’w dderbyn ar-lein am 28 diwrnod.</p>
-<h2 id="how-to-accept" style="margin: 0 0 30px; font-size: 24px;">Sut i dderbyn y cais hwn am help</h2>
-<p style="margin: 0 0 30px; font-size: 19px;">Ewch i wefan gov.uk a chwilio am ‘personal tax account’. Ewch i’r dudalen briodol a dewiswch yr opsiwn Cymraeg.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">Bydd angen i chi mewngofnodi gan ddefnyddio’ch ID Defnyddiwr a’ch cyfrinair ar gyfer gwasanaethau ar-lein CThEF er mwyn cael mynediad at eich cyfrif treth personol.</p>
-<h3 id="no-goverment-gateway" style="margin: 0 0 30px; font-size: 20px;">Os nad oes gennych gyfrif gwasanaethau ar-lein CThEF neu gyfrif treth personol</h3>
-<p style="margin: 0 0 30px; font-size: 19px;">I greu eich cyfrif treth personol, ewch i wefan gov.uk a chwilio am ‘personal tax account’. Ewch i’r dudalen briodol a dewiswch yr opsiwn Cymraeg.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">Gallwch gofrestru ar gyfer cyfrif gwasanaethau ar-lein CThEF pan ydych yn creu’ch cyfrif treth personol.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae @{params("helpeeFirstName")} @{params("helpeeLastName")} wedi gofyn i chi am help gyda threth ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Gelwir hyn yn fod yn ‘gynorthwyydd dibynadwy’</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych 28 diwrnod i dderbyn y cais hwn.</p>
+<h2 id="what-to-do-next" style="margin: 0 0 30px; font-size: 24px;">Yr hyn i’w wneud nesaf</h2>
+
+<ol>
+ <li style="margin: 0 0 30px; font-size: 19px;">I gael rhagor o wybodaeth, chwiliwch am ‘trusted helper’ ar GOV.UK.</li>
+ <li style="margin: 0 0 30px; font-size: 19px;">Dewiswch ‘Help friends or family with their tax’ a dewiswch yr opsiwn Cymraeg.</li>
+ <li style="margin: 0 0 30px; font-size: 19px;">Mewngofnodwch i’r gwasanaeth ar gyfer cynorthwywyr dibynadwy os hoffech dderbyn y cais hwn.</li>
+</ol>
+
+<p style="margin: 0 0 30px; font-size: 19px;">Os nad oes gennych fanylion mewngofnodi eisoes, byddwch yn gallu eu creu.</p>
 <p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth Gynorthwyydd Dibynadwy CThEF</p>
 }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFAskHelpMessageAlertCy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFAskHelpMessageAlertCy.scala.txt
@@ -1,25 +1,15 @@
 @(params: Map[String, Any])Mae rhywun wedi gofyn i chi fod yn gynorthwyydd dibynadwy iddynt
 
 Annwyl @{params("helperFirstName")} @{params("helperLastName")}
+Mae @{params("helpeeFirstName")} @{params("helpeeFirstName")} wedi gofyn i chi am help gyda threth ar-lein.
+Gelwir hyn yn fod yn ‘gynorthwyydd dibynadwy’
+Mae gennych 28 diwrnod i dderbyn y cais hwn.
+Yr hyn i’w wneud nesaf
 
-Mae @{params("helpeeFirstName")} @{params("helpeeLastName")} wedi gofyn i chi fod yn gynorthwyydd dibynadwy iddynt
-
-Cynorthwyydd dibynadwy yw rhywun fel ffrind neu aelod o’r teulu a all helpu gyda threth ar-lein.
-
-Mae’r cais hwn ar gael i’w dderbyn ar-lein am 28 diwrnod.
-
-Sut i dderbyn y cais hwn am help
-
-Ewch i wefan gov.uk a chwilio am ‘personal tax account’. Ewch i’r dudalen briodol a dewiswch yr opsiwn Cymraeg
-
-Bydd angen i chi mewngofnodi gan ddefnyddio’ch ID Defnyddiwr a’ch cyfrinair ar gyfer gwasanaethau ar-lein CThEF er mwyn cael mynediad at eich cyfrif treth personol.
-
-Os nad oes gennych gyfrif gwasanaethau ar-lein CThEF neu gyfrif treth personol
-
-I greu eich cyfrif treth personol, ewch i wefan gov.uk a chwilio am ‘personal tax account’. Ewch i’r dudalen briodol a dewiswch yr opsiwn Cymraeg.
-
-Gallwch gofrestru ar gyfer cyfrif gwasanaethau ar-lein CThEF pan ydych yn creu’ch cyfrif treth personol.
+I gael rhagor o wybodaeth, chwiliwch am ‘trusted helper’ ar GOV.UK.
+Dewiswch ‘Help friends or family with their tax’ a dewiswch yr opsiwn Cymraeg.
+Mewngofnodwch i’r gwasanaeth ar gyfer cynorthwywyr dibynadwy os hoffech dderbyn y cais hwn.
 
+Os nad oes gennych fanylion mewngofnodi eisoes, byddwch yn gallu eu creu.
 Oddi wrth Gynorthwyydd Dibynadwy CThEF
-
 @{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer()}
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFOfferHelpMessageAlert.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFOfferHelpMessageAlert.scala.html
@@ -15,16 +15,19 @@
  *@
 
 @(params: Map[String, Any])
-@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Someone’s offered to be your Trusted Helper") {
+@uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Someone has offered to be your trusted helper") {
 <p style="margin: 0 0 30px; font-size: 19px;">Dear @{params("helpeeFirstName")} @{params("helpeeLastName")}</p>
-<p style="margin: 0 0 30px; font-size: 19px;">@{params("helperFirstName")} @{params("helperLastName")} has offered to be your trusted helper.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">A trusted helper is someone like a friend or family member, who can help with tax online.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">This request is available to accept online for 28 days.</p>
-<h2 id="how-to-accept" style="margin: 0 0 30px; font-size: 24px;">How to accept this offer of help</h2>
-<p style="margin: 0 0 30px; font-size: 19px;">Visit the gov.uk website and search for ‘personal tax account’.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">You will need to sign in with your HMRC online services user ID and password to access your personal tax account.</p>
-<h3 id="no-goverment-gateway" style="margin: 0 0 30px; font-size: 20px;">If you do not have an HMRC online services, or personal tax account</h3>
-<p style="margin: 0 0 30px; font-size: 19px;">To set up your personal tax account, visit the gov.uk website and search for ‘personal tax account’.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">You can register for an HMRC online services account when you set up your personal tax account.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">@{params("helperFirstName")} @{params("helperLastName")} has offered to help you with your tax online.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">This is called being a ‘trusted helper’.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">You have 28 days to accept this request.</p>
+<h2 id="what-to-do-next" style="margin: 0 0 30px; font-size: 24px;">What to do next</h2>
+
+<ol>
+ <li style="margin: 0 0 30px; font-size: 19px;">To find out more, search for ‘trusted helper’ on GOV.UK.</li>
+ <li style="margin: 0 0 30px; font-size: 19px;">Select ‘Help friends or family with their tax’.</li>
+ <li style="margin: 0 0 30px; font-size: 19px;">Sign in to the trusted helper service if you want to accept this request.</li>
+</ol>
+
+<p style="margin: 0 0 30px; font-size: 19px;">If you do not already have sign in details, you’ll be able to create them.</p>
 <p style="margin: 0 0 30px; font-size: 19px;">From HMRC Trusted Helper</p>
 }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFOfferHelpMessageAlert.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFOfferHelpMessageAlert.scala.txt
@@ -1,24 +1,20 @@
-@(params: Map[String, Any])Someone’s offered to become your Trusted Helper
+@(params: Map[String, Any])Someone has offered to be your trusted helper
 
 Dear @{params("helpeeFirstName")} @{params("helpeeLastName")}
 
-@{params("helperFirstName")} @{params("helperLastName")} has offered to be your trusted helper
+@{params("helperFirstName")} @{params("helperLastName")} has offered to help you with your tax online.
 
-A trusted helper is someone like a friend or family member, who can help with tax online.
+This is called being a ‘trusted helper’.
 
-This request is available to accept online for 28 days.
+You have 28 days to accept this request.
 
-How to accept this offer of help
+What to do next
 
-Visit the gov.uk website and search for ‘personal tax account’.
+To find out more, search for ‘trusted helper’ on GOV.UK.
+Select ‘Help friends or family with their tax’.
+Sign in to the trusted helper service if you want to accept this request.
 
-You will need to sign in with your HMRC online services user ID and password to access your personal tax account.
-
-If you do not have an HMRC online services, or personal tax account
-
-To set up your personal tax account, visit the gov.uk website and search for ‘personal tax account’.
-
-You can register for an HMRC online services account when you set up your personal tax account.
+If you do not already have sign in details, you’ll be able to create them.
 
 From HMRC Trusted Helper
 

diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFOfferHelpMessageAlertCy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFOfferHelpMessageAlertCy.scala.html
@@ -17,14 +17,17 @@
 @(params: Map[String, Any])
 @uk.gov.hmrc.hmrcemailrenderer.templates.helpers.html.template_main(params, "Mae rhywun wedi cynnig bod yn gynorthwyydd dibynadwy i chi") {
 <p style="margin: 0 0 30px; font-size: 19px;">Annwyl @{params("helpeeFirstName")} @{params("helpeeLastName")}</p>
-<p style="margin: 0 0 30px; font-size: 19px;">Mae @{params("helperFirstName")} @{params("helperLastName")} wedi cynnig bod yn gynorthwyydd dibynadwy i chi.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">Cynorthwyydd dibynadwy yw rhywun fel ffrind neu aelod o’r teulu a all helpu gyda threth ar-lein.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">Mae’r cais hwn ar gael i’w dderbyn ar-lein am 28 diwrnod.</p>
-<h2 id="how-to-accept" style="margin: 0 0 30px; font-size: 24px;">Sut i dderbyn y cynnig hwn o help</h2>
-<p style="margin: 0 0 30px; font-size: 19px;">Ewch i wefan gov.uk a chwilio am ‘personal tax account’. Ewch i’r dudalen briodol a dewiswch yr opsiwn Cymraeg.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">Bydd angen i chi mewngofnodi gan ddefnyddio’ch ID Defnyddiwr a’ch cyfrinair ar gyfer gwasanaethau ar-lein CThEF er mwyn cael mynediad at eich cyfrif treth personol.</p>
-<h3 id="no-goverment-gateway" style="margin: 0 0 30px; font-size: 20px;">Os nad oes gennych gyfrif gwasanaethau ar-lein CThEF neu gyfrif treth personol</h3>
-<p style="margin: 0 0 30px; font-size: 19px;">I greu eich cyfrif treth personol, ewch i wefan gov.uk a chwilio am ‘personal tax account’. Ewch i’r dudalen briodol a dewiswch yr opsiwn Cymraeg.</p>
-<p style="margin: 0 0 30px; font-size: 19px;">Gallwch gofrestru ar gyfer cyfrif gwasanaethau ar-lein CThEF pan ydych yn creu’ch cyfrif treth personol.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae @{params("helperFirstName")} @{params("helperLastName")} wedi cynnig eich helpu chi gyda’ch treth ar-lein.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Gelwir hyn yn fod yn ‘gynorthwyydd dibynadwy’</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Mae gennych 28 diwrnod i dderbyn y cais hwn.</p>
+<h2 id="what-to-do-next" style="margin: 0 0 30px; font-size: 24px;">Yr hyn i’w wneud nesaf</h2>
+
+<ol>
+ <li style="margin: 0 0 30px; font-size: 19px;">I gael rhagor o wybodaeth, chwiliwch am ‘trusted helper’ ar GOV.UK.</li>
+ <li style="margin: 0 0 30px; font-size: 19px;">Dewiswch ‘Help friends or family with their tax’ a dewiswch yr opsiwn Cymraeg.</li>
+ <li style="margin: 0 0 30px; font-size: 19px;">Mewngofnodwch i’r gwasanaeth ar gyfer cynorthwywyr dibynadwy os hoffech dderbyn y cais hwn.</li>
+</ol>
+
+<p style="margin: 0 0 30px; font-size: 19px;">Os nad oes gennych fanylion mewngofnodi eisoes, byddwch yn gallu eu creu.</p>
 <p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth Gynorthwyydd Dibynadwy CThEF</p>
 }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFOfferHelpMessageAlertCy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/fandf/newFandFOfferHelpMessageAlertCy.scala.txt
@@ -1,26 +1,15 @@
 @(params: Map[String, Any])Mae rhywun wedi cynnig bod yn gynorthwyydd dibynadwy i chi
 
-Annwyl @{params("helpeeFirstName")} @{params("helpeeLastName")}
+Annwyl @{params("helperFirstName")} @{params("helperLastName")}
+Mae @{params("helpeeFirstName")} @{params("helpeeFirstName")} wedi gofyn i chi am help gyda threth ar-lein.
+Gelwir hyn yn fod yn ‘gynorthwyydd dibynadwy’
+Mae gennych 28 diwrnod i dderbyn y cais hwn.
+Yr hyn i’w wneud nesaf
 
-Mae @{params("helperFirstName")} @{params("helperLastName")} wedi cynnig bod yn gynorthwyydd dibynadwy i chi.
-
-Cynorthwyydd dibynadwy yw rhywun fel ffrind neu aelod o’r teulu a all helpu gyda threth ar-lein.
-
-Mae’r cais hwn ar gael i’w dderbyn ar-lein am 28 diwrnod.
-
-Sut i dderbyn y cynnig hwn o help
-
-Ewch i wefan gov.uk a chwilio am ‘personal tax account’. Ewch i’r dudalen briodol a dewiswch yr opsiwn Cymraeg.
-
-Bydd angen i chi mewngofnodi gan ddefnyddio’ch ID Defnyddiwr a’ch cyfrinair ar gyfer gwasanaethau ar-lein CThEF er mwyn cael mynediad at eich cyfrif treth personol.
-
-Os nad oes gennych gyfrif gwasanaethau ar-lein CThEF neu gyfrif treth personol
-
-I greu eich cyfrif treth personol, ewch i wefan gov.uk a chwilio am ‘personal tax account’. Ewch i’r dudalen briodol a dewiswch yr opsiwn Cymraeg.
-
-Gallwch gofrestru ar gyfer cyfrif gwasanaethau ar-lein CThEF pan ydych yn creu’ch cyfrif treth personol.
+I gael rhagor o wybodaeth, chwiliwch am ‘trusted helper’ ar GOV.UK.
+Dewiswch ‘Help friends or family with their tax’ a dewiswch yr opsiwn Cymraeg.
+Mewngofnodwch i’r gwasanaeth ar gyfer cynorthwywyr dibynadwy os hoffech dderbyn y cais hwn.
 
+Os nad oes gennych fanylion mewngofnodi eisoes, byddwch yn gallu eu creu.
 Oddi wrth Gynorthwyydd Dibynadwy CThEF
-
-
 @{uk.gov.hmrc.hmrcemailrenderer.templates.helpers.txt.template_footer()}