Browse Source
Merge branch 'New_Enhancement' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI into New_Enhancement
# Conflicts: # src/translations/zh-CN.json # src/translations/zh-HK.jsonCR003
4 changed files with 20 additions and 10 deletions
Unified View
Diff Options
-
+5 -5src/pages/Proof/Reply_Public/ProofForm.js
-
+3 -3src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
-
+6 -1src/translations/zh-CN.json
-
+6 -1src/translations/zh-HK.json
+ 5
- 5
src/pages/Proof/Reply_Public/ProofForm.js
View File
| @@ -360,7 +360,7 @@ const FormPanel = ({ formData }) => { | |||||
| </> | </> | ||||
| ); | ); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| }}><FormattedMessage id="viewDetail" /></a> | |||||
| }}><u><FormattedMessage id="viewDetail" /></u></a> | |||||
| </td> | </td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td> | <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td> | <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} 5:00 p.m.</td> | ||||
| @@ -394,7 +394,7 @@ const FormPanel = ({ formData }) => { | |||||
| </> | </> | ||||
| ); | ); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| }}><FormattedMessage id="viewDetail" /></a> | |||||
| }}><u><FormattedMessage id="viewDetail" /></u></a> | |||||
| </td> | </td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 11:30 a.m.</td> | <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 11:30 a.m.</td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 12:00 p.m.</td> | <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} 12:00 p.m.</td> | ||||
| @@ -441,7 +441,7 @@ const FormPanel = ({ formData }) => { | |||||
| </> | </> | ||||
| ); | ); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| }}><FormattedMessage id="viewDetail" /></a> | |||||
| }}><u><FormattedMessage id="viewDetail" /></u></a> | |||||
| </td> | </td> | ||||
| <td style={tabelStyle}>{ | <td style={tabelStyle}>{ | ||||
| locale === 'en' ? | locale === 'en' ? | ||||
| @@ -496,7 +496,7 @@ const FormPanel = ({ formData }) => { | |||||
| </> | </> | ||||
| ); | ); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| }}><FormattedMessage id="viewDetail" /></a> | |||||
| }}><u><FormattedMessage id="viewDetail" /></u></a> | |||||
| </td> | </td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"5:00 p.m.":"下午5時"}</td> | <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"5:00 p.m.":"下午5時"}</td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"5:00 p.m.":"下午5時"}</td> | <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDateOff, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"5:00 p.m.":"下午5時"}</td> | ||||
| @@ -535,7 +535,7 @@ const FormPanel = ({ formData }) => { | |||||
| </> | </> | ||||
| ); | ); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| }}><FormattedMessage id="viewDetail" /></a> | |||||
| }}><u><FormattedMessage id="viewDetail" /></u></a> | |||||
| </td> | </td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"11:30 a.m.":"上午11時30分"}</td> | <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"11:30 a.m.":"上午11時30分"}</td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"12:00 p.m.":"下午12時"}</td> | <td style={tabelStyle}>{DateUtils.dateFormat(formData.closingDate, intl.formatMessage({ id: "dateStrFormat" }))} {locale ==='en'?"12:00 p.m.":"下午12時"}</td> | ||||
+ 3
- 3
src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
View File
| @@ -360,7 +360,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => | |||||
| </> | </> | ||||
| ); | ); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| }}><FormattedMessage id="viewDetail" /></a> | |||||
| }}><u><FormattedMessage id="viewDetail" /></u></a> | |||||
| </td> | </td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"}</td> | <td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"2:00 p.m.":"下午2時"}</td> | ||||
| <td style={tabelStyle}> | <td style={tabelStyle}> | ||||
| @@ -392,7 +392,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => | |||||
| </> | </> | ||||
| ); | ); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| }}><FormattedMessage id="viewDetail" /></a> | |||||
| }}><u><FormattedMessage id="viewDetail" /></u></a> | |||||
| </td> | </td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(closingDateOff, dft)} {locale==='en'?"5:00 p.m.":"下午5時"}</td> | <td style={tabelStyle}>{DateUtils.dateFormat(closingDateOff, dft)} {locale==='en'?"5:00 p.m.":"下午5時"}</td> | ||||
| <td style={tabelStyle}> | <td style={tabelStyle}> | ||||
| @@ -416,7 +416,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => | |||||
| </> | </> | ||||
| ); | ); | ||||
| setIsWarningPopUp(true); | setIsWarningPopUp(true); | ||||
| }}><FormattedMessage id="viewDetail" /></a> | |||||
| }}><u><FormattedMessage id="viewDetail" /></u></a> | |||||
| </td> | </td> | ||||
| <td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"12:00 p.m.":"下午12時"}</td> | <td style={tabelStyle}>{DateUtils.dateFormat(closeDate, dft)} {locale==='en'?"12:00 p.m.":"下午12時"}</td> | ||||
| <td style={tabelStyle}> | <td style={tabelStyle}> | ||||
+ 6
- 1
src/translations/zh-CN.json
View File
| @@ -161,8 +161,13 @@ | |||||
| "proofPaymentHeader_office": "公共启事: 已完成校对并已选择付款方式", | "proofPaymentHeader_office": "公共启事: 已完成校对并已选择付款方式", | ||||
| "proofPaymentBody_office": "我们已收到以下申请编号的稿件校对确认及可付印指示。<br/>{appNo}", | "proofPaymentBody_office": "我们已收到以下申请编号的稿件校对确认及可付印指示。<br/>{appNo}", | ||||
| <<<<<<< HEAD | |||||
| "proofPaymentBody_office2": "你已选择到北角政府合署收款处付款：<center><br/>香港北角渣华道333号<br/>北角政府合署10楼<br/>会计组收款处</center>", | "proofPaymentBody_office2": "你已选择到北角政府合署收款处付款：<center><br/>香港北角渣华道333号<br/>北角政府合署10楼<br/>会计组收款处</center>", | ||||
| "proofPaymentBody_office3": "收款处的办公时间为星期一至五上午8时30分至下午1时及下午2时至5时，公众假期除外。", | "proofPaymentBody_office3": "收款处的办公时间为星期一至五上午8时30分至下午1时及下午2时至5时，公众假期除外。", | ||||
| ======= | |||||
| "proofPaymentBody_office2": "你已选择在北角政府合署收款处付款：<center><br/>香港北角渣华道333号<br/>北角政府合署10楼<br/>会计部收款处</center>", | |||||
| "proofPaymentBody_office3": "收款处的办公时间为星期一至五上午八时三十分至下午一时及下午二时至五时，公众假期除外。", | |||||
| >>>>>>> 783bf7ccc8705a0e98b92e8dfb8c0e4021176214 | |||||
| "proofPaymentBody_office4": "凡支票、汇票或本票均须书明支付「香港特别行政区政府」并加划线。", | "proofPaymentBody_office4": "凡支票、汇票或本票均须书明支付「香港特别行政区政府」并加划线。", | ||||
| "proofPaymentBody_office5": "请列印此页面或出示电子设备屏幕上所显示的申请资料，以供收款处职员查阅，并在{paymentDeadline}下午12时30分前完成付款。", | "proofPaymentBody_office5": "请列印此页面或出示电子设备屏幕上所显示的申请资料，以供收款处职员查阅，并在{paymentDeadline}下午12时30分前完成付款。", | ||||
| "proofPaymentBody_office6": "我们将在收到付款后处理刊登事宜。", | "proofPaymentBody_office6": "我们将在收到付款后处理刊登事宜。", | ||||
| @@ -468,7 +473,7 @@ | |||||
| "applicationPublishDate": "刊出日期", | "applicationPublishDate": "刊出日期", | ||||
| "pleaseCheckReminder": "请下载下列印刷稿档案，并仔细校对", | "pleaseCheckReminder": "请下载下列印刷稿档案，并仔细校对", | ||||
| "payAnd": "缴费及", | "payAnd": "缴费及", | ||||
| "commentDeadline": "网上修订稿件最后限期", | |||||
| "commentDeadline": "修订稿件最后限期", | |||||
| "paymentDeadline": "网上确定付印最后限期", | "paymentDeadline": "网上确定付印最后限期", | ||||
| "before": "前", | "before": "前", | ||||
| "page": "页", | "page": "页", | ||||
+ 6
- 1
src/translations/zh-HK.json
View File
| @@ -161,8 +161,13 @@ | |||||
| "proofPaymentHeader_office": "公共啟事: 已完成校對並已選擇付款方式", | "proofPaymentHeader_office": "公共啟事: 已完成校對並已選擇付款方式", | ||||
| "proofPaymentBody_office": "我們已收到以下申請編號的稿件校對確認及可付印指示。<br/>{appNo}", | "proofPaymentBody_office": "我們已收到以下申請編號的稿件校對確認及可付印指示。<br/>{appNo}", | ||||
| <<<<<<< HEAD | |||||
| "proofPaymentBody_office2": "你已選擇到北角政府合署收款處付款：<center><br/>香港北角渣華道333號<br/>北角政府合署10樓<br/>會計组收款處</center>", | "proofPaymentBody_office2": "你已選擇到北角政府合署收款處付款：<center><br/>香港北角渣華道333號<br/>北角政府合署10樓<br/>會計组收款處</center>", | ||||
| "proofPaymentBody_office3": "收款處的辦公時間為星期一至五上午8時30分至下午1時及下午2時至5時，公眾假期除外。", | "proofPaymentBody_office3": "收款處的辦公時間為星期一至五上午8時30分至下午1時及下午2時至5時，公眾假期除外。", | ||||
| ======= | |||||
| "proofPaymentBody_office2": "你已選擇在北角政府合署收款處付款：<center><br/>香港北角渣華道333號<br/>北角政府合署10樓<br/>會計部收款處</center>", | |||||
| "proofPaymentBody_office3": "收款處的辦公時間為星期一至五上午八時三十分至下午一時及下午二時至五時，公眾假期除外。", | |||||
| >>>>>>> 783bf7ccc8705a0e98b92e8dfb8c0e4021176214 | |||||
| "proofPaymentBody_office4": "凡支票、匯票或本票均須書明支付「香港特別行政區政府」並加劃線。", | "proofPaymentBody_office4": "凡支票、匯票或本票均須書明支付「香港特別行政區政府」並加劃線。", | ||||
| "proofPaymentBody_office5": "請列印此頁面或出示電子設備屏幕上所顯示的申請資料，以供收款處職員查閱，並在{paymentDeadline}下午12時30分前完成付款。", | "proofPaymentBody_office5": "請列印此頁面或出示電子設備屏幕上所顯示的申請資料，以供收款處職員查閱，並在{paymentDeadline}下午12時30分前完成付款。", | ||||
| "proofPaymentBody_office6": "我們將在收到付款後處理刊登事宜。", | "proofPaymentBody_office6": "我們將在收到付款後處理刊登事宜。", | ||||
| @@ -469,7 +474,7 @@ | |||||
| "applicationPublishDate": "刊出日期", | "applicationPublishDate": "刊出日期", | ||||
| "pleaseCheckReminder": "請下載下列印刷稿檔案，並仔細校對", | "pleaseCheckReminder": "請下載下列印刷稿檔案，並仔細校對", | ||||
| "payAnd": "繳費及", | "payAnd": "繳費及", | ||||
| "commentDeadline": "網上俢訂稿件最後限期", | |||||
| "commentDeadline": "俢訂稿件最後限期", | |||||
| "paymentDeadline": "網上確定付印最後限期", | "paymentDeadline": "網上確定付印最後限期", | ||||
| "before": "前", | "before": "前", | ||||
| "page": "頁", | "page": "頁", | ||||