Skip to content

Commit

Permalink
Vary end content after exemption requested
Browse files Browse the repository at this point in the history
  • Loading branch information
@hawx
hawx committed Oct 10, 2024
1 parent 4bddaa9 commit 7c0153a
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 5 deletions.
8 changes: 6 additions & 2 deletions lang/cy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,11 @@
"evidenceSuccessfullyUploaded": "Mae’r dystiolaeth wedi’i huwchlwytho’n llwyddiannus",
"weWillReviewYourLpaApplicationAndSupportingEvidence": "<p class=\"govuk-body\">Byddwn yn adolygu’ch cais am LPA a’ch tystiolaeth ategol.</p><h2 class=\"govuk-heading-m\">Beth fydd yn digwydd nesaf</h2><h3 class=\"govuk-heading-s\">Llofnodi’ch LPA</h3><p class=\"govuk-body\">Gallwch lofnodi’ch LPA tra byddwn ni yn adolygu’ch cais. Rhaid i’ch darparwr tystysgrif fod yn bresennol fel tyst pan fyddwch yn ei llofnodi.</p><p class=\"govuk-body\">Fodd bynnag, ni fyddwn yn cysylltu â’ch darparwr tystysgrif ynghylch darparu ei dystysgrif nes bydd eich {{.Application}} wedi cael ei gymeradwyo.</p><h3 class=\"govuk-heading-s\">Os bydd eich cais yn llwyddiannus</h3><p class=\"govuk-body\">Unwaith y byddwn wedi cymeradwyo’ch taliad, byddwn yn cysylltu â’ch darparwr tystysgrif er mwyn iddo ddarparu ei dystysgrif.</p><h3 class=\"govuk-heading-s\">Os na fydd eich cais yn llwyddiannus</h3><p class=\"govuk-body\">Byddwn yn cysylltu â chi os bydd arnom angen mwy o wybodaeth neu os nad oedd eich cais yn llwyddiannus.</p>",
"youCanStillSignYourLpa": "<h3 class=\"govuk-heading-s\">Welsh</h3><p class=\"govuk-body\">Welsh</p><p class=\"govuk-body\">Welsh {{ .Application }} Welsh</p>",
"ifYourApplicationIsSuccessful": "<h3 class=\"govuk-heading-s\">Welsh</h3><p class=\"govuk-body\">Welsh</p><h3 class=\"govuk-heading-s\">Welsh</h3><p class=\"govuk-body\">Welsh</p>",
"ifYourApplicationIsSuccessful": "Os bydd eich cais yn llwyddiannus",
"onceWeHaveApprovedYourPayment": "Unwaith y byddwn wedi cymeradwyo’ch taliad, byddwn yn cysylltu â’ch darparwr tystysgrif er mwyn iddo ddarparu ei dystysgrif.",
"onceWeHaveApprovedYourRequest": "Welsh",
"ifYourApplicationIsNotSuccessful": "Os na fydd eich cais yn llwyddiannus",
"weWillContactYouIfWeNeedMoreInformation": "Byddwn yn cysylltu â chi os bydd arnom angen mwy o wybodaeth neu os nad oedd eich cais yn llwyddiannus.",
"applicationNoFee": "cais i beidio â thalu ffi",
"applicationHalfFee": "cais i dalu hanner y ffi",
"applicationHardshipFee": "cais oherwydd caledi",
Expand All @@ -941,7 +945,7 @@
"sendUsYourEvidenceByPost": "Anfonwch eich tystiolaeth atom drwy’r post",
"sendUsYourEvidenceByPostContent": "<p class=\"govuk-body\">Gallwch anfon eich tystiolaeth i’n cyfeiriad post:</p><p class=\"govuk-body\">Office of the Public Guardian<br/>PO Box 16185</br>Birmingham</br>B2 2WH</p><p class=\"govuk-body\">Rhaid i’r llythyr gynnwys llythyr eglurhaol sydd â’ch cyfeirnod arno.</p><p class=\"govuk-body\">Os ydych yn gwneud dwy LPA yr un pryd, nid oes angen i chi anfon eich tystiolaeth ddwywaith. Gallwch ei hanfon unwaith a chynnwys cyfeirnodau’r ddwy LPA yn eich llythyr eglurhaol.</p>",
"youMustIncludeYourReferenceNumberWarning": "Rhaid i chi gynnwys eich cyfeirnod fel y gallwn gysylltu’ch tystiolaeth â’ch cais . Byddai peidio â’i ddarparu yn gallu achosi oedi a byddai cyfnod eich cais am LPA yn gallu dod i ben.",
"whatHappensNextPostEvidenceContent": "<p class=\"govuk-body\">Nawr dylech anfon eich tystiolaeth atom drwy’r post. Byddwn yn ei hadolygu ynghyd â’ch cais am LPA.</p><h2 class=\"govuk-heading-m\">Llofnodi’ch LPA</h2><p class=\"govuk-body\"> Gallwch lofnodi’ch LPA tra byddwn ni’n adolygu’ch cais. Rhaid i’ch darparwr tystysgrif fod yn bresennol fel tyst pan fyddwch yn ei llofnodi.</p><p class=\"govuk-body\"> Fodd bynnag, ni fyddwn yn cysylltu â’ch darparwr tystysgrif ynghylch darparu ei dystysgrif nes bydd eich {{.Application}} wedi cael ei gymeradwyo.</p><h2 class=\"govuk-heading-m\"> Os bydd eich cais yn llwyddiannus </h2><p class=\"govuk-body\"> Unwaith y byddwn wedi cymeradwyo’ch taliad, byddwn yn cysylltu â’ch darparwr tystysgrif er mwyn iddo ddarparu ei dystysgrif.</p><h2 class=\"govuk-heading-m\"> Os na fydd eich cais yn llwyddiannus</h2><p class=\"govuk-body\"> Byddwn yn cysylltu â chi os bydd arnom angen mwy o wybodaeth neu os nad oedd eich cais yn llwyddiannus.</p>",
"whatHappensNextPostEvidenceContent": "<p class=\"govuk-body\">Nawr dylech anfon eich tystiolaeth atom drwy’r post. Byddwn yn ei hadolygu ynghyd â’ch cais am LPA.</p><h2 class=\"govuk-heading-m\">Llofnodi’ch LPA</h2><p class=\"govuk-body\"> Gallwch lofnodi’ch LPA tra byddwn ni’n adolygu’ch cais. Rhaid i’ch darparwr tystysgrif fod yn bresennol fel tyst pan fyddwch yn ei llofnodi.</p><p class=\"govuk-body\"> Fodd bynnag, ni fyddwn yn cysylltu â’ch darparwr tystysgrif ynghylch darparu ei dystysgrif nes bydd eich {{.Application}} wedi cael ei gymeradwyo.</p>",
"appealingTheDecision": "Apelio yn erbyn y penderfyniad",
"appealingTheDecisionDetails": "<p class=\"govuk-body\">Os nad oedd eich cais yn llwyddiannus, gallwch apelio o fewn 4 wythnos ar ôl y penderfyniad drwy ysgrifennu at y Pennaeth Gwasanaethau Corfforaethol.</p><p class=\"govuk-body\">Os bydd y penderfyniad gwreiddiol yn cael ei ategu, bydd yn cael ei gyfeirio i sylw’r Gwarcheidwad Cyhoeddus i’w gadarnhau.</p>",
"removeTrustCorporation": "Dileu corfforaeth ymddiriedolaeth",
Expand Down
8 changes: 6 additions & 2 deletions lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,11 @@
"evidenceSuccessfullyUploaded": "Evidence successfully uploaded",
"weWillReviewYourLpaApplicationAndSupportingEvidence": "<p class=\"govuk-body\">We will review your LPA application and supporting evidence.</p><h2 class=\"govuk-heading-m\">What happens next</h2>",
"youCanStillSignYourLpa": "<h3 class=\"govuk-heading-s\">Sign your LPA</h3><p class=\"govuk-body\">You can still sign your LPA while we’re reviewing your application. Your certificate provider must be there as a witness when you sign it.</p><p class=\"govuk-body\">However, we will not contact your certificate provider to provide their certificate until your {{ .Application }} has been approved.</p>",
"ifYourApplicationIsSuccessful": "<h3 class=\"govuk-heading-s\">If your application is successful</h3><p class=\"govuk-body\">Once we have approved your payment, we will contact your certificate provider to provide their certificate.</p><h3 class=\"govuk-heading-s\">If your application is not successful</h3><p class=\"govuk-body\">We will contact you if we need more information or if your application is unsuccessful.</p>",
"ifYourApplicationIsSuccessful": "If your application is successful",
"onceWeHaveApprovedYourPayment": "Once we have approved your payment, we will contact your certificate provider to provide their certificate.",
"onceWeHaveApprovedYourRequest": "Once we have approved your request, we will contact your certificate provider to provide their certificate.",
"ifYourApplicationIsNotSuccessful": "If your application is not successful",
"weWillContactYouIfWeNeedMoreInformation": "We will contact you if we need more information or if your application is unsuccessful.",
"applicationNoFee": "application to pay no fee",
"applicationHalfFee": "application to pay a half fee",
"applicationHardshipFee": "hardship application",
Expand All @@ -888,7 +892,7 @@
"sendUsYourEvidenceByPost": "Send us your evidence by post",
"sendUsYourEvidenceByPostContent": "<p class=\"govuk-body\">You can send your evidence to our postal address:</p><p class=\"govuk-body\">Office of the Public Guardian<br/>PO Box 16185</br>Birmingham</br>B2 2WH</p><p class=\"govuk-body\">Your letter must include a cover letter with your reference number on it.</p><p class=\"govuk-body\">If you are making two LPAs at the same time, you do not need to send your evidence twice. You can send it once and include both LPA reference numbers on your cover letter.</p>",
"youMustIncludeYourReferenceNumberWarning": "You must include your reference number so we can link your evidence to your application. Not providing it could cause a delay and your LPA application could expire.",
"whatHappensNextPostEvidenceContent": "<p class=\"govuk-body\">You should now send us your evidence by post. We will review it along with your LPA application.</p><h2 class=\"govuk-heading-m\">Sign your LPA</h2><p class=\"govuk-body\">You can still sign your LPA while we’re reviewing your application. Your certificate provider must be there as a witness when you sign it.</p><p class=\"govuk-body\">However, we will not contact your certificate provider to provide their certificate until your {{.Application}} has been approved.</p><h2 class=\"govuk-heading-m\">If your application is successful</h2><p class=\"govuk-body\">Once we have approved your payment, we will contact your certificate provider to provide their certificate.</p><h2 class=\"govuk-heading-m\">If your application is not successful</h2><p class=\"govuk-body\">We will contact you if we need more information or if your application is unsuccessful.</p>",
"whatHappensNextPostEvidenceContent": "<p class=\"govuk-body\">You should now send us your evidence by post. We will review it along with your LPA application.</p><h2 class=\"govuk-heading-m\">Sign your LPA</h2><p class=\"govuk-body\">You can still sign your LPA while we’re reviewing your application. Your certificate provider must be there as a witness when you sign it.</p><p class=\"govuk-body\">However, we will not contact your certificate provider to provide their certificate until your {{.Application}} has been approved.</p>",
"appealingTheDecision": "Appealing the decision",
"appealingTheDecisionDetails": "<p class=\"govuk-body\">If your application is unsuccessful, you can appeal within 4 weeks of the decision by writing to the Head of Corporate Services.</p><p class=\"govuk-body\">If the original decision is upheld, it will be referred to the Public Guardian for confirmation.</p>",
"removeTrustCorporation": "Remove trust corporation",
Expand Down
12 changes: 11 additions & 1 deletion web/template/donor/evidence_successfully_uploaded.gohtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@
{{ trFormatHtml .App "youCanStillSignYourLpa" "Application" (printf "application%s" .Donor.FeeType.String | tr .App) }}
{{ end }}

