From ca0dca8c1066a9654abf4ac8eebe670c1e865f18 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Tue, 16 Jul 2024 14:47:59 +0800
Subject: [PATCH] update words

---
 src/pages/Proof/Reply_Public/ProofForm.js              | 10 +++++-----
 src/pages/Proof/Search_Public/DataGrid.js              |  2 +-
 .../PublicNotice/ApplyForm/PublicNoticeApplyForm.js    |  6 +++---
 src/translations/en.json                               | 10 +++++-----
 src/translations/zh-CN.json                            | 10 +++++-----
 src/translations/zh-HK.json                            | 10 +++++-----
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 57b6b5c..12628a1 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -340,7 +340,7 @@ const FormPanel = ({ formData }) => {
                                                                     <br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
                                                                         setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
                                                                         setWarningText(
-                                                                            <><FormattedMessage id="paymentMethodMeans" />
+                                                                            <><FormattedMessage id="paymentMethodMeans" />:
                                                                                 <ul>
                                                                                     <li><FormattedMessage id="atm" /></li>
                                                                                     <li><FormattedMessage id="pps" /></li>
@@ -381,7 +381,7 @@ const FormPanel = ({ formData }) => {
                                                                     <br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
                                                                         setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
                                                                         setWarningText(
-                                                                            <><FormattedMessage id="paymentMethodMeans" />
+                                                                            <><FormattedMessage id="paymentMethodMeans" />:
                                                                                 <ul>
                                                                                     <li><FormattedMessage id="cheque" /></li>
                                                                                     <li><FormattedMessage id="drafts" /></li>
@@ -427,7 +427,7 @@ const FormPanel = ({ formData }) => {
                                                                         <br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
                                                                             setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" }))
                                                                             setWarningText(
-                                                                                <><FormattedMessage id="paymentMethodMeans" />
+                                                                                <><FormattedMessage id="paymentMethodMeans" />:
                                                                                     <ul>
                                                                                         <li><FormattedMessage id="fps" /></li>
                                                                                         <li><FormattedMessage id="card" /></li>
@@ -473,7 +473,7 @@ const FormPanel = ({ formData }) => {
                                                                         <br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
                                                                             setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
                                                                             setWarningText(
-                                                                                <><FormattedMessage id="paymentMethodMeans" />
+                                                                                <><FormattedMessage id="paymentMethodMeans" />:
                                                                                     <ul>
                                                                                         <li><FormattedMessage id="atm" /></li>
                                                                                         <li><FormattedMessage id="pps" /></li>
@@ -520,7 +520,7 @@ const FormPanel = ({ formData }) => {
                                                                         <br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
                                                                             setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
                                                                             setWarningText(
-                                                                                <><FormattedMessage id="paymentMethodMeans" />
+                                                                                <><FormattedMessage id="paymentMethodMeans" /> :
                                                                                     <ul>
                                                                                         <li><FormattedMessage id="cheque" /></li>
                                                                                         <li><FormattedMessage id="drafts" /></li>
diff --git a/src/pages/Proof/Search_Public/DataGrid.js b/src/pages/Proof/Search_Public/DataGrid.js
index 22a2835..a8571d9 100644
--- a/src/pages/Proof/Search_Public/DataGrid.js
+++ b/src/pages/Proof/Search_Public/DataGrid.js
@@ -119,7 +119,7 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
         },
         {
             id: 'created',
-            field: 'created',
+            field: 'reviseDeadline',
             headerName: intl.formatMessage({id: 'proofDate'}),
             width: isMdOrLg ? 'auto' : 200,
             flex: isMdOrLg ? 1.5 : undefined,
diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
index b7eb04a..b6fe801 100644
--- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
+++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
@@ -342,7 +342,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
                                                             <br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
                                                                 setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payOnline" }))
                                                                 setWarningText(
-                                                                    <><FormattedMessage id="paymentMethodMeans" />
+                                                                    <><FormattedMessage id="paymentMethodMeans" />:
                                                                         <ul>
                                                                             <li><FormattedMessage id="fps" /></li>
                                                                             <li><FormattedMessage id="card" /></li>
@@ -365,7 +365,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
                                                             <br /><a href="#payDnDetails" onClick={() => {
                                                                 setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
                                                                 setWarningText(
-                                                                    <><FormattedMessage id="paymentMethodMeans" />
+                                                                    <><FormattedMessage id="paymentMethodMeans" />:
                                                                         <ul>
                                                                             <li><FormattedMessage id="atm" /></li>
                                                                             <li><FormattedMessage id="pps" /></li>
@@ -397,7 +397,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
                                                             <br /><a href="#payNPGODetails" onClick={() => {
                                                                 setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" }))
                                                                 setWarningText(
-                                                                    <><FormattedMessage id="paymentMethodMeans" />
+                                                                    <><FormattedMessage id="paymentMethodMeans" />:
                                                                         <ul>
                                                                             <li><FormattedMessage id="cheque" /></li>
                                                                             <li><FormattedMessage id="drafts" /></li>
diff --git a/src/translations/en.json b/src/translations/en.json
index 50c9185..8d8aa46 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -10,7 +10,7 @@
   
   "PNSPS": "PNSPS",
   "PNSPS_fullname": "Public Notice Submission and Payment System",
-  "HKSARGOV": "The Government of Hong Kong Special Administrative Region",
+  "HKSARGOV": "The Government of the Hong Kong Special Administrative Region",
   "HKGLD": "Government Logistics Department",
   "importantNotice": "Important Notice",
   "privacyPolicy": "Privacy Policy",
@@ -151,7 +151,7 @@
   "authorizeIAmSmartForInfo": "Authorise \"iAM Smart\" to provide personal information",
   "iAmSmartSubTitle": "In order to complete the account opening and establish a connection with \"iAM Smart\", please authorise \"iAM Smart\" to provide the following personal information:",
   "iAmSmartAutoFillIn": "Continue with iAM Smart",
-  "register": "Register",
+  "register": "Create Account",
   "userLoginName": "Username",
   "userPassword": "Password",
   
@@ -435,7 +435,7 @@
   "paymentDeadline": "Deadline for online confirm proof",
   "confirmingDealine": "Deadline for Confirming Proof",
   "PaymentCoonpletDealine": "Deadline for Payment Completion",
-  "payOnline":"Online Payment",
+  "payOnline":"Pay online via this system GPNSPS",
   "payDn":"Pay by issuance of General Demand Note",
   "payNPGO":"Pay at NPGO Collection Office",
   "payNPGOPopUpTitle":"Pay at North Point Government Offices (NPGO) Collection Office",
@@ -467,8 +467,8 @@
   "fpsQrcodeTitle5":"s",
 
   "payDnRemark": "Payment proof (e.g. ATM receipt, internet banking record) to be sent to gld_acct@gld.gov.hk by {date}",
-  "payNPGORemark" :"Payment to be completed at Collection Office by {date}",
-  "payOnlineRemark" :"Payment to be completed at GPNSPS by {date}",
+  "payNPGORemark" :"Payment to be completed at NPGO Collection Office by {date}",
+  "payOnlineRemark" :"Payment to be completed in GPNSPS by {date}",
 
   "before": "Before",
   "page": "Page",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 75f6fa8..79e6ec0 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -43,14 +43,14 @@
   "applyTickUnderStr3":"3. 申请人在本申请表格内所提供的个人资料会供申请刊登公共启事及为承担法律责任用途。政府物流服务署可能会向其他政策局/ 部门披露你在此表格内填报的个人资料。申请人有权查阅及改正个人资料。如要查阅或改正个人资料，请向本署个人资料私隐主任提出，地址为香港北角渣华道333号北角政府合署十楼。 " ,
   "submitted": "提交成功",
 
-    "confirmingDealine": "确认校对的截止日期",
+  "confirmingDealine": "确认校对截止日期",
   "PaymentCoonpletDealine": "付款截止日期",
   "payOnline":"透过此系统网上付款",
   "payDn":"透过发出一般缴款单付款",
   "payNPGO":"在北角政府合署收款处付款",
   "payNPGOPopUpTitle":"在北角政府合署收款处付款",
   "paymentMeans":"付款方式",
-  "paymentMethodMeans":"可用的付款方法:",
+  "paymentMethodMeans":"可用的付款方法",
   "fps":"转数快 (FPS)",
   "card":"信用卡 (Visa, Master, UnionPay, JCB)",
   "pps":"缴费灵 (PPS)",
@@ -76,9 +76,9 @@
   "fpsQrcodeTitle4":"剩余时间:",
   "fpsQrcodeTitle5":"秒",
   
-  "payDnRemark": "请在{date}前缴付款项并将相关付款证明（例如银行入数纸或网上银行付款记录）连同申请编号电邮至gld_acct@gld.gov.hk。",
+  "payDnRemark": "在{date}之前將付款證明（如自動櫃員機收據、網上銀行付款記錄）電郵寄至gld_acct@gld.gov.hk。",
   "payNPGORemark" :"在{date}之前在北角政府合署收款处完成付款",
-  "payOnlineRemark" :"请选择即时完成付款，或在{date}下午2时30分前完成付款。",
+  "payOnlineRemark" :"在{date} 2:30 p.m. 之前在GPNSPS完成网上付款。",
   
   "MSG.registerIAmSmart": "你可点击「智方便」按钮，系统会自动输入个人资料，或自行输入个人资料，以即时启动 公共启事提交及缴费系统 帐户。<br/>如欲使用「智方便」提供个人资料，请先下载「智方便」流动应用程式并登记成为「智方便」用户。",
   "MSG.registerPersonal": "需上载身份证明文件数码档案以进行网上申请。 <br/>如：香港身份证; 护照; 中国内地身份证; 专业执业证书等",
@@ -186,7 +186,7 @@
   "authorizeIAmSmartForInfo": "授权「智方便」提供个人资料",
   "iAmSmartSubTitle": "为完成开户并建立与「智方便」的连接，请授权「智方便」提供以下个人资料：",
   "iAmSmartAutoFillIn": "以智方便继续",
-  "register": "申请",
+  "register": "建立账户",
   "userLoginName": "用户登入名称",
   "userPassword": "密码",
   
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 654a40a..47026e3 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -43,14 +43,14 @@
   "applyTickUnderStr3":"3. 申請人在本申請表格內所提供的個人資料會供申請刊登公共啟事及為承擔法律責任用途。政府物流服務署可能會向其他政策局 / 部門披露你在此表格內填報的個人資料。申請人有權查閱及改正個人資料。如要查閱或改正個人資料，請向本署個人資料私隱主任提出，地址為香港北角渣華道333號北角政府合署十樓。 ",
   "submitted": "提交成功",
   
-  "confirmingDealine": "確認校對的截止日期",
+  "confirmingDealine": "確認校對截止日期",
   "PaymentCoonpletDealine": "付款截止日期",
   "payOnline":"透過此系統網上付款",
   "payDn":"透過發出一般繳款單付款",
   "payNPGO":"在北角政府合署收款處付款",
   "payNPGOPopUpTitle":"在北角政府合署收款處付款",
   "paymentMeans":"付款方式",
-  "paymentMethodMeans":"可用的付款方法:",
+  "paymentMethodMeans":"可用的付款方法",
   "fps":"轉數快 (FPS)",
   "card":"信用卡 (Visa, Master, UnionPay, JCB)",
   "pps":"繳費靈 (PPS)",
@@ -76,9 +76,9 @@
   "fpsQrcodeTitle4":"剩餘時間:",
   "fpsQrcodeTitle5":"秒",
 
-  "payDnRemark": "請在{date}前繳付款項並將相關付款證明（例如銀行入數紙或網上銀行付款記錄）連同申請編號電郵至gld_acct@gld.gov.hk。 ",
+  "payDnRemark": "在{date}之前將付款證明（如自動櫃員機收據、網上銀行付款記錄）電郵寄至 gld_acct@gld.gov.hk。 ",
   "payNPGORemark" :"在{date}之前在北角政府合署收款處完成付款",
-  "payOnlineRemark" :"請選擇即時完成付款，或在{date}下午2時30分前完成付款。",
+  "payOnlineRemark" :"在{date} 2:30 p.m. 之前在GPNSPS完成網上付款。",
 
   "MSG.registerIAmSmart": "你可點擊「智方便」按鈕，系統會自動輸入個人資料，或自行輸入個人資料，以即時啟動 公共啟事提交及繳費系統 帳戶。<br/>如欲使用「智方便」提供個人資料，請先下載「智方便」流動應用程式並登記成為「智方便」用戶。",
   "MSG.registerPersonal": "需上載身份證明文件數碼檔案以進行網上申請。<br/>如：香港身份證; 護照; 中國內地身份證; 專業執業証書等",
@@ -188,7 +188,7 @@
   "authorizeIAmSmartForInfo": "授權「智方便」提供個人資料",
   "iAmSmartSubTitle": "為完成開戶並建立與「智方便」的連接，請授權「智方便」提供以下個人資料：",
   "iAmSmartAutoFillIn": "以智方便繼續",
-  "register": "申請",
+  "register": "建立賬戶",
   "userLoginName": "用戶登入名稱",
   "userPassword": "密碼",