From 4afb60358b1a73b6fdd445f0b21d61906a57536b Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Mon, 12 Aug 2024 17:04:02 +0800
Subject: [PATCH] update i18n

---
 src/pages/Proof/Payment/Pay_Online.js |  9 ++++++---
 src/translations/en.json              |  8 ++++----
 src/translations/zh-CN.json           | 16 ++++++++--------
 src/translations/zh-HK.json           | 16 ++++++++--------
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/pages/Proof/Payment/Pay_Online.js b/src/pages/Proof/Payment/Pay_Online.js
index c530d73..30e76ea 100644
--- a/src/pages/Proof/Payment/Pay_Online.js
+++ b/src/pages/Proof/Payment/Pay_Online.js
@@ -32,7 +32,9 @@ import {
     // useEffect,
     useState
 } from "react";
-import { PNSPS_BUTTON_THEME, PNSPS_LONG_BUTTON_THEME } from "../../../themes/buttonConst";
+import { PNSPS_BUTTON_THEME, 
+    // PNSPS_LONG_BUTTON_THEME
+ } from "../../../themes/buttonConst";
 import { ThemeProvider } from "@emotion/react";
 import { FormattedMessage, useIntl } from "react-intl";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
@@ -167,7 +169,7 @@ const Index = () => {
                                                     id: 'proofPaymentBody_online2'
                                                 },
                                                 {
-                                                    paymentDeadline: DateUtils.dateStr(record?.closingDate),
+                                                    paymentDeadline: DateUtils.dateFormat(record?.closingDate, intl.formatMessage({id: "dateStrFormat"})),
                                                 }
                                             )
                                         }} />
@@ -175,10 +177,11 @@ const Index = () => {
                                     </Typography>
 
                                     <Typography variant="h4" sx={{ ml: 8, textAlign: "left" }}>
-                                        <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
+                                        <ThemeProvider theme={PNSPS_BUTTON_THEME}>
                                             <Button
                                                 component="span"
                                                 variant="contained"
+                                                // sx={{ ml: { sm: 4, md: 4, lg: 4 }, mr: 4, mt: { xs: 2, sm: 2 }, mb: { xs: 2, sm: 2 } }}
                                                 sx={{mr: 4 }}
                                                 onClick={() => { setIsPopUp(true) }}
                                             >
diff --git a/src/translations/en.json b/src/translations/en.json
index 903b4de..a64d3e6 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -118,15 +118,15 @@
   "publicNoticePaymentProofInfo": "Public Notice: Proofreading",
 
   "proofPaymentHeader_demandNote": "Public Notice: Proofreading Completed and Payment Means Selected",
-  "proofPaymentBody_demandNote": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}<br/><br/>You have selected to Pay by General Demand Note.",
+  "proofPaymentBody_demandNote": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}<br/><br/>You have selected to pay by General Demand Note.",
   "proofPaymentBody_demandNote2": "The General Demand Note will be sent to the following email address within one working day, but not later than {closingDateOff} 9:00 p.m. : <br/>{email}",
   "proofPaymentBody_demandNote3": "Please make payment and return the payment proof (e.g. ATM receipt, internet banking record) with the application number to gld_acct@gld.gov.hk by {paymentDeadline} 12:30 p.m.",
   "proofPaymentBody_demandNote4": "We will process the publication after receiving the payment proof.",
 
   "proofPaymentHeader_office": "Public Notice: Proofreading Completed and Payment Means Selected",
   "proofPaymentBody_office": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}",
-  "proofPaymentBody_office2": "You have selected to pay at North Point Government Offices Collection Office:<center><br/>Collection Office at Accounts Section, Government Logistics Department<br/>10/F North Point Government Offices<br/>333 Java Road North Point, Hong Kong</center>",
-  "proofPaymentBody_office3": "The office hours of the Collection Office is from: 8:30 a.m. to 1 p.m., 2 p.m. to 5 p.m., Monday to Friday, except public holidays.",
+  "proofPaymentBody_office2": "You have selected to pay at North Point Government Offices Collection Office:<center><br/>Collection Office at Accounts Section, Government Logistics Department<br/>10/F North Point Government Offices<br/>333 Java Road, North Point, Hong Kong</center>",
+  "proofPaymentBody_office3": "The office hours of the Collection Office is from 8:30 a.m. to 1 p.m., 2 p.m. to 5 p.m., Monday to Friday, except public holidays.",
   "proofPaymentBody_office4": "Cheques, drafts or cashier’s orders should be made payable to “The Government of the Hong Kong Special Administrative Region” or “The Government of the HKSAR” and crossed.",
   "proofPaymentBody_office5": "Please print out this page or present your application details on screen at our Collection Office, and complete the payment by {paymentDeadline} 12:30 p.m.",
   "proofPaymentBody_office6": "We will process the publication after receiving the payment.",
