Skip to content

Commit

Permalink
Merge 634d784 into 8d9c28c
Browse files Browse the repository at this point in the history
  • Loading branch information
@hawx
hawx authored Oct 17, 2024
2 parents 8d9c28c + 634d784 commit 68b2e27
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 13 deletions.
19 changes: 16 additions & 3 deletions lang/cy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,17 +297,28 @@
"submittedYourLpa": "Rydych wedi cyflwyno eich LPA",
"whatHappensNext": "Beth fydd yn digwydd nesaf",
"weWillContactYourCertificateProvider": "Byddwn yn cysylltu â’ch darparwr tystysgrif, {{.FirstNames}}, ac yn gofyn iddynt gadarnhau eu hunaniaeth.",
"opgWillContactYourCertificateProvider": "Welsh {{.FullName}}",
"weWillThenContactAttorneys": {
"one": "Yna byddwn yn cysylltu â {{.FullNames}} ac yn gofyn iddynt lofnodi eich LPA fel eich atwrnai.",
"two": "Yna byddwn yn cysylltu â {{.FullNames}} ac yn gofyn iddynt lofnodi eich LPA fel eich atwrneiod.",
"few": "Yna byddwn yn cysylltu â {{.FullNames}} ac yn gofyn iddynt lofnodi eich LPA fel eich atwrneiod.",
"many": "Yna byddwn yn cysylltu â {{.FullNames}} ac yn gofyn iddynt lofnodi eich LPA fel eich atwrneiod.",
"other": "Yna byddwn yn cysylltu â {{.FullNames}} ac yn gofyn iddynt lofnodi eich LPA fel eich atwrneiod."
},
"opgWillContactAttorneys": {
"one": "Welsh {{.FullNames}}",
"two": "Welsh {{.FullNames}}",
"few": "Welsh {{.FullNames}}",
"many": "Welsh {{.FullNames}}",
"other": "Welsh {{.FullNames}}"
},
"onceEveryoneHasSigned": "Unwaith y bydd pawb wedi llofnodi a phan fydd eich LPA wedi’n cyrraedd, byddwn yn hysbysu unrhyw bobl y byddwch yn dewis rhoi gwybod iddynt. Bydd cyfnod aros o 4 wythnos yn dechrau. Mae hyn yn ofynnol yn ôl y gyfraith, er mwyn caniatáu i unrhyw un sydd â gwrthwynebiad i’w codi.",
"onceEveryoneHasSignedOpgWill": "Welsh",
"wellRegisteredYourLpa": "Byddwn yn cofrestru eich LPA.",
"atTheEndOfTheWaitingPeriod": "Welsh",
"atTheEndOfTheWaitingPeriodOpgWill": "Welsh",
"ifYourLpaIsSuccessfullyReviewed": "Welsh",
"ifTheCOPFindsYourLpaIsValid": "Welsh",
"weWillEmailYou": "<p class=\"govuk-body\">Byddwn yn anfon e-bost atoch i roi’r wybodaeth ddiweddaraf i chi am gofrestriad eich LPA. Os oes unrhyw broblemau, byddwn yn rhoi gwybod i chi.</p><p class=\"govuk-body\">Gallwch hefyd gadw golwg ar gynnydd eich LPA drwy fewngofnodi i’r gwasanaeth hwn unrhyw bryd.</p>",
"signIn4WeeksWarning": {
"one": "Rhaid i {{.CertificateProviderFirstNames}} a’ch atwrnai lofnodi’r LPA erbyn {{.SigningDeadline}}. Os na fyddant yn llofnodi erbyn y dyddiad hwn, bydd yn rhaid i chi gwrdd â {{.CertificateProviderFirstNames}} a llofnodi’ch LPA eto.",
Expand Down Expand Up @@ -1247,6 +1258,7 @@
"registerYourLpaThroughCOPContent": "<p class=\"govuk-body\">Welsh</p>",
"registerYourLpaThroughCOPWarning": "Welsh",
"whatWouldYouLikeToDo": "Welsh",
"yourLpaMustBeReviewedByCOP": "Welsh",
"iNoLongerWantToMakeThisLpa": "Welsh",
"iNoLongerWantToMakeThisLpaHint": "Welsh",
"iWillApplyToCourtOfProtectionToRegisterThisLpa": "Welsh",
Expand All @@ -1266,15 +1278,13 @@
"ifYouNeedHelpWithGOLContactTheirTeam": "Welsh",
"contactGOL": "Welsh",
"whatYouWouldLikeToDo": "Welsh",
"youHaveToldUsYouAreApplyingCOP": "Welsh",
"countAttorneys": {
"one": "Welsh",
"two": "Welsh",
"few": "Welsh",
"many": "Welsh",
"other": "Welsh"
},
"whatHappensNextRegisteringWithCOPContent": "<p class=\"govuk-body\">Welsh</p><ul class=\"govuk-list govuk-list--bullet\"><li>Welsh {{ .CertificateProviderFullName }} Welsh.</li><li>Welsh {{ .CountAttorneys }} Welsh</li><li>Welsh</li></ul>",
"yourConfirmedIdentityDetails": "Welsh",
"theDetailsOnYourLPA": "Welsh",
"someDetailsDoNotMatchIdentityDetailsWarning": "Welsh",
Expand Down Expand Up @@ -1422,5 +1432,8 @@
"youHaveSuccessfullyConfirmedYourIdentitySuccess:certificate-provider": "<div class=\"govuk-notification-banner__content\"><h2 class=\"govuk-notification-banner__heading\">Welsh</h2><p class=\"govuk-body\">Welsh {{possessive .DonorFullName }} Welsh</p></div>",
"youHaveSuccessfullyConfirmedYourIdentitySuccess:voucher": "<div class=\"govuk-notification-banner__content\"><h2 class=\"govuk-notification-banner__heading\">Welsh</h2><p class=\"govuk-body\">Welsh</p></div>",
"thanksWeCannotRegisterUntilCourtOfProtection": "Welsh",
"youCanTrackTheProgressByLoggingBackIn": "Welsh"
"youCanTrackTheProgressByLoggingBackIn": "Welsh",
"signYourLpaSoCanSubmitToCOP": "Welsh",
"opgWillCompleteOurChecks": "Welsh",
"youCanTrackTheProgressAnyTime": "Welsh"
}
16 changes: 13 additions & 3 deletions lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,14 +308,22 @@
"submittedYourLpa": "You’ve submitted your LPA",
"whatHappensNext": "What happens next",
"weWillContactYourCertificateProvider": "We’ll contact {{.FirstNames}} and ask them to confirm their identity and provide the certificate for your LPA.",
"opgWillContactYourCertificateProvider": "OPG will contact {{.FullName}} and ask them to confirm their identity and provide the certificate for your LPA.",
"weWillThenContactAttorneys": {
"one": "We’ll contact {{.FullNames}} and ask them to sign your LPA as your attorney.",
"other": "We’ll contact {{.FullNames}} and ask them to sign your LPA as your attorneys."
},
"opgWillContactAttorneys": {
"one": "OPG will contact {{.FullNames}} and ask them to sign your LPA as your attorney.",
"other": "OPG will contact {{.FullNames}} and ask them to sign your LPA as your attorneys."
},
"onceEveryoneHasSigned": "Once everyone has signed and we’ve received your LPA, we’ll inform any people you chose to notify. A 4-week waiting period will begin. This is required by law, to allow anyone with objections to raise them.",
"onceEveryoneHasSignedOpgWill": "Once everyone has signed and OPG have received your LPA, we’ll inform any people you chose to notify. A 4-week waiting period will begin. This is required by law, to allow anyone with objections to raise them.",
"wellRegisteredYourLpa": "We’ll register your LPA.",
"atTheEndOfTheWaitingPeriod": "At the end of the waiting period, we’ll contact you with guidance about getting your LPA reviewed by the Court of Protection.",
"atTheEndOfTheWaitingPeriodOpgWill": "At the end of the waiting period, OPG will contact you with guidance about getting your LPA reviewed by the Court of Protection.",
"ifYourLpaIsSuccessfullyReviewed": "If your LPA is successfully reviewed by the Court of Protection, we’ll be able to register it, and it can then be used.",
"ifTheCOPFindsYourLpaIsValid": "If the Court of Protection finds your LPA is valid, it will direct OPG to register it. Your LPA can then be used.",
"weWillEmailYou": "<p class=\"govuk-body\">We’ll email you to update you with the progress of your LPA’s registration. If there are any problems, we’ll let you know.</p><p class=\"govuk-body\">You can also track the progress of your LPA by logging back into this service at any time.</p>",
"signIn4WeeksWarning": {
"one": "{{.CertificateProviderFirstNames}} and your attorney must sign your LPA by {{.SigningDeadline}}. If they do not sign by this date, you will have to pay the application fee again. You will also have to meet with {{.CertificateProviderFirstNames}} and sign your LPA again.",
Expand Down Expand Up @@ -1195,12 +1203,11 @@
"ifYouNeedHelpWithGOLContactTheirTeam": "If you need help with GOV.UK One Login, contact their team.",
"contactGOL": "Contact GOV.UK One Login",
"whatYouWouldLikeToDo": "what you would like to do",
"youHaveToldUsYouAreApplyingCOP": "You have told us that you are applying to the Court of Protection to register this LPA",
"yourLpaMustBeReviewedByCOP": "<div class=\"govuk-notification-banner__content\"><p class=\"govuk-notification-banner__heading\"> Your LPA must be reviewed by the Court of Protection </p><p class=\"govuk-body\">You have not been able to confirm your identity using our services, so the Office of the Public Guardian (OPG) cannot register your LPA unless we are directed to do so by the Court of Protection.</p></div>",
"countAttorneys": {
"one": "attorney",
"other": "attorneys"
},
"whatHappensNextRegisteringWithCOPContent": "<p class=\"govuk-body\">You should now sign your LPA.</p><ul class=\"govuk-list govuk-list--bullet\"><li>Once you have signed, we will contact {{ .CertificateProviderFullName }} to provide their certificate.</li><li>We will then let your {{ .CountAttorneys }} know they can sign your LPA.</li><li>When your LPA is ready, we will contact you with instructions to submit it to the Court of Protection.</li></ul>",
"yourConfirmedIdentityDetails": "Your confirmed identity details",
"theDetailsOnYourLPA": "The details on your LPA",
"someDetailsDoNotMatchIdentityDetailsWarning": "Some of the details on your LPA do not match your confirmed identity details",
Expand Down Expand Up @@ -1348,5 +1355,8 @@
"youHaveSuccessfullyConfirmedYourIdentitySuccess:certificate-provider": "<div class=\"govuk-notification-banner__content\"><h2 class=\"govuk-notification-banner__heading\">You have successfully confirmed your identity</h2><p class=\"govuk-body\">Thank you for confirming your identity using GOV.UK One Login. Your details match those entered in {{possessive .DonorFullName }} LPA.</p></div>",
"youHaveSuccessfullyConfirmedYourIdentitySuccess:voucher": "<div class=\"govuk-notification-banner__content\"><h2 class=\"govuk-notification-banner__heading\">You have successfully confirmed your identity</h2><p class=\"govuk-body\">Thank you for confirming your identity using GOV.UK One Login.</p></div>",
"thanksWeCannotRegisterUntilCourtOfProtection": "Thanks for signing and submitting your LPA. We cannot register your LPA until it has been successfully reviewed by the Court of Protection.",
"youCanTrackTheProgressByLoggingBackIn": "You can track the progress of your LPA by logging back into the service at any time."
"youCanTrackTheProgressByLoggingBackIn": "You can track the progress of your LPA by logging back into the service at any time.",
"signYourLpaSoCanSubmitToCOP": "Sign your LPA – this will allow OPG to complete checks on the LPA so you can submit it to the Court of Protection.",
"opgWillCompleteOurChecks": "OPG will complete our checks on your LPA so you can submit it to the Court of Protection.",
"youCanTrackTheProgressAnyTime": "You can track the progress of your LPA at any time."
}
30 changes: 23 additions & 7 deletions web/template/donor/what_happens_next_registering_with_court_of_protection.gohtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,33 @@
{{ define "main" }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
{{ template "notification-banner" ( notificationBanner .App "important" (trHtml .App "youHaveToldUsYouAreApplyingCOP") "heading" ) }}
{{ template "notification-banner" (notificationBanner .App "important" (trHtml .App "yourLpaMustBeReviewedByCOP") "contents") }}

<h1 class="govuk-heading-xl">{{ tr .App "whatHappensNext" }}</h1>

{{ $countAttorneys := trCount .App "countAttorneys" (len .Donor.Attorneys.Attorneys) }}
{{ trFormatHtml .App "whatHappensNextRegisteringWithCOPContent" "CertificateProviderFullName" .Donor.CertificateProvider.FullName "CountAttorneys" $countAttorneys }}
<ol class="govuk-list govuk-list--number">
{{ if .Donor.WitnessedByCertificateProviderAt.IsZero }}
<li>{{ tr .App "signYourLpaSoCanSubmitToCOP" }}</li>
<li>{{ trFormat .App "opgWillContactYourCertificateProvider" "FullName" .Donor.CertificateProvider.FullName }}</li>
<li>{{ trFormatCount .App "opgWillContactAttorneys" .Donor.Attorneys.Len "FullNames" (concatAnd .App .Donor.Attorneys.FullNames) }}</li>
{{ else }}
<li>{{ tr .App "opgWillCompleteOurChecks" }}</li>
<li>{{ tr .App "youCanTrackTheProgressAnyTime" }}</li>
{{ end }}
<li>{{ tr .App "onceEveryoneHasSignedOpgWill" }}</li>
<li>{{ tr .App "atTheEndOfTheWaitingPeriodOpgWill" }}</li>
<li>{{ tr .App "ifTheCOPFindsYourLpaIsValid" }}</li>
</ol>

<div class="govuk-button-group">
<a href="{{ global.Paths.ReadYourLpa.Format .App.LpaID }}" class="govuk-link govuk-button">{{ tr .App "continue" }}</a>
<a href="{{ global.Paths.TaskList.Format .App.LpaID }}" class="govuk-link govuk-button govuk-button--secondary">{{ tr .App "returnToTaskList" }}</a>
</div>
{{ if .Donor.WitnessedByCertificateProviderAt.IsZero }}
<!-- TODO for MLPAB-2568 change this to:
template "button" (button .App "returnToTaskList" "link" (global.Paths.TaskList.Format .App.LpaID))
-->

{{ template "buttons" (button .App "continue" "link" (global.Paths.ReadYourLpa.Format .App.LpaID)) }}
{{ else }}
{{ template "buttons" (button .App "trackLpaProgress" "link" (global.Paths.Progress.Format .App.LpaID)) }}
{{ end }}
</div>
</div>
{{ end }}

0 comments on commit 68b2e27

Please sign in to comment.