diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js index e00e020..b55938a 100644 --- a/src/pages/Proof/Reply_Public/ApplicationDetails.js +++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js @@ -278,7 +278,9 @@ const ApplicationDetailCard = ({ formData, }) => { ? ( {data.noOfPages} {intl.formatMessage({id: 'page'})} x $6,552 ) : - ( {data.length} cm x {data.colCount === 2 ? "$364 二格位" : "$182 一格位"} ) + ( {data.length} cm x {data.colCount === 2 ? + "$364 "+intl.formatMessage({id: 'doubleCol'}) : + "$182 "+intl.formatMessage({id: 'singleCol'})} ) } diff --git a/src/pages/PublicNotice/Details_Public/tabTableDetail/PaymentTab.js b/src/pages/PublicNotice/Details_Public/tabTableDetail/PaymentTab.js index 6a78c58..9ac0af1 100644 --- a/src/pages/PublicNotice/Details_Public/tabTableDetail/PaymentTab.js +++ b/src/pages/PublicNotice/Details_Public/tabTableDetail/PaymentTab.js @@ -19,6 +19,8 @@ export default function SubmittedTab({ rows }) { const theme = useTheme(); const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); const intl = useIntl(); + + const { locale } = intl; const handleEditClick = (params) => () => { navigate('/paymentPage/details/' + params.row.id); @@ -52,7 +54,7 @@ export default function SubmittedTab({ rows }) { width: isMdOrLg ? 'auto' : 160, flex: isMdOrLg ? 1 : undefined, renderCell: (params) => { - return PaymentStatus.getStatus_Cht(params); + return locale === 'en' ? PaymentStatus.getStatus_Eng(params):PaymentStatus.getStatus_Cht(params); } }, { diff --git a/src/translations/en.json b/src/translations/en.json index d9a70a5..411de36 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -396,6 +396,8 @@ "upload": "Upload", "actionFail": "Action failed: Please check the content and submit the reply again", "issueInvalidMsg": "Action failed: The Gazette Issue invalid, please apply again", + "singleCol":"Single Column", + "doubleCol":"Double Column", "transactionNo": "Transaction number", "transactionDate": "Transaction date", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 8da15bc..2402ffb 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -390,6 +390,8 @@ "upload": "上载", "actionFail": "行动失败: 请检查内容并再次提交回覆", "issueInvalidMsg": "行动失败: 无效宪报期数,请重新申请", + "singleCol":"一格位", + "doubleCol":"二格位", "transactionNo": "交易号码", "transactionDate": "交易日期", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 8c12694..86a95ae 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -393,6 +393,8 @@ "upload": "上載", "actionFail": "行動失敗: 請檢查內容並再次提交回覆", "issueInvalidMsg": "行動失敗: 無效憲報期數,請重新申請", + "singleCol":"一格位", + "doubleCol":"二格位", "transactionNo": "交易號碼", "transactionDate": "交易日期",