@@ -382,7 +382,7 @@
   "payDetail": "Payment Details",
   "payMethod": "Payment methods",
   "epayMethod": " e-Payment Method",
-  "selectPaymentMethod": "Please select a payment methods",
+  "selectPaymentMethod": "Please select a payment method",
   "payReceipt": "Payment receipt",
   "contactPerson": "Contact Person",
   "requireContactPerson": "Please enter contact person",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 53352da..9c5cf2c 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -21,8 +21,8 @@
   "gazetteSampleName": "宪报第6号副刊公共启事",
   "reason": "原因",
 
-  "payInstantly": "即时网上缴费",
-  "payLater": "稍后缴费",
+  "payInstantly": "即时付款",
+  "payLater": "稍后付款",
   "backToNoticePage": "返回「我的公共启事」",
   "pleaseClickToPay": "请按以下选项完成缴费",
   "targetVol": "刊登期数",
@@ -154,21 +154,21 @@
   "publicNoticePaymentProofInfo": "公共启事：校对",
 
   "proofPaymentHeader_demandNote": "公共启事: 已完成校对并已选择付款方式",
-  "proofPaymentBody_demandNote": "我们已收到以下申请编号的稿件校对确认及可付印指示。<br/>{appNo}<br/><br/>你已选择以一般缴款单付款。",
+  "proofPaymentBody_demandNote": "我们已收到以下申请编号的稿件校对确认及可付印指示:<br/>{appNo}<br/><br/>你已选择透过一般缴款单付款。",
   "proofPaymentBody_demandNote2": "一般缴款单将在一个工作天内，但不迟于{closingDateOff} 晚上9时前发送至以下电邮地址： <br/>{email}",
   "proofPaymentBody_demandNote3": "请在{paymentDeadline}下午12时30分前缴付款项并将相关付款证明（例如银行入数纸或网上银行付款记录）连同申请编号电邮至gld_acct@gld.gov.hk。 ",
   "proofPaymentBody_demandNote4": "我们将在收到付款证明后处理刊登事宜。",
 
   "proofPaymentHeader_office": "公共启事: 已完成校对并已选择付款方式",
-  "proofPaymentBody_office": "我们已收到以下申请编号的稿件校对确认及可付印指示。<br/>{appNo}",
-  "proofPaymentBody_office2": "你已选择到北角政府合署收款处付款：<center><br/>香港北角渣华道333号<br/>北角政府合署10楼<br/>会计组收款处</center>",
+  "proofPaymentBody_office": "我们已收到以下申请编号的稿件校对确认及可付印指示:<br/>{appNo}",
+  "proofPaymentBody_office2": "你已选择到北角政府合署收款处付款：<center><br/>香港北角渣华道333号<br/>北角政府合署10楼<br/>政府物流服务署会计组收款处</center>",
   "proofPaymentBody_office3": "收款处的办公时间为星期一至五上午8时30分至下午1时及下午2时至5时，公众假期除外。",
   "proofPaymentBody_office4": "凡支票、汇票或本票均须书明支付「香港特别行政区政府」并加划线。 ",
   "proofPaymentBody_office5": "请列印此页面或出示电子设备屏幕上所显示的申请资料，以供收款处职员查阅，并在{paymentDeadline}下午12时30分前完成付款。",
   "proofPaymentBody_office6": "我们将在收到付款后处理刊登事宜。",
 
   "proofPaymentHeader_online": "公共启事: 已完成校对并已选择付款方式",
-  "proofPaymentBody_online": "我们已收到以下申请编号的稿件校对确认及可付印指示。<br/>{appNo}",
+  "proofPaymentBody_online": "我们已收到以下申请编号的稿件校对确认及可付印指示:<br/>{appNo}",
   "proofPaymentBody_online2": "请选择即时完成付款，或在{paymentDeadline}下午2时30分前完成付款。",
   "proofPaymentBody_online3": "我们将在收到付款确认通知后处理刊登事宜。",
 
@@ -414,7 +414,7 @@
   "payDetail": "付款详情",
   "payMethod": "付款方式",
   "epayMethod": "电子付款方法",
-  "selectPaymentMethod": "请选择付款方式",
+  "selectPaymentMethod": "请选择付款方法",
   "payReceipt": "付款收据",
   "contactPerson": "联络人",
   "requireContactPerson": "请输入联络人",
