Skip to content

Commit

Permalink
Merge branch 'master' into feat/CIV-15084-test
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShwetaTandel-hmcts
ShwetaTandel-hmcts authored Oct 24, 2024
2 parents 27467fd + 4a62170 commit 76ef3dd
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 71 deletions.
22 changes: 19 additions & 3 deletions src/main/common/models/dashboard/dashboardItem.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@ export class DashboardClaimantItem extends DashboardItem {
CLAIMANT_REJECTED_PAYMENT_PLAN_REQ_JUDGE_DECISION: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.REJECTED_PAYMENT_PLAN_REQUEST_JUDGE_DECISION'},
DEFENDANT_PART_ADMIT: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.NOT_ADMITTED_CLAIMANT'},
DEFENDANT_PART_ADMIT_PAID: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.NOT_ADMITTED_CLAIMANT'},
HEARING_FORM_GENERATED: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.PAY_HEARING_FEE'},
HEARING_FORM_GENERATED_RELISTING: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.TRIAL_OR_HEARING_SCHEDULED'},
TRIAL_ARRANGEMENTS_REQUIRED: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.TRIAL_ARRANGEMENTS_REQUIRED'},
TRIAL_ARRANGEMENTS_SUBMITTED: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.TRIAL_ARRANGEMENTS_SUBMITTED'},
BUNDLE_CREATED: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.BUNDLE_CREATED'},
HEARING_SUBMIT_HWF: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HEARING_SUBMIT_HWF'},
AWAITING_JUDGMENT: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.AWAITING_JUDGMENT'},
ORDER_MADE: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.ORDER_MADE'},
RESPONSE_BY_POST: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.RESPONSE_BY_POST'},
WAITING_FOR_CLAIMANT_TO_RESPOND: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.NOT_ADMITTED_CLAIMANT'},
WAITING_COURT_REVIEW: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.WAITING_COURT_REVIEW'},
Expand All @@ -104,11 +112,13 @@ export class DashboardClaimantItem extends DashboardItem {
CLAIMANT_REJECT_PARTIAL_ADMISSION : {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.WAITING_COURT_REVIEW'},
CLAIMANT_HWF_NO_REMISSION : {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_NO_REMISSION'},
CLAIMANT_HWF_PARTIAL_REMISSION : {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_PARTIAL_REMISSION'},
CLAIMANT_HWF_FULL_REMISSION : {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_FULL_REMISSION'},
CLAIMANT_HWF_UPDATED_REF_NUMBER: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_UPDATED_REF_NUMBER'},
CLAIMANT_HWF_INVALID_REF_NUMBER: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_INVALID_REF_NUMBER'},
CLAIMANT_HWF_FEE_PAYMENT_OUTCOME: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_FEE_PAYMENT_OUTCOME'},
SETTLED: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.CLAIM_SETTLED'},
SDO_ORDER_CREATED: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_STATUS' },
SDO_ORDER_CREATED_PRE_CP: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_STATUS_PRE_CP' },
SDO_ORDER_CREATED_CP: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_STATUS_CP' },
SDO_ORDER_LEGAL_ADVISER_CREATED: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_LEGAL_ADVISER_STATUS' },
SDO_ORDER_IN_REVIEW: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_IN_REVIEW' },
SDO_ORDER_IN_REVIEW_OTHER_PARTY: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_IN_REVIEW_OTHER_PARTY_DEFENDANT' },
Expand Down Expand Up @@ -211,7 +221,12 @@ export class DashboardDefendantItem extends DashboardItem {
},
DEFENDANT_PART_ADMIT: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.PART_ADMIT_NOT_PAID'},
HEARING_FORM_GENERATED: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.TRIAL_OR_HEARING_SCHEDULED'},
MORE_DETAILS_REQUIRED: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.MORE_DETAILS_REQUIRED' },
HEARING_FORM_GENERATED_RELISTING: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.TRIAL_OR_HEARING_SCHEDULED'},
TRIAL_ARRANGEMENTS_REQUIRED: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.TRIAL_ARRANGEMENTS_REQUIRED'},
TRIAL_ARRANGEMENTS_SUBMITTED: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.TRIAL_ARRANGEMENTS_SUBMITTED'},
AWAITING_JUDGMENT: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.AWAITING_JUDGMENT'},
BUNDLE_CREATED: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.BUNDLE_CREATED'},
ORDER_MADE: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.ORDER_MADE'},
MEDIATION_SUCCESSFUL: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.MEDIATION_SUCCESSFUL' },
MEDIATION_UNSUCCESSFUL: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.MEDIATION_UNSUCCESSFUL' },
IN_MEDIATION: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.IN_MEDIATION' },
Expand All @@ -224,7 +239,8 @@ export class DashboardDefendantItem extends DashboardItem {
translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.CLAIMANT_REJECT_PARTIAL_ADMISSION',
parameter: [paramClaimantName, paramAdmittedAmount],
},
SDO_ORDER_CREATED: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.SDO_ORDER_STATUS' },
SDO_ORDER_CREATED_PRE_CP: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.SDO_ORDER_STATUS_PRE_CP' },
SDO_ORDER_CREATED_CP: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.SDO_ORDER_STATUS_CP' },
SDO_ORDER_LEGAL_ADVISER_CREATED: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_LEGAL_ADVISER_STATUS' },
SDO_ORDER_IN_REVIEW: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_IN_REVIEW' },
SDO_ORDER_IN_REVIEW_OTHER_PARTY: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_IN_REVIEW_OTHER_PARTY_CLAIMANT' },
Expand Down
36 changes: 26 additions & 10 deletions src/main/modules/i18n/locales/cy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2069,7 +2069,9 @@
"STATUS_CLAIMANT": {
"ACCEPTED_PARTIAL_ADMISSION": "Rydych wedi derbyn addefiad rhannol y diffynnydd. Maent wedi dweud y byddant yn talu ar unwaith.",
"ADMIT_PAY_IMMEDIATELY_CLAIMANT": "Arhoswch i'r diffynnydd eich talu.",
"AWAITING_JUDGMENT": "Yn aros am ganlyniad yr achos.",
"BOTH_SIGNED_SETTLEMENT_AGREEMENT": "Mae'r ddau ohonoch wedi llofnodi cytundeb setlo.",
"BUNDLE_CREATED": "Mae’r bwndel yn barod i’w weld.",
"CLAIM_ENDED": "Bu ichi stopio’r hawliad hwn.",
"CLAIM_FEE_NOT_PAID": "Talu’r ffi hawliad.",
"CLAIM_SETTLED": "Mae'r hawliad hwn wedi'i setlo.",
Expand All @@ -2082,11 +2084,13 @@
"DECISION_ON_RECONSIDERATION": "An order has been made.",
"DEFENDANT_REJECTED_SETTLEMENT_AGREEMENT": "{{ defendantName }} has rejected your settlement agreement. You can request a County Court Judgment against them.",
"DOCUMENTS_BEING_TRANSLATED": "Mae’r dogfennau yn cael eu cyfieithu.",
"HWF_FEE_PAYMENT_OUTCOME": "Mae ffi’r gwrandawiad wedi cael ei thalu.",
"HWF_INVALID_REF_NUMBER": "Mi wnaethoch roi rhif Help i Dalu Ffioedd annilys i ni.",
"HWF_MORE_INFORMATION_NEEDED": "Rydym angen mwy o wybodaeth.",
"HEARING_SUBMIT_HWF": "Rydym yn gwirio eich cais am Help i Dalu Ffioedd.",
"HWF_FEE_PAYMENT_OUTCOME": "Mae ffi’r gwrandawiad wedi’i dalu.",
"HWF_INVALID_REF_NUMBER": "Fe wnaethoch roi rhif Help i Dalu Ffioedd annilys inni.",
"HWF_MORE_INFORMATION_NEEDED": "Mae arnom angen rhagor o wybodaeth",
"HWF_NO_REMISSION": "Mae eich cais am Help i Dalu Ffioedd wedi cael ei wrthod.",
"HWF_PARTIAL_REMISSION": "Rydym wedi adolygu eich cais am Help i Dalu Ffioedd.",
"HWF_FULL_REMISSION": "Mae ffi’r gwrandawiad wedi’i dalu.",
"HWF_UPDATED_REF_NUMBER": "Rydym wedi adolygu eich cais am Help i Dalu Ffioedd.",
"IN_MEDIATION": "Bydd eich apwyntiad cyfryngu yn cael ei drefnu o fewn 28 diwrnod.",
"MEDIATION_SUCCESSFUL": "Cytunodd y ddau ohonoch i setlo’r anghydfod drwy gyfryngu.",
Expand All @@ -2096,16 +2100,22 @@
"NOT_ADMITTED_CLAIMANT": "Ymateb i'r diffynnydd.",
"OFFERED_INSTALMENTS": "Mae'r diffynnydd wedi cynnig talu mewn rhandaliadau. Gallwch dderbyn neu wrthod ei gynnig/chynnig.",
"OFFERED_SET_DATE": "Mae'r diffynnydd wedi cynnig talu erbyn dyddiad penodol. Gallwch dderbyn neu wrthod eu cynnig.",
"ORDER_MADE": "Mae gorchymyn wedi’i wneud gan y llys.",
"REQUESTED_MORE_TIME_TO_RESPOND": "Mae {{defendantName}} wedi gofyn am fwy o amser i ymateb.",
"RESPONSE_BY_POST": "Bydd yr hawliad yn parhau drwy'r post.",
"SDO_ORDER_STATUS": "Mae’r llys wedi cyhoeddi gorchymyn; ni ellir parhau â’r hawliad hwn ar-lein a bydd yn rhaid defnyddio ffurflenni papur.",
"SDO_ORDER_LEGAL_ADVISER_STATUS": "Anfonwch fwy o fanylion atom cyn y gwrandawiad.",
"SDO_ORDER_STATUS_PRE_CP": "Mae’r llys wedi cyhoeddi gorchymyn; ni ellir parhau â’r hawliad hwn ar-lein a bydd yn rhaid defnyddio ffurflenni papur.",
"SDO_ORDER_STATUS_CP": "Mae gorchymyn wedi’i wneud gan y llys.",
"SDO_ORDER_LEGAL_ADVISER_STATUS": "Mae gorchymyn wedi’i wneud gan y llys.",
"SDO_ORDER_IN_REVIEW": "Arhoswch i'r llys adolygu'r gorchymyn.",
"SDO_ORDER_IN_REVIEW_OTHER_PARTY_CLAIMANT": "Darllenwch geisiadau'r hawlydd i farnwr adolygu'r gorchymyn.",
"SDO_ORDER_IN_REVIEW_OTHER_PARTY_DEFENDANT": "Darllenwch geisiadau'r diffynnydd i farnwr adolygu'r gorchymyn.",
"TRIAL_ARRANGEMENTS_REQUIRED": "Cadarnhau trefniadau eich treial.",
"TRIAL_ARRANGEMENTS_SUBMITTED": "Cadarnhau trefniadau’r treial.",
"PAY_HEARING_FEE": "Talu ffi’r gwrandawiad.",
"TRIAL_OR_HEARING_SCHEDULED": "Mae Treial neu Wrandawiad wedi’i drefnu ar gyfer yr achos hwn.",
"WAITING_CLAIMANT_INTENT_DOC_UPLOAD": "Mae'r dogfennau'n cael eu cyfieithu.",
"WAITING_COURT_REVIEW": "Aros i'r llys adolygu'r achos.",
"HEARING_FEE_UNPAID": "Mae'r hawliad wedi cael ei ddileu.",
"HEARING_FEE_UNPAID": "Mae’r hawliad hwn wedi cael ei ddileu.",
"CASE_DISMISSED": "Mae’r achos wedi’i gau.",
"CASE_STAYED": "Mae’r achos wedi cael ei atal."
},
Expand All @@ -2114,6 +2124,8 @@
"ADMIT_PAY_BY_INSTALLMENTS": "Rydych wedi derbyn yr hawliad yn ei gyfanrwydd ac wedi cynnig talu'r swm llawn mewn rhandaliadau.",
"ADMIT_PAY_IMMEDIATELY": "Rydych wedi derbyn yr hawliad yn ei gyfanrwydd a dweud y byddwch yn talu'r swm llawn ar unwaith.",
"AWAITING_CLAIMANT_RESPONSE": "Aros i'r hawlydd ymateb.",
"AWAITING_JUDGMENT": "Yn aros am ganlyniad yr achos.",
"BUNDLE_CREATED": "Mae’r bwndel yn barod i’w weld.",
"CASE_PASSED_TO_COURT_ORDER_BUSINESS_CENTRE": "Achos wedi ei basio i Ganolfan Fusnes y Llys Sirol.",
"CASE_SENT_TO_COURT": "Achos wedi ei anfon i'r llys.",
"CLAIM_ENDED": "Mae'r hawliad hwn wedi dod i ben.",
Expand All @@ -2131,28 +2143,32 @@
"DEFAULT_JUDGEMENT_ISSUED_STATUS": "The claimant has requested a County Court Judgment (CCJ) against you on {{ defaultJudgementIssuedDate }}",
"DOCUMENTS_BEING_TRANSLATED": "Mae’r dogfennau yn cael eu cyfieithu.",
"IN_MEDIATION": "Bydd eich apwyntiad cyfryngu yn cael ei drefnu o fewn 28 diwrnod.",
"MORE_DETAILS_REQUIRED": "Anfonwch fwy o fanylion atom cyn y gwrandawiad",
"MEDIATION_UNSUCCESSFUL": "Nid oedd y cyfryngu yn llwyddiannus.",
"MEDIATION_SUCCESSFUL": "Cytunodd y ddau ohonoch i setlo’r anghydfod drwy gyfryngu.",
"NO_RESPONSE_ON_TIME": "Ymateb i hawliad: {{ numberOfDays }} diwrnod yn weddill.",
"NO_RESPONSE_OVERDUE": "Ymateb i hawliad: {{ numberOfDays }} yn hwyr.",
"NO_RESPONSE_DUE_TODAY": "Ymateb i hawliad: yn ddyledus heddiw.",
"NO_RESPONSE_ELIGIBLE_CCJ": "Nid ydych wedi ymateb i'r hawliad. Gall {{ claimantName }} nawr ofyn am Ddyfarniad Llys Sirol (CCJ) yn eich erbyn. Gallwch ymateb i'r hawliad hwn o hyd cyn i’r hawlydd ofyn am CCJ.",
"ORDER_MADE": "Mae gorchymyn wedi’i wneud gan y llys.",
"PART_ADMIT_NOT_PAID": "Rydych wedi derbyn rhan o'r hawliad.",
"PART_ADMIT_STATES_PAID": "Rydym wedi anfon e-bost at {{ claimantName }} yn dweud pryd a sut y dywedasoch eich bod wedi talu'r hawliad.",
"RESPONSE_BY_POST": "Bydd yr hawliad yn parhau drwy'r post.",
"REQUESTED_CHANGE_BY_CLAIMANT": "Gwnaeth yr hawlydd gais i newid rhywbeth am yr hawliad.",
"REQUESTED_CHANGE_BY_DEFENDANT": "Rydych wedi gwneud cais i newid yr hawliad.",
"REQUESTED_MORE_TIME_TO_RESPOND": "Mae angen i chi ymateb cyn 4pm ar {{ responseDeadline }}.",
"SETTLEMENT_SIGNED": "Mae'r ddau ohonoch wedi llofnodi cytundeb setlo.",
"SDO_ORDER_STATUS": "Mae’r llys wedi cyhoeddi gorchymyn; ni ellir parhau â’r hawliad hwn ar-lein a bydd yn rhaid defnyddio ffurflenni papur.",
"TRIAL_OR_HEARING_SCHEDULED": "Mae Gwrandawiad neu Dreial wedi'i drefnu ar gyfer yr achos hwn.",
"SDO_ORDER_STATUS_PRE_CP": "Mae’r llys wedi cyhoeddi gorchymyn; ni ellir parhau â’r hawliad hwn ar-lein a bydd yn rhaid defnyddio ffurflenni papur.",
"SDO_ORDER_STATUS_CP": "Mae gorchymyn wedi’i wneud gan y llys.",
"SDO_ORDER_LEGAL_ADVISER_STATUS": "Mae gorchymyn wedi’i wneud gan y llys.",
"TRIAL_ARRANGEMENTS_REQUIRED": "Cadarnhau trefniadau eich treial.",
"TRIAL_ARRANGEMENTS_SUBMITTED": "Cadarnhau trefniadau’r treial.",
"TRIAL_OR_HEARING_SCHEDULED": "Mae Treial neu Wrandawiad wedi’i drefnu ar gyfer yr achos hwn.",
"WAITING_CLAIMANT_INTENT_DOC_UPLOAD": "Mae'r dogfennau'n cael eu cyfieithu.",
"WAITING_COURT_REVIEW": "Aros i'r llys adolygu'r achos.",
"BOTH_SIGNED_SETTLEMENT_AGREEMENT": "Mae'r ddau ohonoch wedi llofnodi cytundeb setlo.",
"CLAIMANT_SIGNED_SETTLEMENT_AGREEMENT": "{{ claimantName }} asked you to sign a settlement agreement.",
"DEFENDANT_REJECTED_SETTLEMENT_AGREEMENT": "You rejected the settlement agreement.",
"HEARING_FEE_UNPAID": "Mae'r hawliad wedi cael ei ddileu.",
"HEARING_FEE_UNPAID": "Mae'r hawliad hwn wedi cael ei ddileu.",
"CASE_DISMISSED": "Mae’r achos wedi’i gau.",
"CASE_STAYED": "Mae’r achos wedi cael ei atal."
},
Expand Down
Loading

0 comments on commit 76ef3dd

Please sign in to comment.