robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

validation message translations is required

Browse Source
This commit is contained in:
robbond
2024-12-16 11:48:57 +00:00
parent 5549ed43ba
commit ead00dda76
9 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/account/personaldetails.js
+12 -10
View File
@@ -219,13 +219,15 @@ let PersonalDetails = (props) => {
/(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/gi;
const email = (value) =>
value && !emailRegex.test(value) ? "Invalid email address" : undefined;
value && !emailRegex.test(value)
? t("account:invalid-phone-number-errormsg")
: undefined;
const phoneNumber = (value) =>
value &&
!/^(?:(?:\(?(?:0(?:0|11)\)?[\s-]?\(?|\+)44\)?[\s-]?(?:\(?0\)?[\s-]?)?)|(?:\(?0))(?:(?:\d{5}\)?[\s-]?\d{4,5})|(?:\d{4}\)?[\s-]?(?:\d{5}|\d{3}[\s-]?\d{3}))|(?:\d{3}\)?[\s-]?\d{3}[\s-]?\d{3,4})|(?:\d{2}\)?[\s-]?\d{4}[\s-]?\d{4}))(?:[\s-]?(?:x|ext\.?|\#)\d{3,4})?$/i.test(
value
)
? "Invalid phone number"
? t("account:invalid-phone-number-errormsg")
: undefined;
const postcode = (value) =>
@@ -274,7 +276,7 @@ let PersonalDetails = (props) => {
label={t(
"account:account-preferred-language-label"
)}
errorMsg="Is required"
errorMsg={t("account:is-required-label")}
/>
<Field
@@ -285,7 +287,7 @@ let PersonalDetails = (props) => {
className="govuk-input govuk-input--width-20"
validate={[required]}
label={t("account:account-first-name-label")}
errorMsg="Is required"
errorMsg={t("account:is-required-label")}
/>
<Field
name="lastname"
@@ -295,7 +297,7 @@ let PersonalDetails = (props) => {
className="govuk-input govuk-input--width-20"
validate={[required]}
label={t("account:account-last-name-label")}
errorMsg="Is required"
errorMsg={t("account:is-required-label")}
/>
<Field
name="emailaddress1"
@@ -323,7 +325,7 @@ let PersonalDetails = (props) => {
type="text"
className="govuk-input govuk-input--width-20"
label={t("account:account-company-group-label")}
errorMsg="Is required"
errorMsg={t("account:is-required-label")}
/>
</fieldset>
<fieldset className="govuk-fieldset">
@@ -343,7 +345,7 @@ let PersonalDetails = (props) => {
"account:account-address-line-1-label"
)}
validate={[required]}
errorMsg="Is required"
errorMsg={t("account:is-required-label")}
/>
<Field
name="address1_line2"
@@ -354,7 +356,7 @@ let PersonalDetails = (props) => {
label={t(
"account:account-address-line-2-label"
)}
errorMsg="Is required"
errorMsg={t("account:is-required-label")}
/>
<Field
name="address1_city"
@@ -364,7 +366,7 @@ let PersonalDetails = (props) => {
className="govuk-input govuk-input--width-10"
label={t("account:account-town-city-label")}
validate={[required]}
errorMsg="Is required"
errorMsg={t("account:is-required-label")}
/>
<Field
name="address1_county"
@@ -374,7 +376,7 @@ let PersonalDetails = (props) => {
className="govuk-input govuk-input--width-10"
label={t("account:account-county-label")}
validate={[required]}
errorMsg="Is required"
errorMsg={t("account:is-required-label")}
/>
<Field
name="address1_postalcode"