Merged PR 514: updated with copy amends

Related work items: #6327
This commit is contained in:
Robert Bond
2021-10-15 09:18:57 +00:00
9 changed files with 133 additions and 44 deletions
+14
View File
@@ -135,6 +135,20 @@ export default function Footer(props) {
role="navigation"
aria-labelledby="footer_links"
>
<ul className="govuk-footer__inline-list">
<li className="govuk-footer__inline-list-item govuk-!-font-weight-bold">
<a
href={t(
"common:footer-guidance-link"
)}
className="nav-link"
>
{t(
"common:footer-guidance-link-label"
)}
</a>
</li>
</ul>
<ul
className="govuk-footer__inline-list"
id="footer_links"
+12 -6
View File
@@ -24,6 +24,7 @@ const RenderTextfield = ({
input,
hint1,
hint2,
hint3,
meta: { touched, error },
...custom
}) => {
@@ -37,12 +38,14 @@ const RenderTextfield = ({
}
>
<div id="basicSearch-hint" className="govuk-hint ">
<span className="govuk-body-m">{hint1}</span>
<span className="govuk-body-s">{hint1}</span>
<br />
<span className="govuk-body-s">
{hint2} CAS-00009-W8N6W4
</span>
<p>
<ul className="govuk-body-s">
<li>{hint2} </li>
<li>{hint3}</li>
</ul>
</p>
</div>
<label className="govuk-label " htmlFor={id} id={id + "_label"}>
{label}
@@ -116,7 +119,10 @@ let CaseSearch = (props) => {
aria-describedby="basicSearch-hint"
hint1={t("home:casesearch-card-search-hint")}
hint2={t(
"home:casesearch-card-search-example-label"
"home:casesearch-card-search-example-label-1"
)}
hint3={t(
"home:casesearch-card-search-example-label-2"
)}
/>
+48 -10
View File
@@ -17,21 +17,59 @@ export default function LoginSoon() {
<div className="govuk-form-group govuk-!-margin-top-4">
<p className="govuk-body-s">
{t("home:login-comingsoon-temp-1")}{" "}
<a href={"mailto:" + t("home:login-contact-email")}>
{t("home:login-contact-email")}
</a>
</p>
<p className="govuk-body-s">
{t("home:login-comingsoon-temp-2")}
</p>
<ul>
<li>
<a
target="_blank"
href={t("home:login-comingsoon-forms-link-1")}
rel="noreferrer"
>
{t("home:login-comingsoon-forms-label-1")}
</a>
</li>
<li>
{" "}
<a
target="_blank"
href={t("home:login-comingsoon-forms-link-2")}
rel="noreferrer"
>
{t("home:login-comingsoon-forms-label-2")}
</a>
</li>
<li>
{" "}
<a
target="_blank"
href={t("home:login-comingsoon-forms-link-3")}
rel="noreferrer"
>
{t("home:login-comingsoon-forms-label-3")}
</a>
</li>
<li>
{" "}
<a
target="_blank"
href={t("home:login-comingsoon-forms-link-4")}
rel="noreferrer"
>
{t("home:login-comingsoon-forms-label-4")}
</a>
</li>
</ul>
<br />
<a
target="_blank"
href={t("home:login-comingsoon-forms-link")}
rel="noreferrer"
>
{t("home:login-comingsoon-forms-link")}
</a>
<p className="govuk-body-s">
{t("home:login-comingsoon-email-link-label")}{" "}
<a href={"mailto:" + t("home:login-contact-email")}>
{t("home:login-contact-email")}
</a>
</p>
</div>
</div>
</div>
+4
View File
@@ -21,6 +21,8 @@
"footer-feedback-link": "Adborth",
"footer-copyright-link": "Datganiad hawlfraint",
"footer-alternative-languages-link": "Ieithoedd amgen",
"footer-guidance-link-label": "Canllawiau a gwasanaethau Cynllunio ac Amgylchedd Cymru",
"footer-guidance-link": "https://gov.wales/planning-and-environment-decisions-wales/guidance-services",
"mobile-nav-label": "Dewislen",
"signout-label": "Cofrestrwch allan",
"back-to-top-link": "Nôl i dop y dudalen",
@@ -39,6 +41,8 @@
"logged-out-link": "Dychwelwch i'r porth Gwaith Achos Cynllunio",
"404-not-found-title": "404 - heb ei ddarganfod",
"404-not-found-link": "Ewch yn ôl adref",
"error-page-title": "Gwall",
"error-page-message": "Digwyddodd gwall ar y cleient",
"cookie-banner-line-1": "Ry'n ni wedi cadw ffeiliau a elwir yn cwcis ar eich dyfais. Mae'r cwcis hyn:",
"cookie-banner-list-item-1": "yn hanfodol i'r safle weithio",
"cookie-banner-line-2": "Byddem hefyd yn hoffi cadw rhai cwcis i'n helpu ni:",
+22 -13
View File
@@ -1,9 +1,17 @@
{
"login-card-title-temp": "Croeso",
"login-comingsoon-temp-1": "Maer wefan hon yn cael ei datblygu o hyd. Os hoffech gyflwyno apêl neu gais newydd, neu wneud sylwadau ar un sydd eisoes yn bodoli, cyflwynwch yr apêl, y cais neur sylwadau, ynghyd ag unrhyw ddogfennau cysylltiedig perthnasol, i ",
"login-comingsoon-temp-2": "Gellir gofyn am ffurflenni apelio a ffurflenni cais trwy e-bost neu gellir eu lawrlwytho trwy ddilyn y ddolen isod. ",
"login-comingsoon-forms-link": "https://llyw.cymru/ffurflenni-apelio",
"login-contact-email": "PEDW.GwaithAchos@llyw.cymru",
"login-card-title-temp": "Apeliadau neu geisiadau newydd",
"login-comingsoon-temp-1": "Mae'r gwasanaeth hwn yn cael ei ddatblygu i gefnogi apeliadau a cheisiadau ar-lein.",
"login-comingsoon-temp-2": "Wrth i ni ddatblygu darganfyddiad y gwasanaeth ar-lein:",
"login-comingsoon-forms-link-1": "https://llyw.cymru/ffurflenni-apelio",
"login-comingsoon-forms-label-1": "apêl cynllunio a ffurflenni cais",
"login-comingsoon-forms-link-2": "https://llyw.cymru/trwyddedau-amgylcheddol",
"login-comingsoon-forms-label-2": "ffurflenni apêl trwydded amgylcheddol",
"login-comingsoon-forms-link-3": "https://llyw.cymru/tir-comin",
"login-comingsoon-forms-label-3": "cyflawni gwaith ar dir comin",
"login-comingsoon-forms-link-4": "https://llyw.cymru/datblygiadau-o-arwyddocad-cenedlaethol-dns-ffurflenni",
"login-comingsoon-forms-label-4": "Datblygiadau ffurflenni Arwyddocâd Cenedlaethol",
"login-comingsoon-email-link-label": "Gallwch hefyd ofyn am ffurflenni trwy e-bost",
"login-contact-email": "pedw.gwaithachos@llyw.cymru",
"login-card-title": "Mewngofnodi i apelio yn erbyn penderfyniad cynllunio",
"login-card-id-label": "Dynodydd Defnyddiwr (ID) Porth y Llywodraeth",
"login-card-id-hint": "Gallai hyn fod hyd at 12 o gymeriadau.",
@@ -13,20 +21,21 @@
"login-card-register-link": "Gofrestru",
"login-card-forgotten-label": "Rwyf wedi anghofio fy nghyfrinair",
"login-card-forgotten-link": "Cliciwch yma",
"casesearch-card-title": "Chwilio am ddogfennau apêl",
"casesearch-card-search-hint": "Chwiliwch drwy roi cyfeirnod 7 digid yr achos",
"casesearch-card-search-example-label": "Enghraifft:",
"casesearch-card-title": "Chwilio apeliadau a Datblygiadau o Arwyddocâd Cenedlaethol",
"casesearch-card-search-hint": "Rhaid i chi ddefnyddio cyfeirnod yr achos i chwilio. Bydd hyn 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",
"casesearch-card-advanced-link": "Fel arall, gallwch chwilio gan ddefnyddio ein meini prawf eraill gyda'n chwiliad uwch",
"casesearch-search-validation-required": "Angenrheidiol",
"casesearch-search-validation-minlength": "Rhaid bod yn 4 nod neu fwy",
"casescomment-card-title": "Cyflwyno neu Wneud Sylwadau ar Apêl/Cais",
"casescomment-card-paragraph-one": "Os hoffech gyflwyno apêl neu gais newydd, neu wneud sylwadau ar un sydd eisoes yn bodoli, cyflwynwch yr apêl, y cais neur sylwadau, ynghyd ag unrhyw ddogfennau cysylltiedig perthnasol, i ",
"casescomment-card-paragraph-two": "O ran apeliadau Deiliaid Tai a Masnachol, ni all partïon â buddiant wneud sylwadau yn ystod y cam apêl. Bydd unrhyw sylwadau a wnaed yn ystod y cam ymgeision cael eu darparu gan yr awdurdod cynllunio lleol au hystyried gan yr arolygydd.",
"casescomment-card-title": "Rhowch sylwadau ar apêl",
"casescomment-card-paragraph-one": "Rhowch sylwadau ar apêl trwy e-bostio ",
"casescomment-card-paragraph-two": "Ar gyfer apeliadau deiliaid tai a masnachol, ni all partïon â diddordeb wneud sylwadau yn y cam apelio. Bydd unrhyw sylwadau a wneir yn ystod y cam ymgeisio yn cael eu darparu gan yr awdurdod cynllunio lleol a'u hystyried gan yr arolygydd.",
"inspectorate-card-visit-label": "Ymweld Yr Arolygiaeth Gynllunio",
"inspectorate-card-visit-link": "Hafan",
"inspectorate-card-alt-text": "Yr Arolygiaeth Gynllunio",
"dns-card-title": "Datblygiadau o Arwyddocâd Cenedlaethol",
"dns-card-paragraph": "Mae Datblygiad o Arwyddocâd Cenedlaethol (DAC) yn fath o gais cynllunio ar gyfer prosiect seilwaith mawr sydd o bwysigrwydd cenedlaethol yng Nghymru. Yn y fan hon, gallwch gael gwybod am geisiadau DAC arfaethedig.",
"dns-card-title": "Gweld yr holl Ddatblygiadau o Arwyddocâd Cenedlaethol",
"dns-card-paragraph": "Mae Datblygiad o Arwyddocâd Cenedlaethol yn fath o gais cynllunio ar gyfer prosiect seilwaith mawr o bwysigrwydd cenedlaethol.",
"dns-card-button": "Gweld pob cais"
}
+4
View File
@@ -21,6 +21,8 @@
"footer-feedback-link": "Give feedback about this page",
"footer-copyright-link": "Copyright statement",
"footer-alternative-languages-link": "Alternative languages",
"footer-guidance-link-label": "Planning and Environment Decisions Wales guidance and services",
"footer-guidance-link": "https://gov.wales/planning-and-environment-decisions-wales/guidance-services",
"mobile-nav-label": "Menu",
"signout-label": "Sign out",
"back-to-top-link": "Back to top",
@@ -39,6 +41,8 @@
"logged-out-link": "Return to Planning Casework portal",
"404-not-found-title": "404 - not found",
"404-not-found-link": "Go back home",
"error-page-title": "Error",
"error-page-message": "An error occurred on the client",
"cookie-banner-line-1": "We've saved some files called cookies on your device. These cookies are:",
"cookie-banner-list-item-1": "essential for the site to work",
"cookie-banner-line-2": "We would also like to save some cookies to help:",
+22 -13
View File
@@ -1,9 +1,17 @@
{
"login-card-title-temp": "Welcome",
"login-comingsoon-temp-1": "This website is still in development, if you wish to submit a new appeal or application please submit it, along with any relevant associated documentation, to ",
"login-comingsoon-temp-2": "Appeal and application forms can be requested by e-mail or downloaded following the below link.",
"login-comingsoon-forms-link": "https://gov.wales/planning-appeal-forms",
"login-contact-email": "PEDW.Casework@gov.wales",
"login-card-title-temp": "New appeals or applications",
"login-comingsoon-temp-1": "This service is being developed to support online appeals and applications.",
"login-comingsoon-temp-2": "While we develop the online service find:",
"login-comingsoon-forms-link-1": "https://gov.wales/planning-appeal-forms",
"login-comingsoon-forms-label-1": "planning appeal and application forms",
"login-comingsoon-forms-link-2": "https://gov.wales/environmental-permits",
"login-comingsoon-forms-label-2": "environmental permit appeal forms",
"login-comingsoon-forms-link-3": "https://gov.wales/common-land",
"login-comingsoon-forms-label-3": "carrying out works on common land",
"login-comingsoon-forms-link-4": "https://gov.wales/developments-national-significance-dns-forms",
"login-comingsoon-forms-label-4": "Developments of National Significance (DNS) forms",
"login-comingsoon-email-link-label": "You can also request forms by email",
"login-contact-email": "pedw.casework@gov.wales",
"login-card-title": "Sign in to appeal a planning decision",
"login-card-id-label": "Government Gateway user ID",
"login-card-id-hint": "This could be up to 12 characters.",
@@ -13,20 +21,21 @@
"login-card-register-link": "Register",
"login-card-forgotten-label": "I have forgotten my password",
"login-card-forgotten-link": "Click here",
"casesearch-card-title": "Appeal documentation search",
"casesearch-card-search-hint": "Search by entering the 7 digit case reference number",
"casesearch-card-search-example-label": "Example:",
"casesearch-card-title": "Search appeals and Developments of National Significance",
"casesearch-card-search-hint": "You must use the case reference number to search. This will be similar to one of the following:",
"casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567",
"casesearch-card-search-example-label-2": "CAS-12345-A1B2C3",
"casesearch-card-button": "Submit search",
"casesearch-card-advanced-link": "Advanced search",
"casesearch-search-validation-required": "Required",
"casesearch-search-validation-minlength": "Must be 4 characters or more",
"casescomment-card-title": "Lodge or Comment on an Appeal/Application",
"casescomment-card-paragraph-one": "If you wish to submit a new appeal or application, or comment on an existing one, please submit it, along with any relevant associated documentation, to ",
"casescomment-card-paragraph-two": "For Householder and Commercial appeals, interested parties are unable to make representations at appeal stage. Any representations made at application stage will be provided by the local planning authority and considered by the inspector.",
"casescomment-card-title": "Comment on an appeal ",
"casescomment-card-paragraph-one": "Comment on an appeal by emailing ",
"casescomment-card-paragraph-two": "For householder and commercial appeals, interested parties are unable to comment at appeal stage. Any comments made at application stage will be provided by the local planning authority and considered by the inspector.",
"inspectorate-card-visit-label": "Visit the Planning Inspectorate",
"inspectorate-card-visit-link": "Home",
"inspectorate-card-alt-text": "The Planning Inspectorate",
"dns-card-title": "Developments of National Significance",
"dns-card-paragraph": "A Development of National Significance (DNS) is a type of planning application for a large infrastructure project of national importance in Wales. Here you can find out about proposed DNS applications.",
"dns-card-title": "View all Developments of National Significance ",
"dns-card-paragraph": "A Development of National Significance is a type of planning application for a large infrastructure project of national importance.",
"dns-card-button": "View all applications"
}
+2 -2
View File
@@ -24,11 +24,11 @@ function Error({ statusCode }, props) {
<main className="govuk-main-wrapper govuk-!-padding-top-9 govuk-!-padding-bottom-9">
<div className="govuk-grid-row">
<div className="govuk-grid-column-two-thirds ">
<h1>Error</h1>
<h1>{t("common:error-page-title")}</h1>
<p className="govuk-body">
{statusCode
? `An error ${statusCode} occurred on server`
: "An error occurred on the client"}
: t("common:error-page-message")}
</p>
<Link href="/">
<a>Go back home</a>
+5
View File
@@ -480,6 +480,11 @@ textarea,
}
}
}
#footer_links {
border-top: solid 2px #ddd;
padding-top: 15px;
}
}
#footer_logo {