From 6a1ee7a5d3669180557ac08ba13ae7fb7ba93081 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 25 Oct 2021 16:29:36 +0100 Subject: [PATCH] added in welsh translations and spot check 2 --- .env.local | 4 +- components/account/registerCheck.js | 107 ++++++++---- components/account/registerComplete.js | 16 +- components/account/registerform.js | 154 ++++++++++++------ components/breadcrumbs.js | 2 +- components/case/summary.js | 4 +- components/footer.js | 103 +++++++----- components/header.js | 23 ++- components/homepage/casecomment.js | 5 +- components/homepage/casesearch.js | 38 +++-- components/homepage/dns.js | 2 +- components/homepage/login.js | 8 +- components/homepage/loginSoon.js | 9 +- components/main.js | 4 +- components/search/dnssearchresults.js | 1 - data/crmfieldlookuptranslations.json | 2 +- data/lookuptranslations.json | 20 +-- i18n.js | 37 +++++ i18n.json | 95 ----------- locales/cy/account.json | 41 +++++ locales/cy/case.json | 6 +- locales/cy/common.json | 28 ++-- locales/cy/cookies.json | 14 +- locales/cy/dnsApplications.json | 4 +- locales/cy/home.json | 10 +- locales/cy/myportal.json | 2 +- locales/cy/search.json | 8 +- locales/en/account.json | 41 +++++ locales/en/common.json | 20 ++- locales/en/dnsApplications.json | 2 +- locales/en/search.json | 2 +- next.config.js | 4 + pages/_document.js | 3 +- pages/account/register.js | 64 ++++---- pages/index.js | 2 - public/assets/images/exclamation.svg | 20 +++ public/assets/images/select-down-arrow.svg | 1 + styles/sass/patterns/_card.scss | 8 +- styles/sass/styles.scss | 1 + styles/sass/welshgov/_application.scss | 67 ++++++-- styles/sass/welshgov/_application_errors.scss | 28 ++++ 41 files changed, 647 insertions(+), 363 deletions(-) create mode 100644 i18n.js delete mode 100644 i18n.json create mode 100644 locales/cy/account.json create mode 100644 locales/en/account.json create mode 100644 public/assets/images/exclamation.svg create mode 100644 public/assets/images/select-down-arrow.svg create mode 100644 styles/sass/welshgov/_application_errors.scss diff --git a/.env.local b/.env.local index dc45427c..035eccf5 100644 --- a/.env.local +++ b/.env.local @@ -8,8 +8,8 @@ SASKEYNAME = "devpedwnspolicy" PORT= "3000" DEFAULT_DOMAIN = "localhost" -//I18N_DOMAIN = "cymru.local" -I18N_DOMAIN ="dev-gwaithcynllunio.gwasanaeth.llyw.cymru" +I18N_DOMAIN = "cymru.local" +//I18N_DOMAIN ="dev-gwaithcynllunio.gwasanaeth.llyw.cymru" //I18N_DOMAIN ="stage-gwaithcynllunio.gwasanaeth.llyw.cymru" //I18N_DOMAIN ="pp-gwaithcynllunio.gwasanaeth.llyw.cymru" //I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru" diff --git a/components/account/registerCheck.js b/components/account/registerCheck.js index 9c63b5b2..b2b11046 100644 --- a/components/account/registerCheck.js +++ b/components/account/registerCheck.js @@ -28,11 +28,16 @@ const RegisterFormCheck = (props) => { return ( <> -

Check that the details you entered are correct.

-

About you

+

{t("account:register-new-account-check-details-paragraph")}

+

+ {" "} + {t("account:register-new-account-sub-heading-1")} +

-
First name
+
+ {t("account:register-new-account-first-name-label")} +
{ props.props.props.form.accountRegisterForm.values @@ -47,15 +52,19 @@ const RegisterFormCheck = (props) => { setRegisterFormComplete(false); }} > - Change + {t("common:change-link-label")} - first name + {t( + "account:register-new-account-first-name-label" + )}
-
Last name
+
+ {t("account:register-new-account-last-name-label")} +
{ props.props.props.form.accountRegisterForm.values @@ -70,15 +79,20 @@ const RegisterFormCheck = (props) => { setRegisterFormComplete(false); }} > - Change + {t("common:change-link-label")} + - last name + {t( + "account:register-new-account-last-name-label" + )}
-
Email address
+
+ {t("account:register-new-account-email-address-label")} +
{ props.props.props.form.accountRegisterForm.values @@ -93,16 +107,21 @@ const RegisterFormCheck = (props) => { setRegisterFormComplete(false); }} > - Change + {t("common:change-link-label")} + {" "} - email address + {t( + "account:register-new-account-email-address-label" + )}
-
Telephone
+
+ {t("account:register-new-account-phone-label")} +
{ props.props.props.form.accountRegisterForm.values @@ -117,9 +136,10 @@ const RegisterFormCheck = (props) => { setRegisterFormComplete(false); }} > - Change + {t("common:change-link-label")} + - telephone + {t("account:register-new-account-phone-label")}
@@ -150,10 +170,14 @@ const RegisterFormCheck = (props) => {
*/}
-

Your address

+

+ {t("account:register-new-account-sub-heading-2")} +