@@ -425,7 +425,7 @@
   "cancelApp": "取消申请",
 
   "extraMark": "其他备注",
-  "totalAmount": "总额",
+  "totalAmount": "付款总额",
   "close": "关闭",
   "confirm": "确认",
   "particulars": "项目",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index a0fd95f..666cbf6 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -21,8 +21,8 @@
   "gazetteSampleName": "憲報第6號副刊公共啟事",
   "reason": "原因",
 
-  "payInstantly": "即時網上繳費",
-  "payLater": "稍後繳費",
+  "payInstantly": "即時付款",
+  "payLater": "稍後付款",
   "backToNoticePage": "返回「我的公共啟事」",
   "pleaseClickToPay": "請按以下選項完成繳費",
   "targetVol": "刊登期數",
@@ -154,21 +154,21 @@
   "publicNoticePaymentProofInfo": "公共啟事：校對",
 
   "proofPaymentHeader_demandNote": "公共啟事: 已完成校對並已選擇付款方式",
-  "proofPaymentBody_demandNote": "我們已收到以下申請編號的稿件校對確認及可付印指示。<br/>{appNo}<br/>你已選擇以一般繳款單付款。",
+  "proofPaymentBody_demandNote": "我們已收到以下申請編號的稿件校對確認及可付印指示:<br/>{appNo}<br/><br/>你已選擇透過一般繳款單付款。",
   "proofPaymentBody_demandNote2": "一般繳款單將在一個工作天內，但不遲於{closingDateOff} 晚上9時前發送至以下電郵地址： <br/>{email}",
   "proofPaymentBody_demandNote3": "請在{paymentDeadline}下午12時30分前繳付款項並將相關付款證明（例如銀行入數紙或網上銀行付款記錄）連同申請編號電郵至gld_acct@gld.gov.hk。",
   "proofPaymentBody_demandNote4": "我們將在收到付款證明後處理刊登事宜。",
 
   "proofPaymentHeader_office": "公共啟事: 已完成校對並已選擇付款方式",
-  "proofPaymentBody_office": "我們已收到以下申請編號的稿件校對確認及可付印指示。<br/>{appNo}",
-  "proofPaymentBody_office2": "你已選擇到北角政府合署收款處付款：<center><br/>香港北角渣華道333號<br/>北角政府合署10樓<br/>會計组收款處</center>",
+  "proofPaymentBody_office": "我們已收到以下申請編號的稿件校對確認及可付印指示:<br/>{appNo}",
+  "proofPaymentBody_office2": "你已選擇到北角政府合署收款處付款：<center><br/>香港北角渣華道333號<br/>北角政府合署10樓<br/>政府物流服務署會計组收款處</center>",
   "proofPaymentBody_office3": "收款處的辦公時間為星期一至五上午8時30分至下午1時及下午2時至5時，公眾假期除外。",
   "proofPaymentBody_office4": "凡支票、匯票或本票均須書明支付「香港特別行政區政府」並加劃線。",
   "proofPaymentBody_office5": "請列印此頁面或出示電子設備屏幕上所顯示的申請資料，以供收款處職員查閱，並在{paymentDeadline}下午12時30分前完成付款。",
   "proofPaymentBody_office6": "我們將在收到付款後處理刊登事宜。",
 
   "proofPaymentHeader_online": "公共啟事: 已完成校對並已選擇付款方式",
-  "proofPaymentBody_online": "我們已收到以下申請編號的稿件校對確認及可付印指示。<br/>{appNo}",
+  "proofPaymentBody_online": "我們已收到以下申請編號的稿件校對確認及可付印指示:<br/>{appNo}",
   "proofPaymentBody_online2": "請選擇即時完成付款，或在{paymentDeadline}下午2時30分前完成付款。",
   "proofPaymentBody_online3": "我們將在收到付款確認通知後處理刊登事宜。",
 
@@ -415,7 +415,7 @@
   "payDetail": "付款詳情",
   "payMethod": "付款方式",
   "epayMethod": "電子付款方法",
-  "selectPaymentMethod": "請選擇付款方式",
+  "selectPaymentMethod": "請選擇付款方法",
   "payReceipt": "付款收據",
   "contactPerson": "聯絡人",
   "requireContactPerson": "請輸入聯絡人",
@@ -426,7 +426,7 @@
   "cancelApp": "取消申請",
 
   "extraMark": "其他備註",
-  "totalAmount": "總額",
+  "totalAmount": "付款總額",
   "close": "關閉",
   "confirm": "確認",
   "particulars": "項目",