Skip to content

Commit

Permalink
CIV-15899 Fix Formatting for Notifications (#5838)
Browse files Browse the repository at this point in the history 
* CIV-15899 Fix Formatting for Notifications

* updarting welsh for additional fee
  • Loading branch information
@LTurkingtonHMCTS
LTurkingtonHMCTS authored Nov 25, 2024
1 parent db60603 commit d49f656
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 8 deletions.
8 changes: 4 additions & 4 deletions ...form/civil/controllers/dashboard/scenarios/applicant/GeneralAppSubmittedScenarioTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ void should_create_scenario_for_general_application_submitted() throws Exception
"<p class=\"govuk-body\"> A judge will consider the application. </p><p class=\"govuk-body\"> The other parties can respond within 5 working days after " +
"the application is submitted," +
" unless you've chosen not to inform them." +
" If you have a hearing in the next 10 days, your application will be treated urgently.</p>" +
" <p> <a href=\"{GA_VIEW_APPLICATION_URL}\" class=\"govuk-link\">View application documents</a>.</p>"),
" If you have a hearing in the next 10 days, your application will be treated urgently." +
" <a href=\"{GA_VIEW_APPLICATION_URL}\" class=\"govuk-link\">View application documents</a></p>"),
jsonPath("$[0].descriptionCy").value(
"<p class=\"govuk-body\"> Bydd barnwr yn ystyried y cais. </p>" +
"<p class=\"govuk-body\"> Gall y partïon eraill ymateb o fewn 5 diwrnod gwaith ar ôl i’r cais gael ei gyflwyno," +
" oni bai eich bod wedi dewis peidio â rhoi gwybod iddynt." +
" Os oes gennych wrandawiad o fewn y 10 diwrnod nesaf, bydd eich cais yn cael ei drin ar frys. </p>" +
" <p> <a href=\"{GA_VIEW_APPLICATION_URL}\" class=\"govuk-link\">Gweld dogfennau’r cais</a>.</p>")
" Os oes gennych wrandawiad o fewn y 10 diwrnod nesaf, bydd eich cais yn cael ei drin ar frys." +
" <a href=\"{GA_VIEW_APPLICATION_URL}\" class=\"govuk-link\">Gweld dogfennau’r cais</a></p>")
);
}
}
8 changes: 4 additions & 4 deletions ...cenarios/generalapplication/applicant/GeneralApplicationPayAdditionalFeeScenarioTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ void should_create_scenario_for_general_application_more_info_required() throws
jsonPath("$[0].titleEn").value("You must pay an additional application fee"),
jsonPath("$[0].titleCy").value("Rhaid i chi dalu ffi gwneud cais ychwanegol"),
jsonPath("$[0].descriptionEn").value(
"<p class=\"govuk-body\">The court requires you to pay an additional fee before your application can progress further.</p>" +
"<p class=\"govuk-body\"><a href=\"{GA_VIEW_APPLICATION_URL}\" class=\"govuk-link\">Pay the additional application fee.</a></p>"),
"<p class=\"govuk-body\">The court requires you to pay an additional fee before your application can progress further. " +
"<a href=\"{GA_VIEW_APPLICATION_URL}\" class=\"govuk-link\">Pay the additional application fee</a></p>"),
jsonPath("$[0].descriptionCy").value(
"<p class=\"govuk-body\">Mae'r llys angen i chi dalu ffi ychwanegol cyn y gall eich cais gael ei brosesu ymhellach.</p>" +
"<p class=\"govuk-body\"><a href=\"{GA_VIEW_APPLICATION_URL}\" class=\"govuk-link\">Talu ffi’r gwneud cais ychwanegol.</a></p>")
"<p class=\"govuk-body\">Mae'r llys angen i chi dalu ffi ychwanegol cyn y gall eich cais gael ei brosesu ymhellach. " +
"<a href=\"{GA_VIEW_APPLICATION_URL}\" class=\"govuk-link\">Talu ffi’r gwneud cais ychwanegol</a></p>")
);
}

