diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js index b401116..397fa18 100644 --- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js @@ -201,7 +201,7 @@ const ApplicationDetailCard = ( color="orange" > - Re-submit + Re-Submit : (currentApplicationDetailData.status == "confirmed" && currentApplicationDetailData.creditor == 1) ? diff --git a/src/translations/en.json b/src/translations/en.json index d8627e7..980ee64 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -316,8 +316,8 @@ "pendingPayment": "Pending Payment", "pendingPublish": "To be Published", "completed": "Completed", - "notAccepted": "Not accepted", - "resubmit": "Re-submit Required", + "notAccepted": "Not Accepted", + "resubmit": "Re-Submit Required", "cancelled": "Cancelled", "withdrawn": "Withdrawn", "searchApplyRecord": "Search application record", @@ -369,9 +369,9 @@ "applyStatus": "App. Status", "gazetteCount": "Gazette Issue No.", "gazetteCount2" :"Gazette Issue No./ Remarks", - "gazetteCount2_1" :"Care Of/ Remarks", - "gazetteCount3" :"Gazette Issue No./ Care Of/ Remarks", - "careOf":"Care Of", + "gazetteCount2_1" :"Care Of (c/o)/ Remarks", + "gazetteCount3" :"Gazette Issue No./ Care Of (c/o)/ Remarks", + "careOf":"Care Of (c/o)", "publishDate": "Publish Date", "draftFile": "Manuscript file", "download": "Download", diff --git a/src/utils/statusUtils/PublicNoteStatusUtils.js b/src/utils/statusUtils/PublicNoteStatusUtils.js index 1916d02..291b322 100644 --- a/src/utils/statusUtils/PublicNoteStatusUtils.js +++ b/src/utils/statusUtils/PublicNoteStatusUtils.js @@ -57,9 +57,9 @@ export function getStatusByTextEng(status, creditor) { case "completed": return getStatusTag({ color: "#8a8784", text: "Completed" }) case "notAccepted": - return getStatusTag({ color: "#d9372b", text: "Not accepted" }) + return getStatusTag({ color: "#d9372b", text: "Not Accepted" }) case "resubmit": - return getStatusTag({ color: "#757373", text: "Re-submit Required" }) + return getStatusTag({ color: "#757373", text: "Re-Submit Required" }) case "cancelled": return getStatusTag({ color: "#8a8784", text: "Cancelled" }) case "withdrawn":