From 795dc5a39d746adcbda4b72ec4cc51173b8d2832 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Fri, 9 Aug 2024 13:14:54 +0100 Subject: [PATCH] copy changes from review --- components/elements/index.js | 12 ++++++++---- components/myportal/makenewappeal.js | 17 +++++++++++++++++ components/newappeal/aboutyou.js | 15 ++++++++++++--- data/crmfieldlookuptranslations.json | 4 ++-- data/formsxml/commercialappealcas.xml | 2 +- data/formsxml/householderappealhas.xml | 2 +- data/formsxml/planningappeals78.xml | 2 +- locales/cy/account.json | 2 +- locales/cy/myportal.json | 7 +++++-- locales/cy/newappeal.json | 11 ++++++----- locales/cy/search.json | 6 +++--- locales/en/account.json | 2 +- locales/en/myportal.json | 7 +++++-- locales/en/newappeal.json | 11 ++++++----- locales/en/search.json | 6 +++--- pages/api/auth/[...nextauth].js | 2 +- 16 files changed, 73 insertions(+), 35 deletions(-) diff --git a/components/elements/index.js b/components/elements/index.js index 77069f32..acfb19a0 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -270,7 +270,8 @@ export function MultiLinefield(props) { {props.hasOwnProperty("hint") && props.hint != false && t(props.hint)}{" "} - Do not include personal or financial information. +
+ {t("newappeal:new-appeal-multiline-pid")} + {t("newappeal:new-appeal-multiline-pid")} + {t("newappeal:new-appeal-multiline-pid")} + {t("newappeal:new-appeal-multiline-pid")} {t("myportal:makenewappeal-card-paragraph-three")}

+
    +
  • + {" "} + {t( + "myportal:makenewappeal-card-paragraph-three-bullet-one" + )} +
    • +
  • + {" "} + {t( + "myportal:makenewappeal-card-paragraph-three-bullet-two" + )} +
    • +
+

+ {t("myportal:makenewappeal-card-paragraph-four")} +

); diff --git a/components/newappeal/aboutyou.js b/components/newappeal/aboutyou.js index 05483cdf..c81be533 100644 --- a/components/newappeal/aboutyou.js +++ b/components/newappeal/aboutyou.js @@ -177,7 +177,6 @@ const RenderRadio = ({ }) => { let { t } = useTranslation(); const required = (value) => (value ? undefined : "Required"); - return ( <>
{label} - {(custom.hint != false || custom.hint != undefined) && ( + {custom.hint != undefined && (
- {custom.hint} + {custom.hint.indexOf("{{p}}") < 0 ? ( +

{custom.hint}

+ ) : ( + <> +

+ {custom.hint.split("{{p}}")[0]} +
+ {custom.hint.split("{{p}}")[1]} +

+ + )}
)} diff --git a/data/crmfieldlookuptranslations.json b/data/crmfieldlookuptranslations.json index 05c60bd5..efd62db8 100644 --- a/data/crmfieldlookuptranslations.json +++ b/data/crmfieldlookuptranslations.json @@ -2253,8 +2253,8 @@ "value_cy": "Maint safle cyffredinol yr apęl (mewn hectarau)" }, { - "value": "What is the area of floor space proposed? (in square metres). If no new floor space is proposed, please enter 0.", - "value_cy": "Beth yw arwynebedd y llawr a gynigir? (mewn metrau sgwâr). Os na chynigir arwynebedd llawr newydd, nodwch 0." + "value": "What is the area of floor space proposed (in square metres)? If no new floor space enter 0.", + "value_cy": "Beth yw arwynebedd y llawr a gynigir (mewn metrau sgwâr)? Os nad oes arwynebedd llawr newydd rhowch 0." }, { "value": "Is flooding an issue?", diff --git a/data/formsxml/commercialappealcas.xml b/data/formsxml/commercialappealcas.xml index 38cf3fb2..909d2df2 100644 --- a/data/formsxml/commercialappealcas.xml +++ b/data/formsxml/commercialappealcas.xml @@ -245,7 +245,7 @@ - diff --git a/data/formsxml/householderappealhas.xml b/data/formsxml/householderappealhas.xml index 768bdd33..35d322f7 100644 --- a/data/formsxml/householderappealhas.xml +++ b/data/formsxml/householderappealhas.xml @@ -124,7 +124,7 @@ - diff --git a/data/formsxml/planningappeals78.xml b/data/formsxml/planningappeals78.xml index ccd9ec05..dd795819 100644 --- a/data/formsxml/planningappeals78.xml +++ b/data/formsxml/planningappeals78.xml @@ -110,7 +110,7 @@ - diff --git a/locales/cy/account.json b/locales/cy/account.json index 404eb10b..5f2af72b 100644 --- a/locales/cy/account.json +++ b/locales/cy/account.json @@ -53,7 +53,7 @@ "account-your-address-label": "Beth yw eich cyfeiriad?", "account-address-line-1-label": "Llinell cyfeiriad 1", "account-address-line-2-label": "Llinell cyfeiriad 2", - "account-town-city-label": "Tref/Dinas", + "account-town-city-label": "Tref neu ddinas", "account-county-label": "Sir", "account-postcode-label": "Côd post", "account-complete-para-1": "Mae eich manylion wedi'u diweddaru", diff --git a/locales/cy/myportal.json b/locales/cy/myportal.json index 1c1ee6c4..ddef187c 100644 --- a/locales/cy/myportal.json +++ b/locales/cy/myportal.json @@ -5,8 +5,11 @@ "makenewappeal-card-title": "Gwneud apêl newydd", "makenewappeal-card-paragraph-one": "Cyn cyflwyno apêl newydd, gwnewch yn siŵr eich bod wedi darllen y cyfan", "makenewappeal-card-link": "berthnasol i'r math o apêl sydd gennych.", - "makenewappeal-card-paragraph-two": "Wedi i chi glicio'r botwm 'gwneud apêl newydd' isod, cewch eich arwain drwy broses i'ch helpu i ddewis y math cywir o apêl.", - "makenewappeal-card-paragraph-three": "Dim ond yn erbyn Gwrthod Caniatâd Cynllunio neu Fethiant i Benderfynu o fewn amser i'r Porth Gwaith Achos hwn y gallwch chi Gyflwyno apêl. Rhaid cyflwyno pob apêl arall trwy e-bost neu'r post.", + "makenewappeal-card-paragraph-two": "Unwaith y byddwch wedi dewis y botwm 'Gwneud apêl newydd', cewch eich arwain trwy broses i'ch helpu i ddewis y math cywir o apêl.", + "makenewappeal-card-paragraph-three": "Dim ond yn erbyn y gallwch chi Gyflwyno apêl:", + "makenewappeal-card-paragraph-three-bullet-one": "gwrthod caniatâd cynllunio", + "makenewappeal-card-paragraph-three-bullet-two": "methiant i benderfynu o fewn amser", + "makenewappeal-card-paragraph-four": "Rhaid cyflwyno pob apêl arall trwy e-bost neu'r post.", "makenewappeal-card-link-label": "arweiniad", "makenewappeal-card-guidance-link": "https://www.llyw.cymru/arweiniad-ar-apeliadau-cheisiadau", "makenewappeal-card-button-label": "Gwneud apêl newydd", diff --git a/locales/cy/newappeal.json b/locales/cy/newappeal.json index 281a6205..d6dd9c2f 100644 --- a/locales/cy/newappeal.json +++ b/locales/cy/newappeal.json @@ -13,7 +13,7 @@ "yes-option-label": "Ydw", "no-option-label": "Na", "select-an-option-label": "Dewiswch opsiwn", - "appeal-confirmation-label": "Cadarnhaf fy mod yn apelio yn erbyn cynllunio neu ddiffyg penderfyniad", + "appeal-confirmation-label": "Cadarnhaf fy mod yn gwneud apêl yn erbyn penderfyniad i wrthod caniatâd cynllunio neu fethiant i benderfynu ar gais cynllunio o fewn 8 wythnos.", "select-to-confirm-label": "Cadarnhau i barhau", "is-required-label": "Yn ofynnol", "invalid-postcode-label": "Cod post annilys", @@ -25,7 +25,7 @@ "about-you-who-can-appeal-label": "Pwy all apelio?", "about-you-who-can-appeal-paragraph": "Dim ond y rhai a enwir fel ymgeisydd ar y ffurflen gais wreiddiol all gyflwyno apêl. Os ydych yn cyflwyno apêl ar ran cwmni, nodwch enw’r cwmni yr ydych yn ei gynrychioli", "about-you-who-are-you-label": "Ai chi yw'r apelydd neu asiant sy'n gweithredu ar ran yr apelydd?", - "about-you-who-are-you-hint-label": "Os ydych yn cyflwyno ar ran yr apelydd, marciwch eich hun fel Asiant. Sylwch, os rhowch fanylion yr asiant, bydd yr holl ohebiaeth yn cael ei hanfon at yr asiant", + "about-you-who-are-you-hint-label": "Os ydych yn cyflwyno ar ran yr apelydd, nodwch eich hun fel asiant.{{p}}Os rhowch fanylion yr asiant, bydd yr holl ohebiaeth yn cael ei hanfon at yr asiant.", "about-you-who-are-you-label-appellant": "Apelydd", "about-you-who-are-you-label-agent": "Asiant", "about-you-appellant-contact-details": "Manylion cyswllt yr Apelydd", @@ -49,12 +49,12 @@ "about-you-agent-language-preferences-label": "Dewis iaith", "about-you-agent-language-preferences-value-english": "Saesneg", "about-you-agent-language-preferences-value-welsh": "Cymraeg", - "about-you-communication-disclaimer-label": "Bydd cyfathrebu trwy e-bost rhagosodedig. Os byddai'n well gennych gyfathrebu drwy'r post yna cysylltwch â ni. Byddwch yn ymwybodol y gall cyfathrebu drwy'r post fod yn arafach.", + "about-you-communication-disclaimer-label": "Bydd cyfathrebu trwy e-bost. Cysylltwch â ni os byddai'n well gennych gyfathrebu drwy'r post.", "new-appeal-progress-nav-label": "Cynnydd", "new-appeal-documentlist-nav": "Angen dogfen", "new-appeal-introduction-paragraph": "Mae’r ffurflen hon ar gyfer apelio yn erbyn penderfyniad i wrthod cais cynllunio, yn erbyn penderfyniad i ganiatáu cais gydag amodau yr ydych yn eu gwrthwynebu, neu yn erbyn methiant yr Awdurdod Cynllunio Lleol i roi penderfyniad o fewn y cyfnod priodol, heb gynnwys Deiliad Tai. ceisiadau.", "new-appeal-introduction-warning-paragraph": "RHYBUDD: Rhaid i’ch apêl gyrraedd Penderfyniadau Cynllunio ac Amgylchedd Cymru o fewn 6 mis i ddyddiad hysbysiad o benderfyniad yr awdurdod cynllunio lleol. (NODER: Os na fyddwn yn derbyn unrhyw rai o’r “Dogfennau ategol hanfodol” o fewn y cyfnod apelio, ni fydd yr apêl yn cael ei derbyn).", - "new-appeal-development-description-hint": "Nodwch fanylion y datblygiad arfaethedig. Dylid cymryd hwn fel arfer o’r ffurflen gais cynllunio, ond os cafodd y cais ei adolygu tra’r oedd gyda’r ACLl i’w ystyried, gallwch nodi disgrifiad o’r cynllun diwygiedig. Amgaewch gopi o gytundeb yr ACLl i’r newid.", + "new-appeal-development-description-hint": "Nodwch fanylion y datblygiad arfaethedig o'r ffurflen gais cynllunio. Os cafodd y cais ei ddiwygio tra’r oedd gyda’r ACLl nodwch fanylion y cynllun diwygiedig ac amgaewch gopi o gytundeb yr ACLl i’r newid.", "new-appeal-ownership-hint": "Mae angen i ni wybod pwy sy'n berchen ar safle'r apźl. Os nad ydych yn berchen ar safle'r apźl neu os mai dim ond rhan ohono rydych yn berchen arno, mae angen i ni wybod enw(au) y perchennog(perchnogion) neu'r rhan-berchennog/perchnogion. Mae angen i ni hefyd fod yn siŵr bod y perchennog/perchnogion eraill yn gwybod eich bod wedi gwneud apêl. Cyfeiriwch at y nodiadau canllaw ar lenwi'r adran hon.", "new-appeal-ownership-option-NA": "Amherthnasol", "new-appeal-ownership-option-A": "Tystysgrif A - (Os mai chi yw unig berchennog safle cyfan yr apźl, mae tystysgrif A yn gymwys). Tystiaf, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, nad oedd neb ac eithrio’r apelydd, yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o’r tir y mae’r apêl yn ymwneud ag ef", @@ -85,5 +85,6 @@ "new-appeal-complete-paragraph-2": "Pan fyddwn yn derbyn eich ffurflen apêl, byddwn yn ysgrifennu atoch i roi gwybod i chi a yw eich apêl yn ddilys, pwy sy'n delio â hi a beth sy'n digwydd nesaf.", "new-appeal-complete-paragraph-3": "Dylid anfon unrhyw ymholiadau ynghylch y ddogfen/cyhoeddiad hwn atom yn y cyfeiriad uchod neu drwy e-bost", "new-appeal-complete-paragraph-4": "Sylwch y gallwch wirio am ddiweddariadau ar ein gwasanaeth presennol yn", - "new-appeal-complete-back-link": "Yn ôl i Fy Mhorth" + "new-appeal-complete-back-link": "Yn ôl i Fy Mhorth", + "new-appeal-multiline-pid": "Peidiwch â chynnwys gwybodaeth bersonol neu ariannol" } \ No newline at end of file diff --git a/locales/cy/search.json b/locales/cy/search.json index 3ddde777..5db7f6aa 100644 --- a/locales/cy/search.json +++ b/locales/cy/search.json @@ -4,7 +4,7 @@ "casereference-label": "Cyfeirnod yr achos", "sitelocation-legend": "Lleoliad y Safle", "address-line-one-label": "Llinell gyntaf y cyfeiriad", - "town-label": "Tref/Dinas (agosaf)", + "town-label": "Tref neu ddinas (agosaf)", "county-label": "Sir", "postcode-label": "Cod Post", "lpa-label": "Awdurdod Cynllunio Lleol", @@ -26,7 +26,7 @@ "case-type-option-12": "Apeliadau cynllunio adeiladau rhestredig ac ardal gadwraeth", "advanced-search-title-label": "Chwiliad manwl", "address-search-title-label": "Chwilio am achosion yn ôl cyfeiriad", - "applicant-label": "Apelydd neu Ymgeisydd", + "applicant-label": "Apelydd neu ymgeisydd", "other-party-label": "Parti Arall", "hearing-date-label": "Dyddiad y Gwrandawaid/Ymchwiliad", "site-visit-date-label": "Dyddiad yr Ymweliad a’r Safle", @@ -55,7 +55,7 @@ "searchresults-case-reference-label": "Cyfeirnod yr Achos", "searchresults-case-count-label": "Fe wnaethoch chi chwilio am", "searchresults-site-address-label": "Cyfeiriad y Safle", - "searchresults-applicant-label": "Apelydd neu Ymgeisydd", + "searchresults-applicant-label": "Apelydd neu ymgeisydd", "searchresults-authority-label": "ACLl", "searchresults-case-type-label": "Math o Achos", "searchresults-status-label": "Statws", diff --git a/locales/en/account.json b/locales/en/account.json index 39be02ae..e0f488da 100644 --- a/locales/en/account.json +++ b/locales/en/account.json @@ -53,7 +53,7 @@ "account-your-address-label": "What is your address?", "account-address-line-1-label": "Address line 1", "account-address-line-2-label": "Address line 2", - "account-town-city-label": "Town/City", + "account-town-city-label": "Town or city", "account-county-label": "County", "account-postcode-label": "Postcode", "account-complete-para-1": "Your details have been updated", diff --git a/locales/en/myportal.json b/locales/en/myportal.json index 48b2ad1f..a2af3d72 100644 --- a/locales/en/myportal.json +++ b/locales/en/myportal.json @@ -5,8 +5,11 @@ "makenewappeal-card-title": "Make a new appeal", "makenewappeal-card-paragraph-one": "Before submitting a new appeal, please ensure you have read all of the", "makenewappeal-card-link": "relevant to your appeal type.", - "makenewappeal-card-paragraph-two": "Once you click the 'make a new appeal' button below you will be guided through a process to help you select the correct appeal type", - "makenewappeal-card-paragraph-three": "You can only Submit an appeal against a Refusal of planning Permission or Failure to determine within time via this Casework Portal. All other appeals must be submitted via Email or post.", + "makenewappeal-card-paragraph-two": "Once you have selected the 'Make a new appeal' button, you will be guided through a process to help you choose the right type of appeal.", + "makenewappeal-card-paragraph-three": "You can only Submit an appeal against:", + "makenewappeal-card-paragraph-three-bullet-one": "a refusal of planning permission", + "makenewappeal-card-paragraph-three-bullet-two": "failure to determine within time", + "makenewappeal-card-paragraph-four": "All other appeals must be submitted via email or post.", "makenewappeal-card-link-label": "guidance", "makenewappeal-card-guidance-link": "https://www.gov.wales/planning-appeals-guidance", "makenewappeal-card-button-label": "Make a new appeal", diff --git a/locales/en/newappeal.json b/locales/en/newappeal.json index a29e7f17..f957d2d7 100644 --- a/locales/en/newappeal.json +++ b/locales/en/newappeal.json @@ -12,7 +12,7 @@ "yes-option-label": "Yes", "no-option-label": "No", "select-an-option-label": "Select an option", - "appeal-confirmation-label": "I confirm that I am making an appeal against planning or non determination", + "appeal-confirmation-label": "I confirm that I am making an appeal against a refusal of planning permission or failure to determine a planning application within 8 weeks.", "select-to-confirm-label": "Confirm to continue", "is-required-label": "Is required", "invalid-postcode-label": "Invalid postcode", @@ -24,7 +24,7 @@ "about-you-who-can-appeal-label": "Who can appeal?", "about-you-who-can-appeal-paragraph": "Only those named as an applicant on the original application form can submit an appeal. If you are submitting an appeal on behalf of a company, state the name of the company you are representing", "about-you-who-are-you-label": "Are you the appellant or an agent acting on behalf of the appellant?", - "about-you-who-are-you-hint-label": "If you are submitting on behalf of the appellant, mark yourself as an Agent. Please note that if you enter agent details all correspondence will be sent to the agent", + "about-you-who-are-you-hint-label": "If you are submitting on behalf of the appellant, mark yourself as an agent.{{p}}If you enter agent details all correspondence will be sent to the agent.", "about-you-who-are-you-label-appellant": "Appellant", "about-you-who-are-you-label-agent": "Agent", "about-you-appellant-contact-details": "Contact details for Appellant", @@ -48,12 +48,12 @@ "about-you-agent-language-preferences-label": "Language preference", "about-you-agent-language-preferences-value-english": "English", "about-you-agent-language-preferences-value-welsh": "Welsh", - "about-you-communication-disclaimer-label": "Communication will be by default email. If you would prefer postal communication then please contact us. Please be aware that postal communication may be slower.", + "about-you-communication-disclaimer-label": "Communication will be by email. Contact us if you would prefer postal communication.", "new-appeal-progress-nav-label": "Progress", "new-appeal-documentlist-nav": "Documents needed", "new-appeal-introduction-paragraph": "This form is to appeal against a decision to refuse a planning application, against a decision to grant an application subject to conditions to which you object, or against the failure of the Local Planning Authority to give a decision within the appropriate period, not including Householder applications.", "new-appeal-introduction-warning-paragraph": "WARNING: Your appeal must reach Planning and Environment Decisions Wales within 6 months of the date of the Local Planning authority’s decision notice. (NOTE: If any of the “Essential supporting documents” are not received by us within the appeal period, the appeal will not be accepted).", - "new-appeal-development-description-hint": "Please enter details of the proposed development. This should normally be taken from the planning application form, but if the application was revised while it was with the LPA for consideration, you may enter a description of the revised scheme. Please enclose a copy of the LPA’s agreement to the change.", + "new-appeal-development-description-hint": "Enter details of the proposed development from the planning application form. If the application was revised while it was with the LPA enter details of the revised scheme and enclose a copy of the LPA’s agreement to the change.", "new-appeal-ownership-hint": "We need to know who owns the appeal site. If you do not own the appeal site or if you own only part of it, we need to know the name(s) of the owner(s) or part owner(s). We also need to be sure that the other owner(s) know that you have made an appeal. Please refer to the guidance notes on completing this section.", "new-appeal-ownership-option-NA": "Not applicable", "new-appeal-ownership-option-A": "Certificate A - (If you are the sole owner of the whole appeal site, certificate A applies). I certify that, on the day 21 days before the date of this appeal, nobody except the appellant, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates", @@ -84,5 +84,6 @@ "new-appeal-complete-paragraph-2": "When we receive your appeal form, we will write to you letting you know if your appeal is valid, who is dealing with it and what happens next.", "new-appeal-complete-paragraph-3": "Any enquiries regarding this document/publication should be sent to us at the address above or e-mail", "new-appeal-complete-paragraph-4": "Please note you can check for updates on our current service at", - "new-appeal-complete-back-link": "Back to My Portal" + "new-appeal-complete-back-link": "Back to My Portal", + "new-appeal-multiline-pid": "Do not include personal or financial information." } \ No newline at end of file diff --git a/locales/en/search.json b/locales/en/search.json index 628d34fe..067bc5f5 100644 --- a/locales/en/search.json +++ b/locales/en/search.json @@ -4,7 +4,7 @@ "casereference-label": "Case reference", "sitelocation-legend": "Site location", "address-line-one-label": "First line of address", - "town-label": "Town/City (nearest)", + "town-label": "Town or city (nearest)", "county-label": "County", "postcode-label": "Postcode", "lpa-label": "Local Planning Authority", @@ -26,7 +26,7 @@ "case-type-option-12": "Planning Listed Building and Conservation Area Appeals", "advanced-search-title-label": "Advanced search", "address-search-title-label": "Search for cases by address", - "applicant-label": "Appellant or Applicant", + "applicant-label": "Appellant or applicant", "other-party-label": "Other Party", "hearing-date-label": "Hearing/Enquiry date", "site-visit-date-label": "Site visit date", @@ -55,7 +55,7 @@ "searchresults-case-reference-label": "Case reference", "searchresults-case-count-label": "You searched for", "searchresults-site-address-label": "Site address", - "searchresults-applicant-label": "Appellant or Applicant", + "searchresults-applicant-label": "Appellant or applicant", "searchresults-authority-label": "Authority", "searchresults-case-type-label": "Case type", "searchresults-status-label": "Status", diff --git a/pages/api/auth/[...nextauth].js b/pages/api/auth/[...nextauth].js index 596be084..fdc2a342 100644 --- a/pages/api/auth/[...nextauth].js +++ b/pages/api/auth/[...nextauth].js @@ -201,7 +201,7 @@ const authOptions = (locale, req, res) => { } ) //.then((response) => console.log(response)) - .catch((error) => consoleLogger(err)); + .catch((error) => consoleLogger(error)); }, }), ],