{{ trHtml .App "ifYourApplicationIsSuccessful" }}
<h3 class="govuk-heading-s">{{ tr .App "ifYourApplicationIsSuccessful" }}</h3>
<p class="govuk-body">
{{ if .Donor.FeeType.IsNoFee }}
{{ tr .App "onceWeHaveApprovedYourRequest" }}
{{ else }}
{{ tr .App "onceWeHaveApprovedYourPayment" }}
{{ end }}
</p>

<h3 class="govuk-heading-s">{{ tr .App "ifYourApplicationIsNotSuccessful" }}</h3>
<p class="govuk-body">{{ tr .App "weWillContactYouIfWeNeedMoreInformation" }}</p>

{{ if not .Donor.FeeType.IsRepeatApplicationFee }}
{{ template "details" (details . "appealingTheDecision" "appealingTheDecisionDetails" false) }}
Expand Down
12 changes: 12 additions & 0 deletions web/template/donor/what_happens_next_post_evidence.gohtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@

{{ trFormatHtml .App "whatHappensNextPostEvidenceContent" "Application" (printf "application%s" .Donor.FeeType.String | tr .App) }}

<h2 class="govuk-heading-m">{{ tr .App "ifYourApplicationIsSuccessful" }}</h2>
<p class="govuk-body">
{{ if .Donor.FeeType.IsNoFee }}
{{ tr .App "onceWeHaveApprovedYourRequest" }}
{{ else }}
{{ tr .App "onceWeHaveApprovedYourPayment" }}
{{ end }}
</p>

<h2 class="govuk-heading-m">{{ tr .App "ifYourApplicationIsNotSuccessful" }}</h2>
<p class="govuk-body">{{ tr .App "weWillContactYouIfWeNeedMoreInformation" }}</p>

{{ if not .Donor.FeeType.IsRepeatApplicationFee }}
{{ template "details" (details . "appealingTheDecision" "appealingTheDecisionDetails" false) }}
{{ end }}
Expand Down

0 comments on commit 7c0153a

Please sign in to comment.