welsh lang updates

This commit is contained in:
2024-06-10 10:36:27 +01:00
parent ab7f050a1e
commit f8a2d44443
14 changed files with 132 additions and 94 deletions
@@ -73,11 +73,22 @@ const RepAgent = (props) => {
</>
) : (
<label className="govuk-label govuk-body-m">
Representation Type:{" "}
{
formObj.representationForm.values
.representationType
}{" "}
{t("myrepresentations:representation-type")}:{" "}
{router.locale == "cy"
? formObj.representationForm.values
.representationType == "Questionnaire"
? "Holiadur"
: formObj.representationForm.values
.representationType == "Statement"
? "Datganiad"
: formObj.representationForm.values
.representationType ==
"Final comments"
? "Sylwadau terfynol"
: formObj.representationForm.values
.representationType
: formObj.representationForm.values
.representationType}
</label>
)}
</div>
@@ -73,11 +73,22 @@ const RepAppellant = (props) => {
</>
) : (
<label className="govuk-label govuk-body-m">
Representation Type:{" "}
{
formObj.representationForm.values
.representationType
}{" "}
{t("myrepresentations:representation-type")}:{" "}
{router.locale == "cy"
? formObj.representationForm.values
.representationType == "Questionnaire"
? "Holiadur"
: formObj.representationForm.values
.representationType == "Statement"
? "Datganiad"
: formObj.representationForm.values
.representationType ==
"Final comments"
? "Sylwadau terfynol"
: formObj.representationForm.values
.representationType
: formObj.representationForm.values
.representationType}
</label>
)}
</div>
@@ -210,7 +210,18 @@ const RepCompleteSubmit = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.representationType}
{router.locale == "cy"
? repFormData.representationType ==
"Questionnaire"
? "Holiadur"
: repFormData.representationType ==
"Statement"
? "Datganiad"
: repFormData.representationType ==
"Final comments"
? "Sylwadau terfynol"
: repFormData.representationType
: repFormData.representationType}
</dd>
<dd className="govuk-summary-list__actions">
@@ -475,6 +475,8 @@ export const RenderPickList = ({
...custom
}) => {
console.log(custom.disabled);
let { t } = useTranslation();
return (
<>
<div
@@ -503,11 +505,20 @@ export const RenderPickList = ({
disabled={custom.disabled}
onChange={onChange}
>
<option>Select...</option>
<option>{t("common:drop-down-select")}</option>
{Object.keys(optionsArr).map((key, index) => {
return (
<option key={key} value={optionsArr[key]}>
{optionsArr[key]}
{router.locale == "cy"
? optionsArr[key] == "Questionnaire"
? "Holiadur"
: optionsArr[key] == "Statement"
? "Datganiad"
: optionsArr[key] ==
"Final comments"
? "Sylwadau terfynol"
: optionsArr[key]
: optionsArr[key]}
</option>
);
})}
@@ -73,11 +73,22 @@ const RepInterestedPartyPerson = (props) => {
</>
) : (
<label className="govuk-label govuk-body-m">
Representation Type:{" "}
{
formObj.representationForm.values
.representationType
}{" "}
{t("myrepresentations:representation-type")}:{" "}
{router.locale == "cy"
? formObj.representationForm.values
.representationType == "Questionnaire"
? "Holiadur"
: formObj.representationForm.values
.representationType == "Statement"
? "Datganiad"
: formObj.representationForm.values
.representationType ==
"Final comments"
? "Sylwadau terfynol"
: formObj.representationForm.values
.representationType
: formObj.representationForm.values
.representationType}
</label>
)}
</div>
@@ -266,71 +266,24 @@ let RepLPA = (props) => {
</>
) : (
<label className="govuk-label govuk-body-m">
Representation Type:{" "}
{
formObj.representationForm.values
.representationType
}{" "}
{t("myrepresentations:representation-type")}:{" "}
{router.locale == "cy"
? formObj.representationForm.values
.representationType == "Questionnaire"
? "Holiadur"
: formObj.representationForm.values
.representationType == "Statement"
? "Datganiad"
: formObj.representationForm.values
.representationType ==
"Final comments"
? "Sylwadau terfynol"
: formObj.representationForm.values
.representationType
: formObj.representationForm.values
.representationType}
</label>
)}
{/* {!formObj["representationForm"].hasOwnProperty("values") ||
typeof formObj.representationForm.values
.representationType == "undefined" ? (
<>
<h2 className="govuk-heading-m ">
{typeof props.representationType !=
"undefined" ||
typeof formObj.representationForm.values
.representationType != "undefined"
? props.representationType ==
"Questionnaire"
? locale == "cy"
? "Holiadur"
: props.representationType
: props.representationType
: locale == "cy"
? "Cynrychioliadau"
: "Representation"}{" "}
{locale == "cy"
? "o ACLI am a"
: "from an LPA for a"}{" "}
{locale == "cy"
? jsonpath(
'$..[?(@.attributevalue=="' +
currentView.caseReference
.appealType +
'")].value_cy',
transLookup
)
: getFormCollectionByID(
currentView.caseReference.appealType
).value}
</h2>
<label
className="govuk-label govuk-body-m"
htmlFor="representationType"
>
{t(
"myrepresentations:representation-from-an-lpa-heading"
)}
</label>
<Field
id="representationType"
name="representationType"
component={RenderPickList}
datafieldname="representationType"
optionsArr={appellantApplicantRepresentationArr}
/>
</>
) : (
<label className="govuk-label govuk-body-m">
Representation Type:{" "}
{
formObj.representationForm.values
.representationType
}{" "}
</label>
)} */}
</div>
</div>
<div className="govuk-grid-row">
+28 -8
View File
@@ -409,7 +409,7 @@ const CaseSummary = (props) => {
)}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
Last modified
{t("case:summary-last-modified-label")}
</dt>
<dd className="govuk-summary-list__value">
{detailsObj.modifiedon > casesObj.modifiedon
@@ -492,7 +492,28 @@ const CaseSummary = (props) => {
<div className="govuk-grid-column-full govuk-!-padding-left-0">
<div className="govuk-button-group">
<p className="govuk-body">
The
{t(
"case:representation-date-passed-label",
{
startDate:
formatDates(
detailsObj.pinswg_startdate
),
endDate:
props
.currentView
.caseReference
.appealType ==
846040019
? formatDates(
detailsObj.pinswg_statementduedate
)
: formatDates(
detailsObj.pinswg_finalcommentsduedate
),
}
)}
{/* The
representation
period for
this appeal
@@ -511,12 +532,11 @@ const CaseSummary = (props) => {
)
: formatDates(
detailsObj.pinswg_finalcommentsduedate
)}
<br />
You can make
a
representation
by emailing{" "}
)} */}
<br />{" "}
{t(
"case:representation-date-passed-additional-label"
)}{" "}
<Link href="mailto:pedw.casework@gov.wales">
pedw.casework@gov.wales
</Link>