From b7f6d33310234358849055f1ba0cab13f4393f99 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Tue, 7 May 2024 12:24:00 +0800
Subject: [PATCH] i18n

---
 src/pages/Proof/Reply_Public/ProofForm.js | 12 ++++++------
 src/translations/en.json                  |  2 ++
 src/translations/zh-CN.json               |  2 ++
 src/translations/zh-HK.json               |  2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 96f34b6..e3bcca4 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -310,8 +310,8 @@ const FormPanel = ({ formData }) => {
                                                                 <li><FormattedMessage id="pps" /></li>
                                                             </ul>
                                                         </td>
-                                                        <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, "YYYY年MM月DD日")} 2:00 p.m.</td>
-                                                        <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, "YYYY年MM月DD日")} 2:30 p.m.</td>
+                                                        <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 2:00 p.m.</td>
+                                                        <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 2:30 p.m.</td>
                                                     </tr>
                                                     {
                                                         isOverDnReviseDeadline() ?
@@ -339,10 +339,10 @@ const FormPanel = ({ formData }) => {
                                                                         <li><FormattedMessage id="post" /></li>
                                                                     </ul>
                                                                 </td>
-                                                                <td style={tabelStyle}>{DateUtils.dateFormat(formData.beforeClosingDate, "YYYY年MM月DD日")} 5:00 p.m.</td>
+                                                                <td style={tabelStyle}>{DateUtils.dateFormat(formData.beforeClosingDate, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td>
                                                                 <td style={tabelStyle}>
                                                                     <FormattedMessage id="payDnRemark" values={{
-                                                                        date: DateUtils.dateFormat(formData.closingDate, "YYYY年MM月DD日") + " 12:30 p.m."
+                                                                        date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:30 p.m."
                                                                     }} />
                                                                 </td>
                                                             </tr>
@@ -366,10 +366,10 @@ const FormPanel = ({ formData }) => {
                                                                         <li><FormattedMessage id="cash" /></li>
                                                                     </ul>
                                                                 </td>
-                                                                <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, "YYYY年MM月DD日")} 12:00 p.m.</td>
+                                                                <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 12:00 p.m.</td>
                                                                 <td style={tabelStyle}>
                                                                     <FormattedMessage id="payNPGORemark" values={{
-                                                                        date: DateUtils.dateFormat(formData.closingDate, "YYYY年MM月DD日") + " 12:30 p.m."
+                                                                        date: DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" })) + " 12:30 p.m."
                                                                     }} />
                                                                 </td>
                                                             </tr>
diff --git a/src/translations/en.json b/src/translations/en.json
index f3ca476..19a2120 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -4,6 +4,8 @@
   "zh-CN": "简体中文",
   "language":"Language",
   "iamsmartLink": "https://www.iamsmart.gov.hk/en/",
+  "dateStrFormat": "YYYY-MM-DD",
+  "datetimeStrFormat": "YYYY-MM-DD HH:mm:ss",
   
   "PNSPS": "PNSPS",
   "HKSARGOV": "HKSAR Government",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index eacc506..5ca833b 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -4,6 +4,8 @@
   "zh-CN": "简体中文",
   "language":"语言",
   "iamsmartLink": "https://www.iamsmart.gov.hk/sc/",
+  "dateStrFormat": "YYYY年MM月DD日",
+  "datetimeStrFormat": "YYYY年MM月DD日 HH:mm:ss",
 
   "PNSPS": "公共启事提交及缴费系统",
   "HKSARGOV": "香港特别行政区政府",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 91ac3d9..1b383bf 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -4,6 +4,8 @@
   "zh-CN": "简体中文",
   "language":"語言",
   "iamsmartLink": "https://www.iamsmart.gov.hk/tc/",
+  "dateStrFormat": "YYYY年MM月DD日",
+  "datetimeStrFormat": "YYYY年MM月DD日 HH:mm:ss",
 
   "PNSPS": "公共啟事提交及繳費系統",
   "HKSARGOV": "香港特別行政區政府",