From f7654119920b8288f2e4800791acfce0ff9aef42 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Fri, 7 Feb 2025 12:44:03 +0000 Subject: [PATCH] rep defect 45 --- .../representation/representationAgent.js | 14 ++++++++--- .../representation/representationElements.js | 25 +++++++++++++------ .../representationInterestedPartyPerson.js | 14 ++++++++--- components/elements/index.js | 17 ++++++++++--- locales/cy/home.json | 6 ++++- locales/cy/myrepresentations.json | 4 ++- locales/en/home.json | 6 ++++- locales/en/myrepresentations.json | 4 ++- 8 files changed, 66 insertions(+), 24 deletions(-) diff --git a/components/case/representation/representationAgent.js b/components/case/representation/representationAgent.js index f29115e2..1aad6080 100644 --- a/components/case/representation/representationAgent.js +++ b/components/case/representation/representationAgent.js @@ -124,7 +124,12 @@ const RepAgent = (props) => { name="representationOnBehalfOf" datafieldname="representationOnBehalfOf" // label={t("myrepresentations:capacity-select-what-capacity-label")} - options={["Yes", "No"]} + options={[ + t( + "myrepresentations:questionnaire-yes" + ), + t("myrepresentations:questionnaire-no"), + ]} id="representationOnBehalfOf" className="govuk-radios__input" errorMsg={t( @@ -132,9 +137,10 @@ const RepAgent = (props) => { )} component={RenderCondtionalRadioList} validate={[required]} - legend={ - "Are you acting on behalf of a company, group or organisation?" - } + legend={t("case:representation-onbehalfof")} + hint={t( + "myrepresentations:representation-onbehalfof-hint" + )} /> diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js index 93c75517..422844f7 100644 --- a/components/case/representation/representationElements.js +++ b/components/case/representation/representationElements.js @@ -301,8 +301,7 @@ export const RenderCondtionalRadioList = ({
- e.g. "Owners of Numbers 1-5 High Street", or "Mr and Mrs - Smith" or "The executors of Mr Evans' estate" + {custom.hint}
{Object.keys(options).map((key, index) => ( @@ -346,8 +345,9 @@ export const RenderCondtionalRadioList = ({ className="govuk-label" htmlFor={id + "_details"} > - Enter the name of the - company/group/organisation + {t( + "myrepresentations:representation-onbehalfof-label" + )} { {uploadCountMessage > 0 && completedUploadFiles == false && (
- Uploading {uploadCountMessage} files{" "} + {t("home:uploading-files-label", { + number: uploadCountMessage, + })}
)} {completedUploadFiles > 0 && uploadCountMessage > 0 && (
- {uploadCountMessage} files uploaded{" "} + {t( + "home:completed-uploading-files-label", + { + number: uploadCountMessage, + } + )}
)} @@ -1261,7 +1268,9 @@ export const RenderFileUpload = (field) => {

) : (

- Uploading... + {t( + "home:uploading-files-progress-label" + )}

)}
@@ -1290,7 +1299,7 @@ export const RenderFileUpload = (field) => { blob.path.split("/")[1] ); }} - title="Remove this file" + title={t("home:remove-this-file-label")} > − diff --git a/components/case/representation/representationInterestedPartyPerson.js b/components/case/representation/representationInterestedPartyPerson.js index 3649b418..6967c61d 100644 --- a/components/case/representation/representationInterestedPartyPerson.js +++ b/components/case/representation/representationInterestedPartyPerson.js @@ -127,7 +127,12 @@ const RepInterestedPartyPerson = (props) => { name="representationOnBehalfOf" datafieldname="representationOnBehalfOf" // label="In what capacity do you wish to make representations on this case?" - options={["Yes", "No"]} + options={[ + t( + "myrepresentations:questionnaire-yes" + ), + t("myrepresentations:questionnaire-no"), + ]} id="representationOnBehalfOf" className="govuk-radios__input" errorMsg={t( @@ -135,9 +140,10 @@ const RepInterestedPartyPerson = (props) => { )} component={RenderCondtionalRadioList} validate={[required]} - legend={ - "Are you acting on behalf of a company, group or organisation?" - } + legend={t("case:representation-onbehalfof")} + hint={t( + "myrepresentations:representation-onbehalfof-hint" + )} /> diff --git a/components/elements/index.js b/components/elements/index.js index 1502943e..dfd8038d 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -2126,13 +2126,20 @@ const RenderFileUpload = (field) => { {uploadCountMessage > 0 && completedUploadFiles == false && (
- Uploading {uploadCountMessage} files{" "} + {t("home:uploading-files-label", { + number: uploadCountMessage, + })}
)} {completedUploadFiles > 0 && uploadCountMessage > 0 && (
- {uploadCountMessage} files uploaded{" "} + {t( + "home:completed-uploading-files-label", + { + number: uploadCountMessage, + } + )}
)} @@ -2188,7 +2195,9 @@ const RenderFileUpload = (field) => {

) : (

- Uploading... + {t( + "home:uploading-files-progress-label" + )}{" "}

)} @@ -2223,7 +2232,7 @@ const RenderFileUpload = (field) => { field.ticketnumber ); }} - title="Remove this file " + title={t("home:remove-this-file-label")} > − diff --git a/locales/cy/home.json b/locales/cy/home.json index d85df95d..9b31e35a 100644 --- a/locales/cy/home.json +++ b/locales/cy/home.json @@ -42,5 +42,9 @@ "dns-card-paragraph": "Mae Datblygiad o Arwyddocâd Cenedlaethol yn fath o gais cynllunio ar gyfer prosiect seilwaith mawr sydd o bwysigrwydd cenedlaethol.", "dns-card-button": "Gweld pob cais", "logging-in-heading": "Rydym yn dilysu eich cyfrif. Arhoswch a pheidiwch ag adnewyddu'r dudalen", - "logging-in-paragraph": "Arhoswch os gwelwch yn dda..." + "logging-in-paragraph": "Arhoswch os gwelwch yn dda...", + "uploading-files-progress-label": "Wrthi'n llwytho i fyny...", + "uploading-files-label": "Wrthi'n uwchlwytho {{number}} ffeil", + "completed-uploading-files-label": "{{number}} ffeil wedi'u huwchlwytho", + "remove-this-file-label": "Tynnu'r ffeil hon" } \ No newline at end of file diff --git a/locales/cy/myrepresentations.json b/locales/cy/myrepresentations.json index c6dc140e..92c402d6 100644 --- a/locales/cy/myrepresentations.json +++ b/locales/cy/myrepresentations.json @@ -237,5 +237,7 @@ "rep-finalising-label": "Wrthi'n uwchlwytho ffeiliau ar hyn o bryd ac yn cwblhau eich cyflwyniad cynrychioliad ", "rep-wait-label": "Arhoswch os gwelwch yn dda", "rep-period-passed-heading": "Mae'r cyfnod cynrychioli wedi mynd heibio", - "rep-period-notice-label": "Aeth y dyddiad dyledus ar gyfer y sylw hwn heibio. Ni allwch gyflwyno'r wybodaeth a ddarparwyd gennych mwyach." + "rep-period-notice-label": "Aeth y dyddiad dyledus ar gyfer y sylw hwn heibio. Ni allwch gyflwyno'r wybodaeth a ddarparwyd gennych mwyach.", + "representation-onbehalfof-hint": " e.e. \"Perchnogion Rhifau 1-5 Stryd Fawr\", neu \"Mr a Mrs Smith\" neu \"ysgutorion ystâd Mr Evans\"", + "representation-onbehalfof-label": "Rhowch enw'r cwmni/grŵp/sefydliad" } \ No newline at end of file diff --git a/locales/en/home.json b/locales/en/home.json index a81d094e..9f83d698 100644 --- a/locales/en/home.json +++ b/locales/en/home.json @@ -42,5 +42,9 @@ "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", "logging-in-heading": "We are authenticating your account please wait and don't refresh", - "logging-in-paragraph": "Please wait..." + "logging-in-paragraph": "Please wait...", + "uploading-files-progress-label": "Uploading...", + "uploading-files-label": "Uploading {{number}} files", + "completed-uploading-files-label": "{{number}} files uploaded", + "remove-this-file-label": "Remove this file" } \ No newline at end of file diff --git a/locales/en/myrepresentations.json b/locales/en/myrepresentations.json index 9493003a..e0723fe7 100644 --- a/locales/en/myrepresentations.json +++ b/locales/en/myrepresentations.json @@ -237,5 +237,7 @@ "rep-finalising-label": "Currently uploading files and finalising your representation submission", "rep-wait-label": "Please wait", "rep-period-passed-heading": "Representation period has passed", - "rep-period-notice-label": "The due date for this representation passed. You can no longer submit the information you have provided." + "rep-period-notice-label": "The due date for this representation passed. You can no longer submit the information you have provided.", + "representation-onbehalfof-hint": "e.g. \"Owners of Numbers 1-5 High Street\", or \"Mr and Mrs Smith\" or \"The executors of Mr Evans' estate\"", + "representation-onbehalfof-label": "Enter the name of the company/group/organisation" } \ No newline at end of file