Merge pull request #1514 from ministryofjustice/MLPAB-2468-vouching-a…

…mends

MLPAB-2468 Amend vouching content

lang/cy.json

@@ -336,6 +336,7 @@
     "iNameConfirmThat": "Rwyf i, {{ .DonorFullName }}, yn cadarnhau:",
     "wantToApply": "Fy mod eisiau gwneud cais i gofrestru’r LPA hon",
     "howTickingActsAsSignature": "Sut mae ticio’r blychau yn gweithredu fel eich llofnod cyfreithiol",
+    "howTickingActsAsSignatureDeclaration": "Welsh",
     "howTickingActsAsSignatureContent": "<p class=\"govuk-body\">Mae llofnodion electronig yn cael eu cydnabod mewn cyfraith yng Nghymru a Lloegr. Maent yn ei gwneud yn haws i chi lofnodi dogfennau ar-lein.</p><p class=\"govuk-body\">Drwy roi tic yn y ddau flwch a dewis ‘Cyflwyno fy llofnod’, rydych yn darparu eich llofnod cyfreithiol. Mae hyn yr un mor ddiogel a rhwymol mewn cyfraith â llofnodi’ch LPA â llaw.</p>",
     "howTickingActsAsSignatureDeclarationContent": "<p class=\"govuk-body\">Welsh</p>",
     "submitMySignature": "Cyflwyno fy llofnod",
@@ -1332,7 +1333,7 @@
     "yesIfAllowedToVouch": "Welsh",
     "verifyDonorDetails": "Welsh",
     "verifyPersonDetails": "Welsh {{.DonorFullNamePossessive}}",
-    "verifyPersonDetailsContent": "<p class=\"govuk-body\">Welsh {{.DonorFirstName}} {{.DonorFullNamePossessive}}</p>",
+    "verifyPersonDetailsContent": "<p class=\"govuk-body\">Welsh {{.DonorFirstNames}} {{.DonorFullNamePossessive}}</p>",
     "doTheseDetailsMatchDonorIdentity": "Welsh {{.DonorFullNamePossessive}}",
     "theseDetailsMustMatchThePersonWhoAskedYouToVouch": "Welsh",
     "yesIfTheseDetailsMatch": "Welsh",
@@ -1347,7 +1348,7 @@
     "voucherConfirmYourIdentityContent": "<p class=\"govuk-body\">Welsh {{.DonorFullName}}</p>",
     "voucherUnableToConfirmIdentityContent": "<p class=\"govuk-body\">Welsh {{.DonorFullName}} {{.DonorFirstNames}}</p>",
     "yourDeclaration": "Welsh",
-    "yourDeclarationContent": "<p class=\"govuk-body govuk-!-font-weight-bold\">Welsh {{.DonorFullNamePossessive}} {{.DonorFirstNames}} {{.DonorFirstNamesPossessive}}</p>",
+    "yourDeclarationContent": "<p class=\"govuk-body govuk-!-font-weight-bold\">Welsh {{.DonorFullNamePossessive}} {{.DonorFirstNames}} {{.DonorFirstNamesPossessive}} {{.DonorFirstNames}}</p>",
     "youMustSelectTheBoxToVouch": "Welsh",
     "iAmVouchingThat": "Welsh {{.VoucherFullName}}",
     "toTheBestOfMyKnowledgeDeclaration": "Welsh {{.DonorFullName}}",

lang/en.json

@@ -290,8 +290,9 @@
     "iNameConfirmThat": "I, {{ .DonorFullName }}, confirm that:",
     "wantToApply": "I want to apply to register this LPA",
     "howTickingActsAsSignature": "How ticking the boxes acts as your legal signature",
+    "howTickingActsAsSignatureDeclaration": "How ticking the box acts as your legal signature",
     "howTickingActsAsSignatureContent": "<p class=\"govuk-body\">Electronic signatures are legally recognised in England and Wales. They make it easier for you to sign documents online.</p><p class=\"govuk-body\">By ticking both boxes and selecting ‘Submit my signature’, you are providing your legal signature. This is just as safe and legally binding as signing your LPA by hand.</p>",
-    "howTickingActsAsSignatureDeclarationContent": "<p class=\"govuk-body\">Electronic signatures are legally recognised in England and Wales. They make it easier for you to sign documents online.</p><p class=\"govuk-body\">By ticking both boxes and selecting ‘Submit my signature’, you are providing your legal signature. This is just as safe and legally binding as signing your declaration by hand.</p>",
+    "howTickingActsAsSignatureDeclarationContent": "<p class=\"govuk-body\">Electronic signatures are legally recognised in England and Wales. They make it easier for you to sign documents online.</p><p class=\"govuk-body\">By ticking the box and selecting ‘Submit my signature’, you are providing your legal signature. This is just as safe and legally binding as signing your declaration by hand.</p>",
     "submitMySignature": "Submit my signature",
     "bothBoxesToSignAndApply": "both boxes to sign and apply to register your LPA",
     "iWantToSignThisLpa": "I want to sign this LPA as a deed",
