update proof and payment page text

src/pages/Payment/FPS/AckPage.js

@@ -202,7 +202,8 @@ const AckPage = () => {
                             {/*row 1*/}
                             <Grid item xs={12} md={12} spacing={2} sx={{ textAlign: "center" }}>
                                 <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
-                                    您的申請和付款已收到
+                                    {/* 您的申請和付款已收到 */}
+                                    <FormattedMessage id="MSG.paymentMsg"/>
                                 </Typography>
                                 <Grid container justifyContent="center" direction="column" spacing={2} sx={{ p: 2 }} alignitems="stretch" >
                                     <Grid item className="printOrder" xs={12} md={12} sx={{ pt: 2 }} style={{ height: '100%', order: 1 }}>
@@ -253,21 +254,22 @@ const AckPage = () => {
                                     <center>
                                         <Grid item xs={12} md={8} >
                                             <Typography variant="h5" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
-                                                付款取消訊息：
+                                                {/* 付款取消訊息： */}
+                                                <FormattedMessage id="MSG.paymentCancelMsg1"/>
                                                 <br /><br />
-                                                您的付款已被取消。我們收到了您的付款請求，但由於某些原因，付款無法完成。請注意以下事項：
+                                                <FormattedMessage id="MSG.paymentCancelMsg2"/>
                                                 <br /><br />
-                                                如果您主動取消了支付，請確認並確保取消是您的意願。
+                                                <FormattedMessage id="MSG.paymentCancelMsg3"/>
                                                 <br />
-                                                如果付款被取消是由於系統問題或其他原因，請您嘗試以下解決方法：
+                                                <FormattedMessage id="MSG.paymentCancelMsg4"/>
                                                 <br /><br />
-                                                檢查您的支付帳戶是否有任何異常或限制。
+                                                <FormattedMessage id="MSG.paymentCancelMsg5"/>
                                                 <br />
-                                                確保您的付款資訊準確無誤。
+                                                <FormattedMessage id="MSG.paymentCancelMsg6"/>
                                                 <br />
-                                                檢查您的網路連線是否正常。
+                                                <FormattedMessage id="MSG.paymentCancelMsg7"/>
                                                 <br /><br />
-                                                如果您需要進一步的協助或有任何疑問，請隨時與我們聯繫，我們將盡快解決您的付款問題。謝謝！
+                                                <FormattedMessage id="MSG.paymentCancelMsg8"/>
                                             </Typography>
                                         </Grid>
                                     </center>

src/pages/Payment/FPS/fpscallback.js

@@ -191,7 +191,7 @@ const Fpscallback = () => {
                         {/*row 1*/}
                         <Grid item xs={12} md={12} spacing={2} sx={{ textAlign: "center" }}>
                             <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
-                                您的申請和付款已收到
+                                <FormattedMessage id="MSG.paymentMsg"/>
                             </Typography>
                             <Grid container justifyContent="center" direction="column" spacing={2} sx={{ p: 2 }} alignitems="stretch" >
                                 <Grid item className="printOrder" xs={12} md={12} sx={{ pt: 2 }} style={{ height: '100%', order: 1 }}>
@@ -242,21 +242,21 @@ const Fpscallback = () => {
                                 <center>
                                     <Grid item xs={12} md={8} >
                                         <Typography variant="h5" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "left" }}>
-                                            付款取消訊息：
-                                            <br /><br />
-                                            您的付款已被取消。我們收到了您的付款請求，但由於某些原因，付款無法完成。請注意以下事項：
-                                            <br /><br />
-                                            如果您主動取消了支付，請確認並確保取消是您的意願。
-                                            <br />
-                                            如果付款被取消是由於系統問題或其他原因，請您嘗試以下解決方法：
-                                            <br /><br />
-                                            檢查您的支付帳戶是否有任何異常或限制。
-                                            <br />
-                                            確保您的付款資訊準確無誤。
-                                            <br />
-                                            檢查您的網路連線是否正常。
-                                            <br /><br />
-                                            如果您需要進一步的協助或有任何疑問，請隨時與我們聯繫，我們將盡快解決您的付款問題。謝謝！
+                                        <FormattedMessage id="MSG.paymentCancelMsg1"/>
+                                                <br /><br />
+                                                <FormattedMessage id="MSG.paymentCancelMsg2"/>
+                                                <br /><br />
+                                                <FormattedMessage id="MSG.paymentCancelMsg3"/>
+                                                <br />
+                                                <FormattedMessage id="MSG.paymentCancelMsg4"/>
+                                                <br /><br />
+                                                <FormattedMessage id="MSG.paymentCancelMsg5"/>
+                                                <br />
+                                                <FormattedMessage id="MSG.paymentCancelMsg6"/>
+                                                <br />
+                                                <FormattedMessage id="MSG.paymentCancelMsg7"/>
+                                                <br /><br />
+                                                <FormattedMessage id="MSG.paymentCancelMsg8"/>
                                         </Typography>
                                     </Grid>
                                 </center>

src/pages/Proof/Payment/Pay_Creditor.js

@@ -70,6 +70,7 @@ const Index = ({ record }) => {
                                             navigate("/publicNotice");
                                         }}
                                     >
+                                        <FormattedMessage id="backToNoticePage" />
                                     </Button>
                                 </Typography>
                             </Grid>

src/pages/Proof/Payment/Pay_DN.js

@@ -105,6 +105,7 @@ const Index = ({ record }) => {
                                             navigate("/publicNotice");
                                         }}
                                     >
+                                        <FormattedMessage id="backToNoticePage" />
                                     </Button>
                                 </Typography>
                             </Grid>

src/pages/Proof/Payment/Pay_Office.js

@@ -117,6 +117,7 @@ const Index = ({ record }) => {
                                             navigate("/publicNotice");
                                         }}
                                     >
+                                        <FormattedMessage id="backToNoticePage" />
                                     </Button>
                                 </Typography>
                             </Grid>

src/translations/en.json

@@ -23,7 +23,7 @@
   "payLater": "Pay later",
   "backToNoticePage": "Return to \"My Public Notices\"",
   "pleaseClickToPay": "Please click below to complete the payment",
-  "targetVol": "Target volume",
+  "targetVol": "Target Volume",
   "requireTargetVol": "Please select the target volume",
   "uploadFileBtn": "Upload file",
   "reUpload": "Re-upload",
@@ -199,6 +199,7 @@
   "userEnglishName": "English Name",
   "userContactName": "Name",
   "userRequireChineseName": "Please enter your Chinese name",
+  "userRequireEngChName": "Please enter your Chinese name",
   "userRequireEnglishName": "Please enter your English name",
   "userRequireName": "Name is required.",
   "userContactEmail": "Email",
@@ -407,7 +408,7 @@
   "careOfWarning":"You have been selected different Client Remark applications. Are you want to pay?",
   "warning":"Warning",
   "publishDate": "Publish Date",
-  "draftFile": "Manuscript file",
+  "draftFile": "Manuscript File",
   "download": "Download",
   "paymentHistory": "Payment History",
   "proofId": "Proof Code",
@@ -427,7 +428,7 @@
   "paymentDeadline": "Deadline for online confirm proof",
   "confirmingDealine": "Deadline for Confirming Proof",
   "PaymentCoonpletDealine": "Deadline for Payment Completion",
-  "payOnline":"Pay online via this system PNSPS",
+  "payOnline":"GPNSPS",
   "payDn":"Pay by issuance of General Demand Note",
   "payNPGO":"Pay at NPGO Collection Office",
   "paymentMeans":"Payment Means",