diff --git a/components/case/events.js b/components/case/events.js index 07b1716e..958e90d1 100644 --- a/components/case/events.js +++ b/components/case/events.js @@ -30,7 +30,9 @@ const EventsDetails = (props) => {
-

Events

+

+ {t("case:event-title")} +

{eventsArr.map( (item, key) => item.pinswg_eventpublishflag && ( diff --git a/components/case/summary.js b/components/case/summary.js index 93781285..1d8c5243 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -307,8 +307,7 @@ const CaseSummary = (props) => { href="#case-details" onClick={() => setWhichTab("case-details")} > - {" "} - Details{" "} + {t("case:summary-tab-details-label")}
  • { href="#case-summary" onClick={() => setWhichTab("case-summary")} > - {" "} - Summary{" "} + {t("case:summary-tab-summary-label")}
  • {((hasValidKey( @@ -355,8 +353,7 @@ const CaseSummary = (props) => { href="#case-map" onClick={() => setWhichTab("case-map")} > - {" "} - Map{" "} + {t("case:summary-tab-map-label")} )} @@ -376,7 +373,7 @@ const CaseSummary = (props) => { } > {" "} - Events{" "} + {t("case:summary-tab-events-label")} )} @@ -394,8 +391,7 @@ const CaseSummary = (props) => { setWhichTab("case-documents") } > - {" "} - Documents{" "} + {t("case:summary-tab-documents-label")} diff --git a/components/header.js b/components/header.js index 0d1791d8..54e3ac8d 100644 --- a/components/header.js +++ b/components/header.js @@ -19,6 +19,7 @@ const Header = (props) => { "/", "/logout", "/dns", + "/dns/[developmentName]", "/dns/application-process", "/dns/help", "/dns/contact-us", @@ -47,6 +48,7 @@ const Header = (props) => { "/newappeal/[appealtypes]", "/newappeal", "/myportal/dnsapplications", + "/myportal/dns/[developmentName]", "/myportal/dnsdetails", "/myportal/addresssearch", "/myportal/addresssearchresults", diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js index 447260f2..2433cca5 100644 --- a/components/search/dnssearchresults.js +++ b/components/search/dnssearchresults.js @@ -349,7 +349,8 @@ const DNSSearchResults = (props) => { router.locale == "cy" ? myportal == true ? "/fymhorth/dns" - : "/dns" + : "/dns/" + + item.ticketnumber : myportal == true ? "/myportal/dns/" + item.ticketnumber diff --git a/locales/cy/case.json b/locales/cy/case.json index bae2c7de..b399bb57 100644 --- a/locales/cy/case.json +++ b/locales/cy/case.json @@ -1,6 +1,11 @@ { "page-title": "Cyfeirnod", "case-card-title": "Cyfeirnod: APP/B1415/W/20/3271702", + "summary-tab-details-label": "Manylion", + "summary-tab-summary-label": "Crynodeb", + "summary-tab-map-label": " Map", + "summary-tab-events-label": " Digwyddiadau", + "summary-tab-documents-label": "Dogfennau", "summary-reference-label": "Cyfeirnod", "summary-applicant-label": "Apelydd", "summary-applicantonly-label": "Ymgeisydd", @@ -103,6 +108,7 @@ "representation-date-passed-label": "Mae'r cyfnod cyflwyno sylwadau ar gyfer yr apêl hon rhwng {{startDate}} a {{endDate}}", "representation-date-passed-additional-label": "Gallwch wneud sylw drwy e-bostio,", "date-raised": "Dyddiad codi", + "event-title": "Digwyddiadau", "event-name-label": " Enw", "event-event-name-label": "Enw'r digwyddiad ", "event-address-label": "Cyfeiriad ", diff --git a/locales/cy/dnsApplications.json b/locales/cy/dnsApplications.json index 40160df5..9e05a817 100644 --- a/locales/cy/dnsApplications.json +++ b/locales/cy/dnsApplications.json @@ -1,9 +1,9 @@ { "page-title": "Prosiectau Isadeiledd", "page-intro-paragraph-1": "Mae dau fath gwahanol o gais ar gyfer prosiectau seilwaith, sef Datblygiadau o Arwyddocâd Cenedlaethol a Phrosiectau Seilwaith Arwyddocaol.", - "page-intro-list-item-1 ": " Datblygiadau o Arwyddocâd Cenedlaethol yw datblygiadau a ddiffinnir yn ", + "page-intro-list-item-1": " Datblygiadau o Arwyddocâd Cenedlaethol yw datblygiadau a ddiffinnir yn ", "page-intro-list-item-1-link": "https://www.llyw.cymru/datblygiadau-o-arwyddocad-cenedlaethol-dns-ceisiadau", - "page-intro-list-item-2 ": "Mae Prosiectau Seilwaith Arwyddocaol yn ddatblygiadau sydd wedi'u diffinio (YMA)", + "page-intro-list-item-2": "Mae Prosiectau Seilwaith Arwyddocaol yn ddatblygiadau sydd wedi'u diffinio (YMA)", "page-intro-list-item-2-link": "https://www.llyw.cymru/datblygiadau-o-arwyddocad-cenedlaethol-dns-ceisiadau", "page-intro-list-item-3": "Lle penderfynwyd ar gynnig.", "page-intro-paragraph-2": "Defnyddiwch y tabl isod i ddod o hyd i geisiadau fesul cam neu fath. Fel arall, defnyddiwch y map trwy glicio ar y marcwyr i fynd i’r dudalen geisiadau. Mae rhestr o ddigwyddiadau a therfynau amser allweddol ar gyfer pob cais ar gael ar ein ", diff --git a/locales/cy/home.json b/locales/cy/home.json index b0105c58..2e037be8 100644 --- a/locales/cy/home.json +++ b/locales/cy/home.json @@ -24,8 +24,8 @@ "login-card-forgotten-link": "Cliciwch yma", "login-via-gov-gateway-label": "Mewngofnodwch drwy Borth y Llywodraeth", "login-via-nextuth-label": "Mewngofnodwch gyda'ch cyfeiriad e-bost", - "casesearch-card-title ": "Chwilio am achos", - "casesearch-card-search-hint ": "Defnyddiwch gyfeirnod yr achos neu deitl y prosiect Infrastructure i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:", + "casesearch-card-title": "Chwilio am achos", + "casesearch-card-search-hint": "Defnyddiwch gyfeirnod yr achos neu deitl y prosiect Infrastructure i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:", "casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567", "casesearch-card-search-example-label-2": "CAS-12345-A1B2C3", "casesearch-card-button": "Cyflwyno chwiliad", diff --git a/locales/cy/myportal.json b/locales/cy/myportal.json index 396ff7ad..be24bbc4 100644 --- a/locales/cy/myportal.json +++ b/locales/cy/myportal.json @@ -15,8 +15,8 @@ "makenewappeal-card-guidance-link": "https://www.llyw.cymru/arweiniad-ar-apeliadau-cheisiadau", "makenewappeal-card-button-label": "Gwneud apêl newydd", "mycases-card-title": "Fy achosion", - "searchcases-card-title ": "Chwilio am achos", - "searchcases-card-search-hint ": "Defnyddiwch gyfeirnod yr achos neu deitl y prosiect Infrastructure i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:", + "searchcases-card-title": "Chwilio am achos", + "searchcases-card-search-hint": "Defnyddiwch gyfeirnod yr achos neu deitl y prosiect Infrastructure i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:", "searchcases-card-search-example-label-1": "APP-A12345-A-21-1234567", "searchcases-card-search-example-label-2": "CAS-12345-A1B2C3", "searchcases-card-button": "Cyflwyno Chwiliad", diff --git a/locales/en/case.json b/locales/en/case.json index cd19d594..716be3f2 100644 --- a/locales/en/case.json +++ b/locales/en/case.json @@ -1,6 +1,11 @@ { "page-title": "Reference", "case-card-title": "Reference: APP/B1415/W/20/3271702", + "summary-tab-details-label": "Details", + "summary-tab-summary-label": "Summary", + "summary-tab-map-label": "Map", + "summary-tab-events-label": "Events", + "summary-tab-documents-label": "Documents", "summary-reference-label": "Reference", "summary-applicant-label": "Appellant", "summary-applicantonly-label": "Applicant", @@ -103,6 +108,7 @@ "representation-date-passed-label": "The representation period for this appeal is between {{startDate}} and {{endDate}}", "representation-date-passed-additional-label": "You can make a representation by emailing,", "date-raised": "Date raised", + "event-title": "Events", "event-name-label": "Name", "event-event-name-label": "Event name", "event-address-label": "Address",