@@ -1261,7 +1262,7 @@
     "yesIfAllowedToVouch": "yes if allowed to vouch",
     "verifyDonorDetails": "Verify donor’s details",
     "verifyPersonDetails": "Verify {{.DonorFullNamePossessive}} details",
-    "verifyPersonDetailsContent": "<p class=\"govuk-body\">These are the details {{.DonorFirstName}} has provided for you to verify their identity.</p><p class=\"govuk-body\">You must check that these details match {{.DonorFullNamePossessive}} identity before you vouch for them.</p>",
+    "verifyPersonDetailsContent": "<p class=\"govuk-body\">These are the details {{.DonorFirstNames}} has provided for you to verify their identity.</p><p class=\"govuk-body\">You must check that these details match {{.DonorFullNamePossessive}} identity before you vouch for them.</p>",
     "doTheseDetailsMatchDonorIdentity": "Do these details match {{.DonorFullNamePossessive}} identity?",
     "theseDetailsMustMatchThePersonWhoAskedYouToVouch": "These details must match the person who asked you to vouch for them. You cannot return to this page once you continue.",
     "yesIfTheseDetailsMatch": "yes if these details match",
@@ -1276,7 +1277,7 @@
     "voucherConfirmYourIdentityContent": "<p class=\"govuk-body\">Before you can vouch for {{.DonorFullName}}, you need to confirm your own identity.</p><p class=\"govuk-body\">You can do this either:</p><ul class=\"govuk-list govuk-list--bullet\"><li>online using <a href=\"#\" class=\"govuk-link\">GOV.UK One Login</a></li><li>in person at a Post Office</li></ul><p class=\"govuk-body\">You will need an identity document, for example your passport or driving licence.</p><p class=\"govuk-body\">It takes longer to do it at a Post Office, but you can usually get an outcome within a day.</p><h2 class=\"govuk-heading-m\">Choose how to confirm your identity</h2><p class=\"govuk-body\">When you continue, you’ll go to GOV.UK One Login where you can choose if you want to confirm your identity online or in person.</p>",
     "voucherUnableToConfirmIdentityContent": "<p class=\"govuk-body\">This means you cannot vouch for {{.DonorFullName}}. We have contacted {{.DonorFirstNames}} to let them know.</p><p class=\"govuk-body\">You do not need to do anything else.</p><p class=\"govuk-body\">You can now close this browsing window.</p>",
     "yourDeclaration": "Your declaration",
-    "yourDeclarationContent": "<p class=\"govuk-body govuk-!-font-weight-bold\">Sign your declaration to vouch for {{.DonorFullNamePossessive}} identity.</p><p class=\"govuk-body\">By signing this declaration, I confirm all of the following:</p><ul class=\"govuk-list govuk-list--bullet\"><li>I am over 18</li><li>I am allowed to vouch for {{.DonorFirstNames}}</li><li>I am not a person named on {{.DonorFirstNamesPossessive}} LPA</li><li>the identity details match my understanding of the person who asked me to vouch for them</li></ul>",
+    "yourDeclarationContent": "<p class=\"govuk-body govuk-!-font-weight-bold\">Sign your declaration to vouch for {{.DonorFullNamePossessive}} identity.</p><p class=\"govuk-body\">By signing this declaration, I confirm all of the following:</p><ul class=\"govuk-list govuk-list--bullet\"><li>I am over 18</li><li>I am allowed to vouch for {{.DonorFirstNames}}</li><li>I am not a person named on {{.DonorFirstNamesPossessive}} LPA</li><li>I am not in a relationship with, related to or living with {{.DonorFirstNames}}</li><li>the identity details match my understanding of the person who asked me to vouch for them</li></ul>",
     "youMustSelectTheBoxToVouch": "You must select the box to vouch",
     "iAmVouchingThat": "I, {{.VoucherFullName}}, am vouching that:",
     "toTheBestOfMyKnowledgeDeclaration": "To the best of my knowledge, the person who asked me to vouch for them is {{.DonorFullName}} and I have known them for at least 2 years.",

web/template/voucher/verify_donor_details.gohtml

@@ -12,7 +12,7 @@
 
             {{ trFormatHtml .App "verifyPersonDetailsContent"
                 "DonorFirstNames" .Lpa.Donor.FirstNames
-                "DonorFirstNamesPossessive" (possessive .App .Lpa.Donor.FirstNames) }}
+                "DonorFullNamePossessive" (possessive .App .Lpa.Donor.FullName) }}
 
             <dl class="govuk-summary-list">
                 {{ template "summary-row" (summaryRow .App "firstNames"

web/template/voucher/your_declaration.gohtml

@@ -37,7 +37,7 @@
                     </div>
                 </div>
 
-                {{ template "details" (details . "howTickingActsAsSignature" "howTickingActsAsSignatureDeclarationContent" false) }}
+                {{ template "details" (details . "howTickingActsAsSignatureDeclaration" "howTickingActsAsSignatureDeclarationContent" false) }}
 
                 {{ template "buttons" (button .App "submitMySignature") }}
                 {{ template "csrf-field" . }}