-
Address Line 1
+
+ {t("account:register-new-account-address-line-1-label")} +
{ props.props.props.form.accountRegisterForm.values @@ -168,16 +192,21 @@ const RegisterFormCheck = (props) => { setRegisterFormComplete(false); }} > - Change + {t("common:change-link-label")} + {" "} - address line 1 + {t( + "account:register-new-account-address-line-1-label" + )}
-
Address line 2
+
+ {t("account:register-new-account-address-line-2-label")} +
{ props.props.props.form.accountRegisterForm.values @@ -192,16 +221,21 @@ const RegisterFormCheck = (props) => { setRegisterFormComplete(false); }} > - Change + {t("common:change-link-label")} + {" "} - address line 2 + {t( + "account:register-new-account-address-line-2-label" + )}
-
Town/City
+
+ {t("account:register-new-account-town-label")} +
{ props.props.props.form.accountRegisterForm.values @@ -216,16 +250,20 @@ const RegisterFormCheck = (props) => { setRegisterFormComplete(false); }} > - Change + {t("common:change-link-label")} + {" "} - town/city + {t("account:register-new-account-town-label")}
-
County
+
+ {" "} + {t("account:register-new-account-county-label")} +
{ props.props.props.form.accountRegisterForm.values @@ -240,16 +278,20 @@ const RegisterFormCheck = (props) => { setRegisterFormComplete(false); }} > - Change + {t("common:change-link-label")} + {" "} - county + {t("account:register-new-account-county-label")}
-
Postcode
+
+ {" "} + {t("account:register-new-account-postcode-label")} +
{ props.props.props.form.accountRegisterForm.values @@ -264,10 +306,13 @@ const RegisterFormCheck = (props) => { setRegisterFormComplete(false); }} > - Change + {t("common:change-link-label")} + {" "} - postcode + {t( + "account:register-new-account-postcode-label" + )}
@@ -283,7 +328,7 @@ const RegisterFormCheck = (props) => { setAccountCreatedComplete(true); }} > - Continue + {t("common:continue-button")}
diff --git a/components/account/registerComplete.js b/components/account/registerComplete.js index 0e187cac..4c057085 100644 --- a/components/account/registerComplete.js +++ b/components/account/registerComplete.js @@ -77,14 +77,16 @@ const RegisterComplete = (props) => { return props.accountDetails.accCr == "created" ? ( <> -

We have sent you a confirmation email.

+

+ {t("account:register-new-account-confirmation-email")} +

-

What happens next

+

+ {t("account:register-new-account-sub-heading-what-next")} +

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a - metus non quam mollis egestas. Integer ac leo cursus, laoreet - nulla sed, tempus tellus. Mauris condimentum erat arcu. + {t("account:register-new-account-paragraph-what-next")}

@@ -95,7 +97,7 @@ const RegisterComplete = (props) => { setLogout(), window.localStorage.clear(); }} > - Login to My Portal + {t("account:register-new-account-my-portal-link")}

@@ -103,7 +105,7 @@ const RegisterComplete = (props) => { ) : ( <>

- Please try again with a different email address + {t("account:register-new-account-account-failed")}

{ return ( <> -

+
- {touched && error && ( - - Error:{" "} - {touched && - ((error && ( - {errorMsg ? errorMsg : error} - )) || - (warning && {warning}))} - - )} - +
+ + {touched && error && ( + + + Error: + {" "} + {touched && + ((error && ( + {errorMsg ? errorMsg : error} + )) || + (warning && {warning}))} + + )} +
); @@ -63,6 +64,8 @@ const RenderTextfield = ({ const RegisterForm = (props) => { const { handleSubmit, + pristine, + valid, value, setRegisterFormComplete, setAccountCreatedComplete, @@ -105,15 +108,33 @@ const RegisterForm = (props) => { setRegisterFormComplete(true); }; + console.log(pristine); return ( <> + {!pristine && !valid && ( +
+ + Error:{" "} + + There are errors on this page. Please correct any + required fields and submit again. + + +
+ )} + {props.accountCreatedComplete != true ? ( props.registerFormComplete == false ? (

- About you + {t( + "account:register-new-account-sub-heading-1" + )}

{ type="text" className="govuk-input govuk-input--width-20" validate={[required]} - label="First name" - errorMsg="Is required" + label={t( + "account:register-new-account-first-name-label" + )} + errorMsg={t( + "account:register-new-account-first-name-label-errormsg" + )} /> { type="text" className="govuk-input govuk-input--width-20" validate={[required]} - label="Last name" - errorMsg="Is required" + label={t( + "account:register-new-account-last-name-label" + )} + errorMsg={t( + "account:register-new-account-last-name-label-errormsg" + )} /> { type="email" className="govuk-input govuk-input--width-20" validate={[required, email]} - label="Email address" + label={t( + "account:register-new-account-email-address-label" + )} /> { type="number" className="govuk-input govuk-input--width-20" validate={[required, phoneNumber]} - label="Telephone" + label={t( + "account:register-new-account-phone-label" + )} /> { component={RenderTextfield} type="password" className="govuk-input govuk-input--width-20" - label="Password" + label={t( + "account:register-new-account-password-label" + )} validate={[required, minLength5]} - errorMsg="Is required" + errorMsg={t( + "account:register-new-account-password-label-errormsg" + )} /> { component={RenderTextfield} type="password" className="govuk-input govuk-input--width-20" - label="Confirm password" + label={t( + "account:register-new-account-confirm-password-label" + )} validate={[ required, passwordsMatch, minLength5, ]} - errorMsg="Passwords do not match" + errorMsg={t( + "account:register-new-account-confirm-password-label-errormsg" + )} />

- What is your address? + {t( + "account:register-new-account-sub-heading-2" + )}

@@ -193,9 +236,13 @@ const RegisterForm = (props) => { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-20" - label="Address line 1" + label={t( + "account:register-new-account-address-line-1-label" + )} validate={[required]} - errorMsg="Is required" + errorMsg={t( + "account:register-new-account-address-line-1-label-errormsg" + )} /> { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-20" - label="Address line 2" - errorMsg="Is required" + label={t( + "account:register-new-account-address-line-2-label" + )} /> { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-10" - label="Town/City" + label={t( + "account:register-new-account-town-label" + )} validate={[required]} - errorMsg="Is required" + errorMsg={t( + "account:register-new-account-town-label-errormsg" + )} /> { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-10" - label="County" + label={t( + "account:register-new-account-county-label" + )} validate={[required]} - errorMsg="Is required" + errorMsg={t( + "account:register-new-account-county-label-errormsg" + )} /> { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-5" - label="Postcode" + label={t( + "account:register-new-account-postcode-label" + )} validate={[required]} - errorMsg="Is required" + errorMsg={t( + "account:register-new-account-postcode-label-errormsg" + )} />
@@ -244,7 +304,7 @@ const RegisterForm = (props) => { className="govuk-button" data-module="govuk-button" > - Continue + {t("common:continue-button")}
diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index a6477415..c1156aac 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -386,7 +386,7 @@ const Breadcrumbs = (props) => { {router.pathname == "/account/register" ? ( <>
  • - Register your account + {t("account:register-new-account-heading")}
    • ) : ( diff --git a/components/case/summary.js b/components/case/summary.js index c3de0839..22652b39 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -170,7 +170,7 @@ const CaseSummary = (props) => {
    -
    + {/*
    {noRepresentationLink.includes(router.pathname) == @@ -197,7 +197,7 @@ const CaseSummary = (props) => {
    -
    +
    */}
    diff --git a/components/footer.js b/components/footer.js index f8296e35..11847158 100644 --- a/components/footer.js +++ b/components/footer.js @@ -136,7 +136,7 @@ export default function Footer(props) { aria-labelledby="footer_links" > diff --git a/components/header.js b/components/header.js index 07876f2b..042c2761 100644 --- a/components/header.js +++ b/components/header.js @@ -38,6 +38,13 @@ const Header = (props) => { "/dns/application-view", ]; + let domainSwitch; + + if (process.browser) { + domainSwitch = window.switchDomain; + } else { + domainSwitch = process.env.I18N_DOMAIN; + } return (
    {
    */}
    -
    + {/*
    { router.query.q : router.pathname : router.query.q != null - ? router.pathname + + ? process.env.I18N_DOMAIN + + "/" + + router.asPath + "?q=" + router.query.q - : router.pathname + : router.asPath } locale={ locale == "en" ? "cy" : "en" @@ -176,8 +185,8 @@ const Header = (props) => {
    -
    -
    +
    */} +
    {hasContactLink.includes(router.pathname) == true ? ( @@ -217,8 +226,8 @@ const Header = (props) => { router.query.q : router.pathname : router.query.q != null - ? router.pathname + "?q=" + router.query.q - : router.pathname + ? router.asPath + "?q=" + router.query.q + : router.asPath } locale={locale == "en" ? "cy" : "en"} > diff --git a/components/homepage/casecomment.js b/components/homepage/casecomment.js index 848829e1..b1ad1da9 100644 --- a/components/homepage/casecomment.js +++ b/components/homepage/casecomment.js @@ -15,7 +15,10 @@ export default function CaseComment() {

    {t("home:casescomment-card-paragraph-one")}{" "} - + {t("home:login-contact-email")}

    diff --git a/components/homepage/casesearch.js b/components/homepage/casesearch.js index 7a03ee9a..faa4b5a5 100644 --- a/components/homepage/casesearch.js +++ b/components/homepage/casesearch.js @@ -30,13 +30,7 @@ const RenderTextfield = ({ }) => { return ( <> -
    +
    {hint1} @@ -48,13 +42,25 @@ const RenderTextfield = ({ - {touched && error && ( - - Error:{" "} - {error} - - )} - +
    + + {touched && error && ( + + + Error: + {" "} + {error} + + )} +
    ); @@ -136,7 +142,9 @@ let CaseSearch = (props) => { : "/advancedsearch" } > - {t("home:casesearch-card-advanced-link")} + + {t("home:casesearch-card-advanced-link")} +
    diff --git a/components/homepage/dns.js b/components/homepage/dns.js index f6a5130e..cd8fd796 100644 --- a/components/homepage/dns.js +++ b/components/homepage/dns.js @@ -36,7 +36,7 @@ export default function Dns() { } > { spinnerState(); }} diff --git a/components/homepage/login.js b/components/homepage/login.js index 5f08265e..3daef51a 100644 --- a/components/homepage/login.js +++ b/components/homepage/login.js @@ -205,12 +205,16 @@ let Login = (props) => { : "/account/register" } > - {t("home:login-card-register-link")} + + {t("home:login-card-register-link")} +

    - {t("home:login-card-forgotten-label")} + + {t("home:login-card-forgotten-label")}{" "} +

    diff --git a/components/homepage/loginSoon.js b/components/homepage/loginSoon.js index dae15dbf..fc3c83fc 100644 --- a/components/homepage/loginSoon.js +++ b/components/homepage/loginSoon.js @@ -24,6 +24,7 @@ export default function LoginSoon() {
    diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js index 3d330650..fcf5a6d6 100644 --- a/components/search/dnssearchresults.js +++ b/components/search/dnssearchresults.js @@ -273,7 +273,6 @@ const DNSSearchResults = (props) => {

    - {t("dnsCommon:service-name")}{" "} {t("dnsApplications:page-title")}

    diff --git a/data/crmfieldlookuptranslations.json b/data/crmfieldlookuptranslations.json index 2a1f558e..5b7d6393 100644 --- a/data/crmfieldlookuptranslations.json +++ b/data/crmfieldlookuptranslations.json @@ -62,7 +62,7 @@ }, { "value": "DNS", - "value_cy": "Datblygiadau o Arwyddocâd Cenedlaethol", + "value_cy": "Datblygiad o Arwyddocâd Cenedlaethol", "stringmapid": "bc56f05c-7f90-eb11-aac2-00224800be9c", "attributevalue": 846040011 }, diff --git a/data/lookuptranslations.json b/data/lookuptranslations.json index b6d89830..ae4c01a0 100644 --- a/data/lookuptranslations.json +++ b/data/lookuptranslations.json @@ -62,7 +62,7 @@ }, { "value": "DNS", - "value_cy": "Datblygiadau o Arwyddocâd Cenedlaethol", + "value_cy": "Datblygiad o Arwyddocâd Cenedlaethol", "stringmapid": "bc56f05c-7f90-eb11-aac2-00224800be9c", "attributevalue": 846040011 }, @@ -343,7 +343,7 @@ }, { "value": "Developments of National Significance", - "value_cy": "Datblygiadau o Arwyddocâd Cenedlaethol", + "value_cy": "Datblygiad o Arwyddocâd Cenedlaethol", "pinswg_lpa": 0 } ], @@ -355,7 +355,7 @@ }, { "value": "Hearing", - "value_cy": "Clyw", + "value_cy": "Gwrandawiad", "pinswg_procedure": 0 }, { @@ -367,37 +367,37 @@ "pinswg_isharedocumentlocations": [ { "value": "Main Party - Pre-Submission Docs", - "value_cy": "Prif Blaid - Dociau Cyn Cyflwyno", + "value_cy": "Prif Barti - Dogfennau Cyn Cyflwyno", "pinswg_isharedocumentlocations": 0 }, { "value": "Main Party - Submission Document", - "value_cy": "Prif Blaid - Dogfen Gyflwyno", + "value_cy": "Prif Barti - Dogfen Gyflwyno", "pinswg_isharedocumentlocations": 0 }, { "value": "Main Party - Questionnaire", - "value_cy": "Prif Blaid - Holiadur", + "value_cy": "Prif Barti - Holiadur", "pinswg_isharedocumentlocations": 0 }, { "value": "Main Party - Statements", - "value_cy": "Prif Blaid - Datganiadau", + "value_cy": "Prif Barti - Datganiadau", "pinswg_isharedocumentlocations": 0 }, { "value": "Main Party - Comments", - "value_cy": "Prif Blaid - Sylwadau", + "value_cy": "Prif Barti - Sylwadau", "pinswg_isharedocumentlocations": 0 }, { "value": "Main Party - Written Statements of Evidence", - "value_cy": "Prif Blaid - Datganiadau Tystiolaeth Ysgrifenedig", + "value_cy": "Prif Barti - Datganiadau Tystiolaeth Ysgrifenedig", "pinswg_isharedocumentlocations": 0 }, { "value": "Main Party - Environmental Statements", - "value_cy": "Prif Blaid - Datganiadau Amgylcheddol", + "value_cy": "Prif Barti - Datganiadau Amgylcheddol", "pinswg_isharedocumentlocations": 0 }, { diff --git a/i18n.js b/i18n.js new file mode 100644 index 00000000..26082685 --- /dev/null +++ b/i18n.js @@ -0,0 +1,37 @@ +module.exports = { + "locales": ["en", "cy"], + "defaultLocale": "en", + "domains": [ + { + "domain": process.env.I18N_DOMAIN, + "defaultLocale": "cy", + "locales": ["cy"], + }, + ], + "pages": { + "*": ["common", "newappeal"], + "/": ["common", "home"], + "/myportal": ["myportal"], + "/myportal/viewall": ["search"], + "/myportal/advancedsearch": ["search"], + "/myportal/searchresults": ["search"], + "/myportal/case": ["case"], + "/advancedsearch": ["search"], + "/advancedsearchresults": ["search"], + "/searchresults": ["search"], + "/viewall": ["search"], + "/case": ["case"], + "/representation": ["case"], + "/newappeal": ["newappeal"], + "/newappeal/*": ["newappeal"], + "/newappeal/selectappeal": ["newappeal"], + "/dns/*": ["dnsCommon"], + "/dns": ["dnsCommon", "dnsHome"], + "/dns/applications": ["dnsCommon", "dnsApplications"], + "/dns/application-view": ["dnsCommon", "dnsApplicationView"], + "/dnsapplications": ["search", "dnsCommon", "dnsApplications"], + "/dnsdetails": ["case", "search", "dnsCommon", "dnsApplications"], + "/help/cookies": ["common", "cookies"], + "/account/register": ["common", "account"], + }, +}; diff --git a/i18n.json b/i18n.json deleted file mode 100644 index 338ed833..00000000 --- a/i18n.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "locales": [ - "en", - "cy" - ], - "defaultLocale": "en", - "domains": [ - { - "domain": "dev-gwaithcynllunio.gwasanaeth.llyw.cymru", - "defaultLocale": "cy" - } - ], - "pages": { - "*": [ - "common", - "newappeal" - ], - "/": [ - "common", - "home" - ], - "/myportal": [ - "myportal" - ], - "/myportal/viewall": [ - "search" - ], - "/myportal/advancedsearch": [ - "search" - ], - "/myportal/searchresults": [ - "search" - ], - "/myportal/case": [ - "case" - ], - "/advancedsearch": [ - "search" - ], - "/advancedsearchresults": [ - "search" - ], - "/searchresults": [ - "search" - ], - "/viewall": [ - "search" - ], - "/case": [ - "case" - ], - "/representation": [ - "case" - ], - "/newappeal": [ - "newappeal" - ], - "/newappeal/*": [ - "newappeal" - ], - "/newappeal/selectappeal": [ - "newappeal" - ], - "/dns/*": [ - "dnsCommon" - ], - "/dns": [ - "dnsCommon", - "dnsHome" - ], - "/dns/applications": [ - "dnsCommon", - "dnsApplications" - ], - "/dns/application-view": [ - "dnsCommon", - "dnsApplicationView" - ], - "/dnsapplications": [ - "search", - "dnsCommon", - "dnsApplications" - ], - "/dnsdetails": [ - "case", - "search", - "dnsCommon", - "dnsApplications" - ], - "/help/cookies": [ - "common", - "cookies" - ] - } -} \ No newline at end of file diff --git a/locales/cy/account.json b/locales/cy/account.json new file mode 100644 index 00000000..ca0bd367 --- /dev/null +++ b/locales/cy/account.json @@ -0,0 +1,41 @@ +{ + "register-new-account-heading": "Creu cyfrif newydd", + "register-new-account-status-created-label": "Nid yw'ch cyfrif wedi creu", + "register-new-account-status-not-created-label": "Mae eich cyfrif wedi'i greu", + "register-new-account-checking-label": "Gwirio am gyfrif...", + "help-heading": "Help", + "help-sub-heading-1": "Cwmnïau neu gyflwyniadau gan fwy nag un unigolyn (grwpiau)", + "help-paragraph-1": "Os ydych chi'n cyflwyno apêl neu gynrychiolaeth gan gwmni e.e. \"Acme Inc\" neu agroup o bobl e.e. \"Trigolion 1-10 Stryd Fawr\", dylech nodi enw'r cwmni neu'r grŵp ym maes y Cwmni / Grŵp. Fe'ch ystyrir yn gweithredu fel eu cynrychiolydd.", + "help-sub-heading-2": "Apeliadau gorfodi gan gyplau priod / partneriaeth sifil", + "help-paragraph-2": "Ni ddylech nodi enw grŵp. Dim ond fel apelydd ychwanegol y mae angen i chi nodi enw'ch partner ar y ffurflen apelio ei hun.", + "help-sub-heading-3": "Apeliadau eraill gan gyplau priod / partneriaeth sifil", + "help-paragraph-3": "Ar gyfer unrhyw fath arall o apêl, er enghraifft apêl gynllunio, dylech nodi enw grŵp wrth greu eich cyfrif e.e. \"Mr a Mrs Smith \", os dyna'r enw ar y cais.", + "register-new-account-sub-heading-1": "Amdanat ti", + "register-new-account-first-name-label": "Enw cyntaf", + "register-new-account-first-name-label-errormsg": "Yn ofynnol", + "register-new-account-last-name-label": "Enw olaf", + "register-new-account-last-name-label-errormsg": "Yn ofynnol", + "register-new-account-email-address-label": "Cyfeiriad ebost", + "register-new-account-email-address-label-errormsg": "Rhowch gyfeiriad e-bost dilys", + "register-new-account-phone-label": "Ffôn", + "register-new-account-password-label": "Cyfrinair", + "register-new-account-password-label-errormsg": "Yn ofynnol", + "register-new-account-confirm-password-label": "Cadarnhau cyfrinair", + "register-new-account-confirm-password-label-errormsg": "Rhaid i gyfrineiriau gyfateb", + "register-new-account-sub-heading-2": "Beth yw eich cyfeiriad?", + "register-new-account-address-line-1-label": "Llinell Cyfeiriad 1", + "register-new-account-address-line-1-label-errormsg": "Yn ofynnol", + "register-new-account-address-line-2-label": "Llinell Cyfeiriad 2", + "register-new-account-town-label": "Tref/Dinas", + "register-new-account-town-label-errormsg": "Yn ofynnol", + "register-new-account-county-label": "Sir", + "register-new-account-county-label-errormsg": "Yn ofynnol", + "register-new-account-postcode-label": "Cod post", + "register-new-account-postcode-label-errormsg": "Yn ofynnol", + "register-new-account-check-details-paragraph": "Gwiriwch fod y manylion a nodoch yn gywir.", + "register-new-account-confirmation-email": "Rydym wedi anfon e-bost cadarnhau atoch.", + "register-new-account-sub-heading-what-next": "Beth sy'n digwydd nesaf", + "register-new-account-paragraph-what-next": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a metus non quam mollis egestas. Integer ac leo cursus, laoreet nulla sed, tempus tellus. Mauris condimentum erat arcu.", + "register-new-account-my-portal-link": "Mewngofnodi i'm Porth", + "register-new-account-account-failed": "Rhowch gynnig arall arni gyda chyfeiriad e-bost gwahanol" +} \ No newline at end of file diff --git a/locales/cy/case.json b/locales/cy/case.json index 4d0e8417..a5d6e3a7 100644 --- a/locales/cy/case.json +++ b/locales/cy/case.json @@ -23,7 +23,7 @@ "summary-no-date-entered-label": "dim dyddiad wedi'i nodi", "summary-start-date-label": "Dyddiad Dechrau", "summary-questionnaire-due-date-label": "Holiadur i ddod", - "summary-statement-due-date-label": "Datganiad (au) i ddod", + "summary-statement-due-date-label": "Datganiad(au) i ddod", "summary-interested-party-date-label": "Sylwadau Parti â Buddiant i ddod", "summary-applicant-final-comments-date-label": "Sylwadau Terfynol yr Apelydd/ACLl i ddod", "summary-inquiry-evidence-date-label": "Tystiolaeth yr Ymchwiliad i ddod", @@ -31,8 +31,8 @@ "summary-decision-date-label": "Dyddiad y Penderfyniad", "summary-documents-button-label": "Dogfennau", "documents-document-count-label": "Dogfennau", - "documents-name-label": "Math y Ddogfen", - "documents-doc-type-label": "Math y Ddogfen", + "documents-name-label": "Enw", + "documents-doc-type-label": "Math o Ddogfen", "documents-date-published-label": "Dyddiad cyhoeddi", "documents-size-label": "Maint y ffeil (kb)", "documents-non-available-label": "Nid oes unrhyw ddogfennau ar gyfer yr apêl hon", diff --git a/locales/cy/common.json b/locales/cy/common.json index 300b7b74..6f0eadbf 100644 --- a/locales/cy/common.json +++ b/locales/cy/common.json @@ -4,7 +4,7 @@ "gov-wales-link": "https://llyw.cymru", "gov-wales-label": "LLYW.CYMRU", "service-description": "Mae'r gwasanaeth hwn yn cael ei ddatblygu i gefnogi apeliadau a cheisiadau ar-lein.", - "service-name": "Cynllunio gwaith achos", + "service-name": "Gwaith achos cynllunio", "service-name-breadcrumb": "Hafan", "new-service-beta": "Mae hwn yn wasanaeth newydd", "breadcrumb-back-link": "Yn ôl", @@ -15,17 +15,24 @@ "continue-button": "Parhewch", "search-button": "Chwilio", "submit-and-start": "Cyflwyno a dechrau'r cwrs", - "footer-terms-conditions-link": "Telerau ac amodau", - "footer-privacy-link": "Rhybudd Preifatrwydd", - "footer-cookies-link": "Chwcis", - "footer-accessibility-link": "Hygyrchedd", + "footer-terms-conditions-link-label": "Telerau ac amodau", + "footer-terms-conditions-link": "https://llyw.cymru/telerau-ac-amodau", + "footer-privacy-link-label": "Preifatrwydd", + "footer-privacy-link": "https://llyw.cymru/help/polisi-preifatrwydd-wefan", + "footer-cookies-link": "Cwcis", + "footer-accessibility-link-label": "Hygyrchedd", + "footer-accessibility-link": "https://llyw.cymru/datganiad-hygyrchedd-llywcymru", "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-contact-us-link-label": "Cysylltu â ni", + "footer-contact-us-link": "https://llyw.cymru/cysylltu-ni", + "footer-copyright-link-label": "Datganiad hawlfraint", + "footer-copyright-link": "https://llyw.cymru/datganiad-hawlfraint", + "footer-alternative-languages-link-label": "Ieithoedd amgen", + "footer-alternative-languages-link": "https://llyw.cymru/ieithoedd-amgen", + "footer-guidance-link-label": "Canllawiau a gwasanaethau Penderfyniadau 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", + "signout-label": "Allgofnodwch", "back-to-top-link": "Nôl i dop y dudalen", "social-bar-share-link": "Rhannu’r dudalen hon", "social-bar-share-via-link": "Rhannu’r dudalen hon ar", @@ -56,5 +63,6 @@ "previous-link-button": "Blaenorol", "next-link-button": "Nesaf", "pages-label": "Tudalen", - "of-label": "o" + "of-label": "o", + "change-link-label": "Newid" } \ No newline at end of file diff --git a/locales/cy/cookies.json b/locales/cy/cookies.json index b97a611f..4b660a4e 100644 --- a/locales/cy/cookies.json +++ b/locales/cy/cookies.json @@ -7,22 +7,22 @@ "cookie-intro-paragraph-2": "Rydym yn defnyddio cwcis i storio gwybodaeth ynghylch sut yr ydych yn defnyddio gwefan LLYW.CYMRU, megis y tudalennau yr ydych yn ymweld â nhw. Nid yw'r cwcis hyn yn cael eu defnyddio i'ch adnabod chi'n bersonol.", "cookie-intro-paragraph-3": "Rydym yn defnyddio 4 cwci gwahanol. Gallwch ddewis pa fath o gwcis rydych yn hapus i ni eu defnyddio.", "cookie-settings-heading": "Gosodiadau cwcis", - "cookie-settings-usage-heading": "Cwcis sy'n mesur defnydd y wefan", - "cookie-settings-usage-paragraph-1": "Rydym yn defnyddio Google Analytics i fesur sut ydych yn defnyddio'r wefan er mwyn i ni ei wella yn seiliedig ar angen defnyddwyr. Mae Google Analytics yn gosod cwcis sy'n storio gwybodaeth wedi anonymeiddio ynghylch:", - "cookie-settings-usage-list-item-1": "sut ddaethoch chi i'r safle", + "cookie-settings-usage-heading": "Cwcis sy'n mesur defnydd o'r wefan", + "cookie-settings-usage-paragraph-1": "Rydym yn defnyddio Google Analytics i fesur sut rydych yn defnyddio’r wefan er mwyn i ni ei gwella yn seiliedig ar anghenion defnyddwyr. Mae Google Analytics yn gosod cwcis sy’n storio gwybodaeth wedi’i hanonymeiddio ynghylch:", + "cookie-settings-usage-list-item-1": "sut daethoch chi i’r safle", "cookie-settings-usage-list-item-2": "y tudalennau yr ydych yn ymweld â nhw ar LLYW.CYMRU a gwasanaethau digidol y llywodraeth, a pha mor hir yr ydych chi'n treulio ar bob tudalen", "cookie-settings-usage-list-item-3": "beth ydych chi'n clicio arno wrth ymweld â'r safle", "cookie-settings-usage-list-item-4": "Nid ydym yn caniatâu i Google ddefnyddio na rhannu'r data ynghylch sut yr ydych yn defnyddio'r safle.", "cookie-settings-usage-radio-1-label": "Peidiwch â defnyddio cwcis sy'n mesur fy nefnydd o'r wefan", - "cookie-settings-usage-radio-2-label": "Defnyddiwch cwcis sy'n mesur fy nefnydd o'r wefan", + "cookie-settings-usage-radio-2-label": "Defnyddiwch gwcis sy’n mesur fy nefnydd o’r wefan", "cookie-settings-communications-heading": "Cwcis sy'n helpu gyda chyfathrebu a marchnata", "cookie-settings-communications-paragraph-1": "Gall y cwcis hyn gael eu gosod gan wefannau trydydd parti a gwneud pethau fel mesur sut rydych yn gwylio fideos YouTube ar LLYW.CYMRU.", "cookie-settings-communications-radio-1-label": "Peidiwch â defnyddio cwcis sy'n helpu gyda chyfathrebu a marchnata", - "cookie-settings-communications-radio-2-label": "Defnyddiwch cwcis sy'n cofio fy ngosodiadau ar y safle", + "cookie-settings-communications-radio-2-label": "Defnyddiwch gwcis sy’n helpu gyda chyfathrebu a marchnata", "cookie-settings-settings-heading": "Cwcis sy'n cofio'ch gosodiadau", - "cookie-settings-settings-paragraph-1": "Mae'r cwcis hyn yn gwneud pethau fel cofio eich dewisiadau, i bersonol eich profiad o ddefnyddio'r safle.", + "cookie-settings-settings-paragraph-1": "Mae’r cwcis hyn yn gwneud pethau fel cofio eich dewisiadau, i bersonoli eich profiad o ddefnyddio’r safle.", "cookie-settings-settings-radio-1-label": "Peidiwch â defnyddio cwcis sy'n cofio fy ngosodiadau ar y safle", - "cookie-settings-settings-radio-2-label": "Defnyddiwch cwcis sy'n cofio fy ngosodiadau ar y safle", + "cookie-settings-settings-radio-2-label": "Defnyddiwch gwcis sy'n cofio fy ngosodiadau ar y safle", "cookie-settings-essential-heading": "Cwcis sy'n angenrheidiol", "cookie-settings-essential-paragraph-1": "Mae'r cwcis hyn yn hanfodol ar gyfer pethau fel:", "cookie-settings-essential-list-item-1": "cofio'r hysbysiadau yr ydych wedi eu gweld fel ein bod ni ddim yn eu dangos i chi eto", diff --git a/locales/cy/dnsApplications.json b/locales/cy/dnsApplications.json index 519ff63b..95906cd1 100644 --- a/locales/cy/dnsApplications.json +++ b/locales/cy/dnsApplications.json @@ -1,7 +1,7 @@ { - "page-title": "Tudalen Ceisiadau", + "page-title": "Ceisiadau Datblygiadau o Arwyddocâd Cenedlaethol", "page-intro-paragraph-1": "Y ceisiadau a restrir yw’r rhai:", - "page-intro-list-item-1": "Lle mae’r datblygwr wedi hysbysu’r Arolygiaeth Gynllunio yn ysgrifenedig eu bod yn bwriadu cyflwyno cais i ni yn y dyfodol", + "page-intro-list-item-1": "Lle mae’r datblygwr wedi hysbysu’r Arolygiaeth Gynllunio yn ysgrifenedig ei fod yn bwriadu cyflwyno cais i ni yn y dyfodol", "page-intro-list-item-2": "Lle cafodd cais ei wneud eisoes i’r Arolygiaeth Gynllunio ac mae’n mynd drwy’r broses archwilio", "page-intro-list-item-3": "Lle penderfynwyd ar y cynnig.", "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 a4123a6c..a73c668c 100644 --- a/locales/cy/home.json +++ b/locales/cy/home.json @@ -1,15 +1,15 @@ { "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-temp-2": "Wrth i ni ddatblygu’r gwasanaeth ar-lein, dewch o hyd i:", "login-comingsoon-forms-link-1": "https://llyw.cymru/ffurflenni-apelio", - "login-comingsoon-forms-label-1": "apêl cynllunio a ffurflenni cais", + "login-comingsoon-forms-label-1": "ffurflenni apêl cynllunio a ffurflenni cais cynllunio", "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-forms-label-4": "Ffurflenni Datblygiadau o 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", @@ -26,12 +26,12 @@ "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-card-advanced-link": "Chwiliad uwch", "casesearch-search-validation-required": "Angenrheidiol", "casesearch-search-validation-minlength": "Rhaid bod yn 4 nod neu fwy", "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.", + "casescomment-card-paragraph-two": "Ar gyfer apeliadau deiliaid tai a masnachol, ni all partïon â buddiant wneud sylwadau yn ystod 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", diff --git a/locales/cy/myportal.json b/locales/cy/myportal.json index ca6f62e1..82a52085 100644 --- a/locales/cy/myportal.json +++ b/locales/cy/myportal.json @@ -11,7 +11,7 @@ "searchcases-card-search-hint": "Chwiliwch drwy roi cyfeirnod 7 digid yr achos", "searchcases-card-search-example-label": "Enghraifft:", "searchcases-card-button": "Cyflwyno Chwiliad", - "searchcases-card-advanced-link": "Fel arall, gallwch chwilio gan ddefnyddio ein meini prawf eraill gyda'n chwiliad uwch", + "searchcases-card-advanced-link": "Chwiliad uwch", "searchcases-validation-required": "Angenrheidiol", "searchcases-validation-minlength": "Rhaid bod yn 4 nod neu fwy", "awatitingsubmission-card-title": "Eto i’w gyflwyno", diff --git a/locales/cy/search.json b/locales/cy/search.json index 67dd43c1..1f10fefb 100644 --- a/locales/cy/search.json +++ b/locales/cy/search.json @@ -1,7 +1,7 @@ { - "page-title": "Crynodeb o’r Achos ar gyfer", - "search-title-label": "Crynodeb o’r Achos ar gyfer", - "casereference-label": "Cyfeirnod yr Achos (7 digid olaf)", + "page-title": "Chwilio am achos", + "search-title-label": "Chwilio am achos", + "casereference-label": "Cyfeirnod yr achos", "sitelocation-legend": "Lleoliad y Safle", "address-line-one-label": "Llinell gyntaf y cyfeiriad", "town-label": "Tref/Dinas (agosaf)", @@ -46,7 +46,7 @@ "search-button-label": "Chwilio", "clear-button-label": "Cliriwch", "clear-all-button-label": "Clirio Pob Un", - "searchresults-title-label": "Crynodeb o’r Achos ar gyfer", + "searchresults-title-label": "Chwilio am achos", "searchresults-count-label": "Cafodd eich chwiliad {{count}} o ganlyniadau", "searchresults-max-count-label": "Dychwelodd eich chwiliad fwy na 200 o ganlyniadau. Mireiniwch eich chwiliad. Mae'r 200 achos diweddaraf yn cael eu harddangos", "searchresults-case-reference-label": "Cyfeirnod yr Achos", diff --git a/locales/en/account.json b/locales/en/account.json new file mode 100644 index 00000000..d5b11a32 --- /dev/null +++ b/locales/en/account.json @@ -0,0 +1,41 @@ +{ + "register-new-account-heading": "Create a new account", + "register-new-account-status-created-label": "Your account has not created", + "register-new-account-status-not-created-label": "Your account has been created", + "register-new-account-checking-label": "Checking for account...", + "help-heading": "Help", + "help-sub-heading-1": "Companies or submissions by more than one individual (groups)", + "help-paragraph-1": "If you are submitting an appeal or representation from a company e.g. \"Acme Inc\" or agroup of people e.g. \"Residents of 1-10 High street\", you should enter the name of the company or group in the Company/Group field. You will be deemed as acting as their representative.", + "help-sub-heading-2": "Enforcement appeals by married/civil partnership couples", + "help-paragraph-2": "You should not enter a group name. You need only enter your partner's name on the appeal form itself as an additional appellant.", + "help-sub-heading-3": "Other appeals by married/civil partnership couples", + "help-paragraph-3": "For any other type of appeal, for example a planning appeal, you should enter a group name when creating your account e.g. \"Mr and Mrs Smith\", if that is the name on the application.", + "register-new-account-sub-heading-1": "About you", + "register-new-account-first-name-label": "First name", + "register-new-account-first-name-label-errormsg": "Is required", + "register-new-account-last-name-label": "Last name", + "register-new-account-last-name-label-errormsg": "Is required", + "register-new-account-email-address-label": "Email address", + "register-new-account-email-address-label-errormsg": "Enter a valid email address", + "register-new-account-phone-label": "Telephone", + "register-new-account-password-label": "Password", + "register-new-account-password-label-errormsg": "Password", + "register-new-account-confirm-password-label": "Confirm password", + "register-new-account-confirm-password-label-errormsg": "Passwords must match", + "register-new-account-sub-heading-2": "What is your address?", + "register-new-account-address-line-1-label": "Address line 1", + "register-new-account-address-line-1-label-errormsg": "Is required", + "register-new-account-address-line-2-label": "Address line 2", + "register-new-account-town-label": "Town/City", + "register-new-account-town-label-errormsg": "Is required", + "register-new-account-county-label": "County", + "register-new-account-county-label-errormsg": "Is required", + "register-new-account-postcode-label": "Postcode", + "register-new-account-postcode-label-errormsg": "Is required", + "register-new-account-check-details-paragraph": "Check that the details you entered are correct.", + "register-new-account-confirmation-email": "We have sent you a confirmation email.", + "register-new-account-sub-heading-what-next": "What happens next", + "register-new-account-paragraph-what-next": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a metus non quam mollis egestas. Integer ac leo cursus, laoreet nulla sed, tempus tellus. Mauris condimentum erat arcu.", + "register-new-account-my-portal-link": "Login to My Portal", + "register-new-account-account-failed": "Please try again with a different email address" +} \ No newline at end of file diff --git a/locales/en/common.json b/locales/en/common.json index f5abfe1c..bdb8add6 100644 --- a/locales/en/common.json +++ b/locales/en/common.json @@ -15,13 +15,20 @@ "continue-button": "Continue", "search-button": "Search", "submit-and-start": "Submit and start course", - "footer-terms-conditions-link": "Terms and conditions", - "footer-privacy-link": "Privacy", + "footer-terms-conditions-link-label": "Terms and conditions", + "footer-terms-conditions-link": "https://gov.wales/terms-and-conditions", + "footer-privacy-link-label": "Privacy", + "footer-privacy-link": "https://gov.wales/website-privacy-policy", "footer-cookies-link": "Cookies", - "footer-accessibility-link": "Accessibility", + "footer-accessibility-link-label": "Accessibility", + "footer-accessibility-link": "https://gov.wales/accessibility-statement-govwales", "footer-feedback-link": "Give feedback about this page", - "footer-copyright-link": "Copyright statement", - "footer-alternative-languages-link": "Alternative languages", + "footer-contact-us-link-label": "Contact us", + "footer-contact-us-link": "https://gov.wales/contact-us", + "footer-copyright-link-label": "Copyright statement", + "footer-copyright-link": "https://gov.wales/copyright-statement", + "footer-alternative-languages-link-label": "Alternative languages", + "footer-alternative-languages-link": "https://gov.wales/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", @@ -56,5 +63,6 @@ "previous-link-button": "Previous", "next-link-button": "Next", "pages-label": "Page", - "of-label": "of" + "of-label": "of", + "change-link-label": "Change" } \ No newline at end of file diff --git a/locales/en/dnsApplications.json b/locales/en/dnsApplications.json index 57527e82..94e7182b 100644 --- a/locales/en/dnsApplications.json +++ b/locales/en/dnsApplications.json @@ -1,5 +1,5 @@ { - "page-title": "Applications", + "page-title": "Developments of National Significance Applications", "page-intro-paragraph-1": "The applications listed are those:", "page-intro-list-item-1": "Where the developer has advised the Planning Inspectorate in writing that they intend to submit an application to us in the future", "page-intro-list-item-2": "Where an application has already been made to the Planning Inspectorate and is undergoing the examination process", diff --git a/locales/en/search.json b/locales/en/search.json index 8f2ecaa5..9187ae51 100644 --- a/locales/en/search.json +++ b/locales/en/search.json @@ -1,7 +1,7 @@ { "page-title": "Search for a case", "search-title-label": "Search for a case", - "casereference-label": "Case reference (last 7 digits)", + "casereference-label": "Case reference", "sitelocation-legend": "Site location", "address-line-one-label": "First line of address", "town-label": "Town/City (nearest)", diff --git a/next.config.js b/next.config.js index 2b37f394..687dbf46 100644 --- a/next.config.js +++ b/next.config.js @@ -77,6 +77,10 @@ module.exports = { source: "/cyfrif/cofrestr", destination: "/account/register", }, + { + source: "/help/cwcis", + destination: "/help/cookies", + }, // { // source: "/cy:path*", diff --git a/pages/_document.js b/pages/_document.js index 737cc980..1415e727 100644 --- a/pages/_document.js +++ b/pages/_document.js @@ -29,9 +29,10 @@ class MyDocument extends Document { + {!process.browser && ( )} diff --git a/pages/account/register.js b/pages/account/register.js index 5b9bd95b..d77a917d 100644 --- a/pages/account/register.js +++ b/pages/account/register.js @@ -33,7 +33,8 @@ const Home = (props) => {

    - {t("search:page-title")} - {t("common:service-name")} + {t("account:register-new-account-heading")} -{" "} + {t("common:service-name")}
    @@ -53,16 +54,26 @@ const Home = (props) => {
    {registerFormComplete != true || accountCreatedComplete != true ? ( -

    Create a new account

    +

    + {t( + "account:register-new-account-heading" + )} +

    ) : (

    {props.accountDetails.accCr != "false" ? props.accountDetails .accCr == "exists" - ? "Your account has not created" - : "Your account has been created" - : "Checking for account.."} + ? t( + "account:register-new-account-status-not-created-label" + ) + : t( + "account:register-new-account-status-created-label" + ) + : t( + "account:register-new-account-checking-label" + )}

    )} { accountCreatedComplete != true ? (

    - Help + {t("account:help-heading")}

    - Companies or submissions by more - than one individual (groups) + {t( + "account:help-sub-heading-1" + )}

    - If you are submitting an appeal - or representation from a company - e.g. "Acme Inc" or a - group of people e.g. - "Residents of 1-10 High - street", you should enter - the name of the company or group - in the Company/Group field. You - will be deemed as acting as - their representative. + {t("account:help-paragraph-1")}

    - Enforcement appeals by - married/civil partnership - couples + {t( + "account:help-sub-heading-2" + )}

    - You should not enter a group - name. You need only enter your - partner's name on the - appeal form itself as an - additional appellant. + {t("account:help-paragraph-2")}

    - Other appeals by married/civil - partnership couples + {t( + "account:help-sub-heading-3" + )}

    - For any other type of appeal, - for example a planning appeal, - you should enter a group name - when creating your account e.g. - "Mr and Mrs Smith", if - that is the name on the - application. + {t("account:help-paragraph-3")}

    ) : ( diff --git a/pages/index.js b/pages/index.js index 226f6ad6..f660c2d4 100644 --- a/pages/index.js +++ b/pages/index.js @@ -20,12 +20,10 @@ const Home = (props) => { const router = useRouter(); const { locale } = router; - console.log(router); return (
    {t("common:service-name")} - {console.log(router.pathname)} {/* Language by default is EN, if multilingual site this will need updated */} + + global/icon/exclamation + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/images/select-down-arrow.svg b/public/assets/images/select-down-arrow.svg new file mode 100644 index 00000000..b86d61e2 --- /dev/null +++ b/public/assets/images/select-down-arrow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/styles/sass/patterns/_card.scss b/styles/sass/patterns/_card.scss index 468f1b35..403b30d2 100644 --- a/styles/sass/patterns/_card.scss +++ b/styles/sass/patterns/_card.scss @@ -82,7 +82,7 @@ html[data-useragent*="MSIE 10.0"] .flex-container { .card-body { //border-bottom: 1px solid $govuk-border-colour; //$panel-colour; - padding: 12px; + padding: 40px 20px; *:last-child { margin-bottom: 0; @@ -231,9 +231,9 @@ html[data-useragent*="MSIE 10.0"] .flex-container { } } -.card-body { - width: 93%; -} +// .card-body { +// width: 93%; +// } div.cardModuleItem:last-of-type { margin-bottom: 20px !important; diff --git a/styles/sass/styles.scss b/styles/sass/styles.scss index 2ab5a365..2c758d12 100644 --- a/styles/sass/styles.scss +++ b/styles/sass/styles.scss @@ -3,6 +3,7 @@ // Add extra styles here, or re-organise the Sass files in whichever way makes most sense to you @import "welshgov/_variables"; @import "welshgov/_application"; +@import "welshgov/_application_errors"; // @import "welshgov/application_old"; // global styles for and

    tags diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss index 57751d9b..a03b73d0 100644 --- a/styles/sass/welshgov/_application.scss +++ b/styles/sass/welshgov/_application.scss @@ -26,6 +26,7 @@ html { .govuk-panel__title, .govuk-warning-text__text, .app-cookie-banner, +.govuk-error-message.govuk-form-group--error, h1, h2, h3, @@ -144,6 +145,9 @@ a.longLinkBreak { .govuk-header { background-color: $charcoal; + @media screen and (max-width: 900px) { + border-bottom: none; + } .govuk-header__container { border-bottom: none; margin-bottom: initial; @@ -214,12 +218,30 @@ textarea, background-color: $red; color: $white; font-size: 20px; - background-image: url(/assets/images/arrow-right--white.svg); font-weight: bold; background-repeat: no-repeat; background-position: right center; - padding: 15px 45px 15px 20px !important; - transition: all 0.2s ease-in; + padding: 15px 20px 15px 20px !important; + box-shadow: none; + + &.govuk-button-cta { + border-radius: 30px; + background-color: $blue; + + &:hover { + background-color: $lightblue; + } + } + + &.withChevron { + background-image: url(/assets/images/arrow-right--white.svg); + padding: 15px 45px 15px 20px !important; + + &:focus { + color: $black; + background-image: url(https://gov.wales/themes/custom/govwales/storage/smartsurvey/arrow-right--black.svg); + } + } &.govuk-button--secondary { background-color: $white; @@ -233,14 +255,36 @@ textarea, color: $white; } } + + &:hover { + background-color: $brightred; + } + + &:active { + top: 0px; + } &:focus { - color: $black; - background-image: url(https://gov.wales/themes/custom/govwales/storage/smartsurvey/arrow-right--black.svg); + background-color: #ffd530 !important; + border-color: transparent !important; + color: #1f1f1f !important; + outline: 2px solid #1f1f1f; + text-decoration: none !important; + -webkit-box-shadow: 0 0 0 2px #ffd530; + box-shadow: 0 0 0 2px #ffd530; } } -.govuk-button:hover { - background-color: $brightred; +.govuk-select { + appearance: none; + width: 100%; + margin-bottom: 20px; + background-image: url(/assets/images/select-down-arrow.svg); + background-size: 19px 12px; + background-repeat: no-repeat; + background-position: 98% 15px; + background-color: #fff; + padding: 10px 15px; + border: 1px solid #666666; } .sharebar { @@ -305,7 +349,7 @@ textarea, @media screen and (max-width: 900px) { position: absolute; - top: 10px; + top: 20px; right: -10px; } a.govuk-header__link { @@ -424,9 +468,10 @@ textarea, } .fullNav { display: block; - @media screen and (max-width: 900px) { - display: none; - } + //add back in when signout link is used + // @media screen and (max-width: 900px) { + // display: none; + // } } } diff --git a/styles/sass/welshgov/_application_errors.scss b/styles/sass/welshgov/_application_errors.scss new file mode 100644 index 00000000..642ba113 --- /dev/null +++ b/styles/sass/welshgov/_application_errors.scss @@ -0,0 +1,28 @@ +.govuk-error-message.govuk-form-group--error-summary { + background: $whitered; + border-left: 10px solid $red; + font-size: 18px; + color: $black; + font-weight: normal; + padding: 20px; + + .govuk-error-exclamation { + background-image: url(/assets/images/exclamation.svg); + background-repeat: no-repeat; + padding-left: 46px; + display: block; + padding-top: 2px; + background-position: left center; + } +} + +.govuk-error-message.govuk-form-group--error { + background: $whitered; + border-left: 3px solid $red; + font-size: 18px; + color: $black; + font-weight: normal; + padding: 20px; + margin-top: 20px; + max-width: 41ex; +}