Merge branch 'master' into Timebox-9

src/pages/Proof/Reply_Public/ProofForm.js

@@ -26,7 +26,7 @@ import {PNSPS_BUTTON_THEME} from "themes/buttonConst";
 import {ThemeProvider} from "@emotion/react";
 import {FormattedMessage, useIntl} from "react-intl";
 const UploadFileTable = Loadable(React.lazy(() => import('./UploadFileTable')));
-import * as ProofStatus from "utils/statusUtils/ProofStatus";
+//import * as ProofStatus from "utils/statusUtils/ProofStatus";
 
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
@@ -176,7 +176,7 @@ const FormPanel = ({ formData }) => {
                                     </span>)}
                                 </Typography>
                             </Grid>
-                            <Grid item xs={12} md={12} textAlign="left">
+                            {/* <Grid item xs={12} md={12} textAlign="left">
                                 <Typography variant="h5">
                                     <FormattedMessage id="proofReply" /> :&nbsp;
                                     <span style={{ color: 'green' }}>
@@ -188,7 +188,7 @@ const FormPanel = ({ formData }) => {
                                         }
                                     </span>
                                 </Typography>
-                            </Grid>
+                            </Grid> */}
                             {
                                 formik.values.action ?
                                     null
@@ -214,7 +214,7 @@ const FormPanel = ({ formData }) => {
                             isOverTime() ?
                                 <Grid container direction="column" sx={{ paddingLeft: 0, paddingRight: 0 }} spacing={1}>
                                     <Grid item xs={12} md={12} textAlign="left">
-                                        <Typography variant="h5">回覆逾時，請重新申請。</Typography>
+                                        <Typography variant="h5"><FormattedMessage id="MSG.proofOutOfTime" /></Typography>
                                     </Grid>
                                 </Grid>
                                 :

src/translations/en.json

@@ -63,6 +63,7 @@
   "MSG.payMsg2_2": " and we will process the publication after receiving payment confirmation.",
   "MSG.payMsg3": "If you have multiple public notice applications within the Year {issueYear},  Volume {issueVolume}, Issue {issueNo} of the Official Gazette, you can choose to merge the payment for all the approved manuscripts within this issue in 'My Public Notice' before the payment deadline.",
 
+  "MSG.proofOutOfTime": "Response out of time, please apply again.",
 
   "registerTitle1": "Become",
   "registerTitle2": "Gazette Notice",

src/translations/zh-CN.json

@@ -62,6 +62,7 @@
   "MSG.payMsg2_2": " 前 完成缴费，我们将于收到缴费确认后处理刊出事宜。" ,
   "MSG.payMsg3": "如你在宪报期数{issueYear} 年{issueVolume} 卷, 第{issueNo} 期内有多于一个公共启事的申请，你可选择完成所有此期所有稿件校对确定后，于缴费期限前在「我的公共启事」内合并付款。 ",
 
+  "MSG.proofOutOfTime": "回覆逾时，请重新申请。",
 
   "registerTitle1": "立即成为",
   "registerTitle2": "宪报刊登公告",

src/translations/zh-HK.json

@@ -62,6 +62,7 @@
   "MSG.payMsg2_2": " 前 完成繳費，我們將於收到繳費確認後處理刊出事宜。",
   "MSG.payMsg3": "如你在憲報期數 {issueYear} 年 {issueVolume} 卷, 第 {issueNo} 期內有多於一個公共啟事的申請，你可選擇完成所有此期所有稿件校對確定後，於繳費期限前在「我的公共啟事」內合併付款。",
 
+  "MSG.proofOutOfTime": "回覆逾時，請重新申請。",
 
   "registerTitle1": "立即成為",
   "registerTitle2": "憲報刊登公告",