Expand Down
7 changes: 7 additions & 0 deletions ...ources/db/migration/V2024_11_22_1348__CIV-15899_update_ga_pay_additional_fee_scenario.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Removing full stop and new line from link
*/
UPDATE dbs.dashboard_notifications_templates SET description_En = replace(description_En, '<p class="govuk-body">The court requires you to pay an additional fee before your application can progress further.</p><p class="govuk-body"><a href="{GA_VIEW_APPLICATION_URL}" class="govuk-link">Pay the additional application fee.</a></p>', '<p class="govuk-body">The court requires you to pay an additional fee before your application can progress further. <a href="{GA_VIEW_APPLICATION_URL}" class="govuk-link">Pay the additional application fee</a></p>')
WHERE template_name in ('Notice.AAA6.GeneralApps.AdditionalApplicationFeeRequired.Applicant');
UPDATE dbs.dashboard_notifications_templates SET description_Cy = replace(description_Cy, '<p class="govuk-body">Mae''r llys angen i chi dalu ffi ychwanegol cyn y gall eich cais gael ei brosesu ymhellach.</p><p class="govuk-body"><a href="{GA_VIEW_APPLICATION_URL}" class="govuk-link">Talu ffi’r gwneud cais ychwanegol.</a></p>', '<p class="govuk-body">Mae''r llys angen i chi dalu ffi ychwanegol cyn y gall eich cais gael ei brosesu ymhellach. <a href="{GA_VIEW_APPLICATION_URL}" class="govuk-link">Talu ffi’r gwneud cais ychwanegol</a></p>')
WHERE template_name in ('Notice.AAA6.GeneralApps.AdditionalApplicationFeeRequired.Applicant');
17 changes: 17 additions & 0 deletions ...sources/db/migration/V2024_11_22_1500__CIV-15899_update_general_application_submitted.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/**
* Removing full stop and new line from link
*/
UPDATE dbs.dashboard_notifications_templates SET description_En = replace(description_En, '<p class="govuk-body"> A judge will consider the application. </p>' ||
'<p class="govuk-body"> The other parties can respond within 5 working days after the application is submitted, unless you''ve chosen not to inform them. If you have a hearing in the next 10 days, your application will be treated urgently.</p>' ||
' <p> <a href="{GA_VIEW_APPLICATION_URL}" class="govuk-link">View application documents</a>.</p>',
'<p class="govuk-body"> A judge will consider the application. </p>' ||
'<p class="govuk-body"> The other parties can respond within 5 working days after the application is submitted, unless you''ve chosen not to inform them. If you have a hearing in the next 10 days, your application will be treated urgently. ' ||
'<a href="{GA_VIEW_APPLICATION_URL}" class="govuk-link">View application documents</a></p>')
WHERE template_name in ('Notice.AAA6.GeneralApps.ApplicationSubmitted.Applicant');
UPDATE dbs.dashboard_notifications_templates SET description_Cy = replace(description_Cy, '<p class="govuk-body"> Bydd barnwr yn ystyried y cais. </p>' ||
'<p class="govuk-body"> Gall y partïon eraill ymateb o fewn 5 diwrnod gwaith ar ôl i’r cais gael ei gyflwyno, oni bai eich bod wedi dewis peidio â rhoi gwybod iddynt. Os oes gennych wrandawiad o fewn y 10 diwrnod nesaf, bydd eich cais yn cael ei drin ar frys. </p>' ||
' <p> <a href="{GA_VIEW_APPLICATION_URL}" class="govuk-link">Gweld dogfennau’r cais</a>.</p>',
'<p class="govuk-body"> Bydd barnwr yn ystyried y cais. </p>' ||
'<p class="govuk-body"> Gall y partïon eraill ymateb o fewn 5 diwrnod gwaith ar ôl i’r cais gael ei gyflwyno, oni bai eich bod wedi dewis peidio â rhoi gwybod iddynt. Os oes gennych wrandawiad o fewn y 10 diwrnod nesaf, bydd eich cais yn cael ei drin ar frys. ' ||
'<a href="{GA_VIEW_APPLICATION_URL}" class="govuk-link">Gweld dogfennau’r cais</a></p>')
WHERE template_name in ('Notice.AAA6.GeneralApps.ApplicationSubmitted.Applicant');

0 comments on commit d49f656

Please sign in to comment.