From 54728d95657f7a827365b6e4a1d1f9f0851cf6ac Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 16 Dec 2024 16:44:44 +0000 Subject: [PATCH] whole number language and regex validatiojn --- components/elements/index.js | 2 +- locales/cy/newappeal.json | 2 +- locales/en/newappeal.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/elements/index.js b/components/elements/index.js index 4ca93ce0..c13f29cb 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -1432,7 +1432,7 @@ export function NumericField(props) { : t("newappeal:is-required-label"); }; const isNumber = (value) => { - const regex = /^\d*\.?\d{0,1}$/; + const regex = /^\d+$/; return regex.test(value) ? undefined : t("newappeal:invalid-number-label"); diff --git a/locales/cy/newappeal.json b/locales/cy/newappeal.json index 40dbbb33..38d2132c 100644 --- a/locales/cy/newappeal.json +++ b/locales/cy/newappeal.json @@ -18,7 +18,7 @@ "is-required-label": "Yn ofynnol", "select-a-date-label": "Dewiswch ddyddiad", "invalid-decimal-label": "Rhif annilys (uchafswm o 7 nod, 2 le degol)", - "invalid-number-label": "Dylai fod yn rhif", + "invalid-number-label": "Dylai fod yn rhif cyfan", "emojis-not-allowed-label": "Ni chaniateir emojis", "invalid-postcode-label": "Cod post annilys", "invalid-phonenumber-label": "Rhif ffôn annilys", diff --git a/locales/en/newappeal.json b/locales/en/newappeal.json index 2e3fcf39..1c7de39f 100644 --- a/locales/en/newappeal.json +++ b/locales/en/newappeal.json @@ -18,7 +18,7 @@ "is-required-label": "Is required", "select-a-date-label": "Select a date", "invalid-decimal-label": "Invalid number (max 7 characters, 2 decimal places)", - "invalid-number-label": "Should be a number", + "invalid-number-label": "Should be a whole number", "emojis-not-allowed-label": "Emojis are not allowed", "invalid-postcode-label": "Invalid postcode", "invalid-phonenumber-label": "Invalid phone number",