Skip to content

Commit

Permalink
DDCYLS-4050 Removing welsh content from ECC english confirmation and … (
Browse files Browse the repository at this point in the history
#1124)

* DDCYLS-4050 Removing welsh content from ECC english confirmation and emails

* Minor changes to email content

* Correcting tehe content

* Amending ECC welsh and content as per comments

* Fixing tests
  • Loading branch information
chandraAndem authored Feb 8, 2024
1 parent 572f61d commit 7ac07c5
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 90 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@*
* Copyright 2023 HM Revenue & Customs
* Copyright 2024 HM Revenue & Customs
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,84 +19,80 @@
@(params: Map[String, Any])

@dynamicSubscriptionContent = @{
params.getOrElse("enrolmentKey", "") match {
case "HMRC-ATAR-ORG" =>
<li style="margin: 0 0 10px; font-size: 19px;">apply for an Advance Tariff Ruling</li>
<li style="margin: 0 0 10px; font-size: 19px;">apply for an Advance Valuation Ruling</li>
case "HMRC-GVMS-ORG" => <li style="margin: 0 0 10px; font-size: 19px;">get a goods movement reference (GMR)</li>
case "HMRC-CTC-ORG" => <li style="margin: 0 0 10px; font-size: 19px;">submit union transit declarations through NCTS</li>
case "HMRC-SS-ORG" => <li style="margin: 0 0 10px; font-size: 19px;">make entry summary declarations</li>
case "HMRC-CTS-ORG" =>
<li style="margin: 0 0 10px; font-size: 19px;">apply for repayment of import duty and VAT (CHIEF)</li>
<li style="margin: 0 0 10px; font-size: 19px;">send documents for a customs check for declarations made in CHIEF</li>
<li style="margin: 0 0 10px; font-size: 19px;">tell HMRC about an underpayment of Customs Duty or import VAT</li>

case "HMRC-ESC-ORG" => <li style="margin: 0 0 10px; font-size: 19px;">report and manage your allowance for Customs Duty waiver claims</li>
case _ => <li style="margin: 0 0 10px; font-size: 19px;">use the Customs Declaration Service</li>
}
params.getOrElse("enrolmentKey", "") match {
case "HMRC-ATAR-ORG" =>
<li style="margin: 0 0 10px; font-size: 19px;">apply for an Advance Tariff Ruling</li>
<li style="margin: 0 0 10px; font-size: 19px;">apply for an Advance Valuation Ruling</li>
case "HMRC-GVMS-ORG" => <li style="margin: 0 0 10px; font-size: 19px;">get a goods movement reference (GMR)</li>
case "HMRC-CTC-ORG" => <li style="margin: 0 0 10px; font-size: 19px;">submit union transit declarations through NCTS</li>
case "HMRC-SS-ORG" => <li style="margin: 0 0 10px; font-size: 19px;">make entry summary declarations</li>
case "HMRC-CTS-ORG" =>
<li style="margin: 0 0 10px; font-size: 19px;">apply for repayment of import duty and VAT (CHIEF)</li>
<li style="margin: 0 0 10px; font-size: 19px;">send documents for a customs check for declarations made in CHIEF</li>
<li style="margin: 0 0 10px; font-size: 19px;">tell HMRC about an underpayment of Customs Duty or import VAT</li>

case "HMRC-ESC-ORG" => <li style="margin: 0 0 10px; font-size: 19px;">report and manage your allowance for Customs Duty waiver claims</li>
case _ => <li style="margin: 0 0 10px; font-size: 19px;">use the Customs Declaration Service</li>
}
}

@eoriOnly = {
@if(params.getOrElse("serviceName", "") == "Get an EORI"){
<ul style="margin: 0 0 10px; font-size: 19px;">
<li style="margin: 0 0 10px; font-size: 19px;">move goods to or from Great Britain</li>
<li style="margin: 0 0 10px; font-size: 19px;">subscribe to customs services</li>
<li style="margin: 0 0 10px; font-size: 19px;">use the Customs Declaration Service</li>
</ul>
<ul style="margin: 0 0 10px; font-size: 19px;">
<li style="margin: 0 0 10px; font-size: 19px;">move goods to or from Great Britain</li>
<li style="margin: 0 0 10px; font-size: 19px;">subscribe to customs services</li>
<li style="margin: 0 0 10px; font-size: 19px;">use the Customs Declaration Service</li>
</ul>

<h2 style="margin: 30px 0 30px; font-size: 19px;">Get your EORI number</h2>
<h2 style="margin: 30px 0 30px; font-size: 19px;">Get your EORI number</h2>

<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we cannot send EORI numbers by email. You can obtain your EORI number by following these steps:</p>
<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we cannot send EORI numbers by email. You can get your EORI number by following these steps.</p>

<ol style="margin: 0 0 10px; font-size: 19px;">
<li style="margin: 0 0 10px; font-size: 19px;">Go to GOV.UK and search for, 'Get an EORI'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Select the link that says, 'Get an EORI number'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">On the Get an EORI number page, select the link that says, 'This guide is also available in Welsh (Cymraeg.)'</li>
<li style="margin: 0 0 10px; font-size: 19px;">On the Cael rhif EORI page, select the link that reads, 'Gwneud cais am rif EORI'</li>
<li style="margin: 0 0 10px; font-size: 19px;">On the Gwneud cais am rif EORI page, select the link that says, 'wirio statws cais rydych eisoes wedi'i wneud'. You'll find this link near the end of the page.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Toggle to Welsh using the Cymraeg button near the start of the page. Sign in using your Government Gateway user ID and password.</li>
</ol>
<ol style="margin: 0 0 10px; font-size: 19px;">
<li style="margin: 0 0 10px; font-size: 19px;">Go to GOV.UK and search for 'Get an EORI'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Select the link that says 'Apply for EORI'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">On the Apply for EORI page, select the link that says 'Check the status of an application you’ve already made'. You’ll find this link near the end of the page.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Sign in using your Government Gateway user ID and password.</li>
</ol>

<h2 style="margin: 30px 0 30px; font-size: 19px;">About the Customs Declaration Service</h2>
<h2 style="margin: 30px 0 30px; font-size: 19px;">About the Customs Declaration Service</h2>

<p style="margin: 0 0 30px; font-size: 19px;">We have subscribed you to the Customs Declaration Service.</p>
<p style="margin: 0 0 30px; font-size: 19px;">For more information, search ‘Customs Declaration Service’ on GOV.UK.</p>
<p style="margin: 0 0 30px; font-size: 19px;">We have subscribed you to the Customs Declaration Service.</p>
<p style="margin: 0 0 30px; font-size: 19px;">For more information, search ‘Customs Declaration Service’ on GOV.UK.</p>
} else {
<ul style="margin: 0 0 10px; font-size: 19px;">
@dynamicSubscriptionContent
<li style="margin: 0 0 10px; font-size: 19px;">move goods to or from Great Britain</li>
<li style="margin: 0 0 10px; font-size: 19px;">subscribe to other customs services</li>
</ul>
<ul style="margin: 0 0 10px; font-size: 19px;">
@dynamicSubscriptionContent
<li style="margin: 0 0 10px; font-size: 19px;">move goods to or from Great Britain</li>
<li style="margin: 0 0 10px; font-size: 19px;">subscribe to other customs services</li>
</ul>

<h2 style="margin: 30px 0 30px; font-size: 19px;">Get your EORI number</h2>
<h2 style="margin: 30px 0 30px; font-size: 19px;">Get your EORI number</h2>

<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we cannot send EORI numbers by email. You can obtain your EORI number by following these steps:</p>
<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we cannot send EORI numbers by email. You can get your EORI number by following these steps.</p>

<ol style="margin: 0 0 10px; font-size: 19px;">
<li style="margin: 0 0 10px; font-size: 19px;">Go to GOV.UK and search for, 'Get an EORI'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Select the link that says, 'Get an EORI number'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">On the Get an EORI number page, select the link that says, 'This guide is also available in Welsh (Cymraeg.)'</li>
<li style="margin: 0 0 10px; font-size: 19px;">On the Cael rhif EORI page, select the link that reads, 'Gwneud cais am rif EORI'</li>
<li style="margin: 0 0 10px; font-size: 19px;">On the Gwneud cais am rif EORI page, select the link that says, 'wirio statws cais rydych eisoes wedi'i wneud'. You'll find this link near the end of the page.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Toggle to Welsh using the Cymraeg button near the start of the page. Sign in using your Government Gateway user ID and password.</li>
</ol>
<ol style="margin: 0 0 10px; font-size: 19px;">
<li style="margin: 0 0 10px; font-size: 19px;">Go to GOV.UK and search for 'Get an EORI'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Select the link that says 'Get an EORI number'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">On the Get an EORI number page, select the link that says 'Check the status of an application you’ve already made'. You’ll find this link near the end of the page.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Sign in using your Government Gateway user ID and password.</li>
</ol>

}
}


@template_main(params, s"${applicationComplete(params, "Application Complete")}") {

<p style="margin: 0 0 10px; font-size: 19px;">@salutationFullName(params)</p>
<p style="margin: 0 0 10px; font-size: 19px;">@salutationFullName(params)</p>

<br />
<br />

<p style="margin: 0 0 10px; font-size: 19px;">You can now:</p>
<p style="margin: 0 0 10px; font-size: 19px;">You can now:</p>

@eoriOnly
@eoriOnly

<br />
<br />

<p style="margin: 0 0 30px; font-size: 19px;">From HMRC</p>
<p style="margin: 0 0 30px; font-size: 19px;">From HMRC</p>

}
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ You can now:

Get your EORI number

For security reasons, we cannot send EORI numbers by email. You can obtain your EORI number by following these steps:
For security reasons, we cannot send EORI numbers by email. You can get your EORI number by following these steps.

- Go to GOV.UK and search for, 'Get an EORI'.
- Select the link that says, 'Get an EORI number'.
- On the Get an EORI number page, select the link that says, 'This guide is also available in Welsh (Cymraeg.)'
- On the Cael rhif EORI page, select the link that reads, 'Gwneud cais am rif EORI'
- On the Gwneud cais am rif EORI page, select the link that says, 'wirio statws cais rydych eisoes wedi'i wneud'. You'll find this link near the end of the page.
- Toggle to Welsh using the Cymraeg button near the start of the page. Sign in using your Government Gateway user ID and password.
- Go to GOV.UK and search for 'Get an EORI'.
- Select the link that says 'Apply for EORI'.
- On the Apply for EORI page, select the link that says 'Check the status of an application you’ve already made'. You’ll find this link near the end of the page.
- Sign in using your Government Gateway user ID and password.

About the Customs Declaration Service

Expand All @@ -52,14 +50,12 @@ For more information, search ‘Customs Declaration Service’ on GOV.UK.

Get your EORI number

For security reasons, we cannot send EORI numbers by email. You can obtain your EORI number by following these steps:
For security reasons, we cannot send EORI numbers by email. You can get your EORI number by following these steps.

- Go to GOV.UK and search for, 'Get an EORI'.
- Select the link that says, 'Get an EORI number'.
- On the Get an EORI number page, select the link that says, 'This guide is also available in Welsh (Cymraeg.)'
- On the Cael rhif EORI page, select the link that reads, 'Gwneud cais am rif EORI'
- On the Gwneud cais am rif EORI page, select the link that says, 'wirio statws cais rydych eisoes wedi'i wneud'. You'll find this link near the end of the page.
- Toggle to Welsh using the Cymraeg button near the start of the page. Sign in using your Government Gateway user ID and password.
- Go to GOV.UK and search for 'Get an EORI'.
- Select the link that says 'Get an EORI number'.
- On the Get an EORI number page, select the link that says 'Check the status of an application you’ve already made'. You’ll find this link near the end of the page.
- Sign in using your Government Gateway user ID and password.



Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@*
* Copyright 2023 HM Revenue & Customs
* Copyright 2024 HM Revenue & Customs
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -46,14 +46,14 @@

<h2 style="margin: 30px 0 30px; font-size: 19px;">Cael eich rhif EORI</h2>

<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol:</p>
<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol.</p>

<ol style="margin: 0 0 10px; font-size: 19px;">
<li style="margin: 0 0 10px; font-size: 19px;">Ewch i GOV.UK a chwilio am, 'Get an EORI'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Dewiswch y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Get an EORI number', dewiswch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Cael rhif EORI', dewiswch y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Gwneud cais am rif EORI', dewiswch y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Cliciwch ar y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Get an EORI number', gwasgwch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Cael rhif EORI', cliciwch ar y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Gwneud cais am rif EORI', cliciwch ar y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Gellir toglo i'r Gymraeg drwy bwyso'r botwm ar frig y dudalen. Mewngofnodwch gan ddefnyddio'ch Dynodydd Defnyddiwr (ID) a'ch cyfrinair ar gyfer Porth y Llywodraeth.</li>
</ol>

Expand All @@ -70,14 +70,14 @@ <h2 style="margin: 30px 0 30px; font-size: 19px;">Defnyddio'r Gwasanaeth Datgani

<h2 style="margin: 30px 0 30px; font-size: 19px;">Cael eich rhif EORI</h2>

<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol:</p>
<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol.</p>

<ol style="margin: 0 0 10px; font-size: 19px;">
<li style="margin: 0 0 10px; font-size: 19px;">Ewch i GOV.UK a chwilio am, 'Get an EORI'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Dewiswch y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Get an EORI number', dewiswch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Cael rhif EORI', dewiswch y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Gwneud cais am rif EORI', dewiswch y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Cliciwch ar y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Get an EORI number', gwasgwch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Cael rhif EORI', cliciwch ar y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'</li>
<li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Gwneud cais am rif EORI', cliciwch ar y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.</li>
<li style="margin: 0 0 10px; font-size: 19px;">Gellir toglo i'r Gymraeg drwy bwyso'r botwm ar frig y dudalen. Mewngofnodwch gan ddefnyddio'ch Dynodydd Defnyddiwr (ID) a'ch cyfrinair ar gyfer Porth y Llywodraeth.</li>
</ol>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ Erbyn hyn, gallwch wneud y canlynol:

Cael eich rhif EORI

Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol:
Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol.

- Ewch i GOV.UK a chwilio am, 'Get an EORI'.
- Dewiswch y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.
- Ar y dudalen 'Get an EORI number', dewiswch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'
- Ar y dudalen 'Cael rhif EORI', dewiswch y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'
- Ar y dudalen 'Gwneud cais am rif EORI', dewiswch y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.
- Cliciwch ar y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.
- Ar y dudalen 'Get an EORI number', gwasgwch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'
- Ar y dudalen 'Cael rhif EORI', cliciwch ar y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'
- Ar y dudalen 'Gwneud cais am rif EORI', cliciwch ar y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.
- Gellir toglo i'r Gymraeg drwy bwyso'r botwm ar frig y dudalen. Mewngofnodwch gan ddefnyddio'ch Dynodydd Defnyddiwr (ID) a'ch cyfrinair ar gyfer Porth y Llywodraeth.

Defnyddio'r Gwasanaeth Datganiadau Tollau
Expand All @@ -52,13 +52,13 @@ I gael rhagor o wybodaeth, chwiliwch am ‘Customs Declaration Service’ ar GOV

Cael eich rhif EORI

Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol:
Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol.

- Ewch i GOV.UK a chwilio am, 'Get an EORI'.
- Dewiswch y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.
- Ar y dudalen 'Get an EORI number', dewiswch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'
- Ar y dudalen 'Cael rhif EORI', dewiswch y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'
- Ar y dudalen 'Gwneud cais am rif EORI', dewiswch y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.
- Cliciwch ar y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.
- Ar y dudalen 'Get an EORI number', gwasgwch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'
- Ar y dudalen 'Cael rhif EORI', cliciwch ar y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'
- Ar y dudalen 'Gwneud cais am rif EORI', cliciwch ar y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.
- Gellir toglo i'r Gymraeg drwy bwyso'r botwm ar frig y dudalen. Mewngofnodwch gan ddefnyddio'ch Dynodydd Defnyddiwr (ID) a'ch cyfrinair ar gyfer Porth y Llywodraeth.

}
Expand Down

0 comments on commit 7ac07c5

Please sign in to comment.