alex
/
PNSPS-frontend-MaterialUI
1
0
포크 0
코드 이슈 0 풀 리퀘스트 0 릴리즈 0 위키 활동
소스 검색

update word

CR003
Anna Ho 1 년 전
부모
e70b0cbf05
커밋
415c86d1b9
12개의 변경된 파일과 66개의 추가작업 그리고 40개의 파일을 삭제
분할 보기
Diff Options
Show Stats Download Patch File Download Diff File
  1. +7
    -0
      src/layout/MainLayout/Header/index.js
  2. +1
    -1
      src/pages/Proof/Create_FromApp/ProofForm.js
  3. +1
    -1
      src/pages/Proof/Reply_GLD/ApplicationDetails.js
  4. +2
    -2
      src/pages/Proof/Reply_Public/ApplicationDetails.js
  5. +14
    -4
      src/pages/Proof/Reply_Public/ProofForm.js
  6. +2
    -1
      src/pages/Proof/Search_GLD/SearchForm.js
  7. +3
    -0
      src/pages/authentication/AuthWrapper.js
  8. +11
    -10
      src/translations/en.json
  9. +9
    -7
      src/translations/zh-CN.json
  10. +9
    -7
      src/translations/zh-HK.json
  11. +3
    -3
      src/utils/ComboData.js
  12. +4
    -4
      src/utils/statusUtils/ProofStatus.js

+ 7
- 0
src/layout/MainLayout/Header/index.js 파일 보기

@@ -497,6 +497,13 @@ function Header(props) {

const logoutContent = (
<div>
<li>
<Link className="login" to={'https://www.gld.gov.hk/zh-hk/about-us'}>
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>
<FormattedMessage id="aboutUs" />
</Typography>
</Link>
</li>
<li>
<Link className="login" to='/login'>
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>


+ 1
- 1
src/pages/Proof/Create_FromApp/ProofForm.js 파일 보기

@@ -208,7 +208,7 @@ const FormPanel = ({ formData }) => {
<Grid item xs={12} md={12}>
<Stack direction="row" sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel sx={{ paddingRight: 2, textAlign: "center" }}>
<Typography variant="h5">Deadline for online proof with revision:</Typography>
<Typography variant="h5">Deadline for online manuscript revision:</Typography>
</FormLabel>
<TextField
fullWidth


+ 1
- 1
src/pages/Proof/Reply_GLD/ApplicationDetails.js 파일 보기

@@ -270,7 +270,7 @@ const ApplicationDetailCard = ({
</Grid>
<Grid item xs={12} md={12} lg={12}
sx={{ display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">Deadline for confirm proof and payment</Typography>
<Typography variant="h5">Deadline for confirm proof and payment：</Typography>
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">Before {DateUtils.datetimeStr(data.proofPaymentDeadline)}</Typography>


+ 2
- 2
src/pages/Proof/Reply_Public/ApplicationDetails.js 파일 보기

@@ -242,7 +242,7 @@ const ApplicationDetailCard = ({ formData, }) => {
{locale === 'en' ?
`${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.reviseDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} `
:
`${DateUtils.dateFormat(data?.reviseDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} ${intl.formatMessage({ id: 'before' })}`
`${DateUtils.dateFormat(data?.reviseDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "上午")?.replace("pm", "下午")}${intl.formatMessage({ id: 'before' })}`
}
</Typography>
</Grid>
@@ -258,7 +258,7 @@ const ApplicationDetailCard = ({ formData, }) => {
{locale === 'en' ?
`${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} `
:
`${DateUtils.dateFormat(data?.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} ${intl.formatMessage({ id: 'before' })}`
`${DateUtils.dateFormat(data?.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "上午")?.replace("pm", "下午")}${intl.formatMessage({ id: 'before' })}`
}
</Typography>
</Grid>


+ 14
- 4
src/pages/Proof/Reply_Public/ProofForm.js 파일 보기

@@ -336,7 +336,7 @@ const FormPanel = ({ formData }) => {
/>
</td>
<td style={tabelStyle}>
<FormattedMessage id="paymentMeans" />: <FormattedMessage id="payDn" />
<FormattedMessage id="paymentMeans" />: <FormattedMessage id="payDn" />
<br /><a href="#payOnlineDetails" color='#fff' onClick={() => {
setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" }))
setWarningText(
@@ -438,10 +438,20 @@ const FormPanel = ({ formData }) => {
setIsWarningPopUp(true);
}}><FormattedMessage id="viewDetail" /></a>
</td>
<td style={tabelStyle}>{DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}</td>
<td style={tabelStyle}>{
locale === 'en' ?
`${DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}`
:
`${DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "上午")?.replace("pm", "下午")}`
}</td>
<td style={tabelStyle}>
<FormattedMessage id="payOnlineRemark" values={{
date: DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")
date: (
locale === 'en' ?
`${DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}`
:
`${DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "上午")?.replace("pm", "下午")}`
)
}} />
{/* {DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} */}
</td>
@@ -477,7 +487,7 @@ const FormPanel = ({ formData }) => {
</ul>
<Typography variant="h6">
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
</Typography>
</Typography>
</>
);
setIsWarningPopUp(true);


+ 2
- 1
src/pages/Proof/Search_GLD/SearchForm.js 파일 보기

@@ -324,7 +324,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
filterOptions={(options) => options}
options={ComboData.proofStatus_GLD}
value={status}
inputValue={status?.label ? status?.label : ""}
getOptionLabel={(option) => option.type? intl.formatMessage({ id: option.i18nLabel }) : ""}
inputValue={status? intl.formatMessage({id: status.i18nLabel}):""}
onChange={(event, newValue) => {
if (newValue !== null) {
setStatus(newValue);


+ 3
- 0
src/pages/authentication/AuthWrapper.js 파일 보기

@@ -51,6 +51,9 @@ const AuthWrapper = ({ children }) => (
<Typography style={{textAlign: "center",fontSize: "1.8rem"}}>
<FormattedMessage id="Gazette"/>
</Typography>
<Typography style={{textAlign: "center",fontSize: "1.8rem"}}>
<FormattedMessage id="PNSPS_fullname"/>
</Typography>
</Grid>
<Grid
item


+ 11
- 10
src/translations/en.json 파일 보기

@@ -9,7 +9,8 @@
"paymentMethodDatetimeStrFormat": "YYYY-MM-DD h:mm a",
"PNSPS": "PNSPS",
"HKSARGOV": "HKSAR Government",
"PNSPS_fullname": "Public Notice Submission and Payment System",
"HKSARGOV": "The Government of Hong Kong Special Administrative Region",
"HKGLD": "Government Logistics Department",
"importantNotice": "Important Notice",
"privacyPolicy": "Privacy Policy",
@@ -77,12 +78,12 @@
"MSG.payMsg3": "If you have multiple Public Notice applications within the Year {issueYear}, Volume {issueVolume}, Issue {issueNo} of the Official Gazette, you can choose to merge the payment for all the approved manuscripts within this issue in 'My Public Notice' before the payment deadline.",

"MSG.proofOutOfTime": "Response out of time, please apply again.",
"MSG.overReviseDeadline": "Over Revise Deadline",
"MSG.overReviseDeadline": "Deadline for online manuscript revision is over. Please apply again as necessary.",
"MSG.plzSelectPaymentMethod": "Please select payment means",
"MSG.plzSelectApp": "Please select application",
"MSG.actionFail": "Action failed",
"MSG.paymentHolded": "Application number {appNo} is currently in the process of payment. If the payment is unsuccessful, please try again after 30 minutes. We apologise for any inconvenience caused.",
"MSG.pay_credity1": "We have received your confirmed application for proofreading and printing instructions regarding application number {appNo}. We will arrange for its publication with in the Year {year}, Volume {issueVolume}, Issue {issueNo} of the Official Gazette.",
"MSG.pay_credity1": "We have received your confirmed application for proofreading and printing instructions regarding application number {appNo}. We will arrange for its publication with in the Year {year}, Volume {issueVolume}, Issue {issueNo} of the Gazette.",
"MSG.pay_credity2": "A General Demand Note will be issued to you 14 calendar days after the publication of the public notice in the Gazette. Please follow the payment instructions on the Demand Note and settle the payment promptly.",
"MSG.plzonlinePayment": "Please select the payment means with online payment for the application.",

@@ -142,7 +143,7 @@
"welcomeMsg_pm": "Good afternoon! Please select the required service.",
"welcomeMsg_night": "Good evening! Please select the required service.",

"aboutUs": "About Us",
"login": "Login",
"logout": "Logout",
"iAmSmartLogin": "Continue with iAM Smart",
@@ -418,7 +419,7 @@
"download": "Download",
"paymentHistory": "Payment History",
"proofId": "Proof Code",
"proofDate": "Proof Sent Date",
"proofDate": "Deadline for online manuscript revision",
"proofDateFrom": "Proof Sent Date (From)",
"proofDateTo": "Proof Sent Date (To)",
"replyDate": "Reply Date",
@@ -426,11 +427,11 @@
"payFeeFor": "Pay for",
"payFor": "Pay",
"payFee": "Payment Amount",
"replyBefore": "Reply Before",
"replyBefore": "Deadline for Online Confirm Proof",
"applicationPublishDate": "Publish Date",
"pleaseCheckReminder": "Please download the following printed manuscript file and proofread it carefully",
"payAnd": "Pay and ",
"commentDeadline": "Deadline for online proof with revision",
"commentDeadline": "Deadline for online manuscript revision",
"paymentDeadline": "Deadline for online confirm proof",
"confirmingDealine": "Deadline for Confirming Proof",
"PaymentCoonpletDealine": "Deadline for Payment Completion",
@@ -552,10 +553,10 @@
"subject": "Subject",
"other":"Other",

"proofConfirmed":"Confirmed",
"proofConfirmed":"Pass for printing",
"proofReProofing":"Re-proofing",
"proofNoReply":"No Reply",
"proofPendingReply":"Pending Reply",
"proofNoReply":"Proofing timed out. Please apply again.",
"proofPendingReply":"Proofing reply pending",

"Dashboard": "Dashboard",
"event": "Event"

+ 9
- 7
src/translations/zh-CN.json 파일 보기

@@ -6,9 +6,10 @@
"iamsmartLink": "https://www.iamsmart.gov.hk/sc/",
"dateStrFormat": "YYYY年MM月DD日",
"datetimeStrFormat": "YYYY年MM月DD日 HH:mm:ss",
"paymentMethodDatetimeStrFormat": "YYYY年MM月DD日 h:mm a",
"paymentMethodDatetimeStrFormat": "YYYY年MM月DD日 ah时mm分",

"PNSPS": "公共启事提交及缴费系统",
"PNSPS_fullname": "公共启事提交及缴费系统",
"HKSARGOV": "香港特别行政区政府",
"HKGLD": "政府物流服务署",
"importantNotice": "重要告示",
@@ -113,7 +114,7 @@
"MSG.payMsg3": "如你在宪报期数{issueYear} 年{issueVolume} 卷, 第{issueNo} 期内有多于一个公共启事的申请，你可选择完成所有此期所有稿件校对确定后，于缴费期限前在「我的公共启事」内合并付款。 ",

"MSG.proofOutOfTime": "回复逾时，请重新申请。",
"MSG.overReviseDeadline": "超过修改期限",
"MSG.overReviseDeadline": "网上俢订稿件最后限期已过，请按情况重新申请。",
"MSG.plzSelectPaymentMethod": "请选择付款方式",
"MSG.plzSelectApp": "请选择公共启事。",
"MSG.actionFail": "行动失败",
@@ -177,6 +178,7 @@
"welcomeMsg_pm": "午安! 请选择所需服务。",
"welcomeMsg_night": "晚安! 请选择所需服务。",

"aboutUs": "关于我们",
"login": "登录",
"logout": "登出",
"iAmSmartLogin": "以智方便继续",
@@ -446,7 +448,7 @@
"download": "下载",
"paymentHistory": "付款记录",
"proofId": "校对编号",
"proofDate": "出稿日期",
"proofDate": "网上修订稿件最后限期",
"proofDateFrom": "出稿日期 (从)",
"proofDateTo": "出稿日期 (到)",
"replyDate": "回复日期",
@@ -454,11 +456,11 @@
"payFeeFor": "应缴金额 ($)",
"payFor": "支付",
"payFee": "支付金额 ($)",
"replyBefore": "此日期前回复",
"replyBefore": "网上确定付印最后限期",
"applicationPublishDate": "刊出日期",
"pleaseCheckReminder": "请下载下列印刷稿档案，并仔细校对",
"payAnd": "缴费及",
"commentDeadline": "网上返稿最后限期",
"commentDeadline": "网上修订稿件最后限期",
"paymentDeadline": "网上确定付印最后限期",
"before": "前",
"page": "页",
@@ -545,8 +547,8 @@

"proofConfirmed":"可以付印",
"proofReProofing":"未能付印",
"proofNoReply":"回复逾时",
"proofPendingReply":"未回复",
"proofNoReply":"校对回复逾时，请重新申请",
"proofPendingReply":"校对待复",

"Dashboard": "仪表板",
"event": "活动"

+ 9
- 7
src/translations/zh-HK.json 파일 보기

@@ -6,9 +6,10 @@
"iamsmartLink": "https://www.iamsmart.gov.hk/tc/",
"dateStrFormat": "YYYY年MM月DD日",
"datetimeStrFormat": "YYYY年MM月DD日 HH:mm:ss",
"paymentMethodDatetimeStrFormat": "YYYY年MM月DD日 h:mm a",
"paymentMethodDatetimeStrFormat": "YYYY年MM月DD日 ah時mm分",

"PNSPS": "公共啟事提交及繳費系統",
"PNSPS_fullname": "公共啟事提交及繳費系統",
"HKSARGOV": "香港特別行政區政府",
"HKGLD": "政府物流服務署",
"importantNotice": "重要告示",
@@ -113,7 +114,7 @@
"MSG.payMsg3": "如你在憲報期數 {issueYear} 年 {issueVolume} 卷, 第 {issueNo} 期內有多於一個公共啟事的申請，你可選擇完成所有此期所有稿件校對確定後，於繳費期限前在「我的公共啟事」內合併付款。",

"MSG.proofOutOfTime": "回覆逾時，請重新申請。",
"MSG.overReviseDeadline": "超過修改期限",
"MSG.overReviseDeadline": "網上俢訂稿件最後限期已過，請按情況重新申請。",
"MSG.plzSelectApp": "請選擇公共啟事。",
"MSG.plzSelectPaymentMethod": "請選擇付款方式",
"MSG.actionFail": "行動失敗",
@@ -179,6 +180,7 @@
"welcomeMsg_pm": "午安! 請選擇所需服務。",
"welcomeMsg_night": "晚安! 請選擇所需服務。",

"aboutUs": "關於我們",
"login": "登入",
"logout": "登出",
"iAmSmartLogin": "以智方便繼續",
@@ -451,7 +453,7 @@
"download": "下載",
"paymentHistory": "付款記錄",
"proofId": "校對編號",
"proofDate": "出稿日期",
"proofDate": "網上俢訂稿件最後限期",
"proofDateFrom": "出稿日期 (從)",
"proofDateTo": "出稿日期 (到)",
"replyDate": "回覆日期",
@@ -459,11 +461,11 @@
"payFeeFor": "應繳金額 ($)",
"payFor": "支付",
"payFee": "支付金額 ($)",
"replyBefore": "此日期前回覆",
"replyBefore": "網上確定付印最後限期",
"applicationPublishDate": "刊出日期",
"pleaseCheckReminder": "請下載下列印刷稿檔案，並仔細校對",
"payAnd": "繳費及",
"commentDeadline": "網上返稿最後限期",
"commentDeadline": "網上俢訂稿件最後限期",
"paymentDeadline": "網上確定付印最後限期",
"before": "前",
"page": "頁",
@@ -550,8 +552,8 @@

"proofConfirmed":"可以付印",
"proofReProofing":"未能付印",
"proofNoReply":"回覆逾時",
"proofPendingReply":"未回覆",
"proofNoReply":"校對回覆逾時，請重新申請",
"proofPendingReply":"校對待覆",

"Dashboard": "儀表板",
"event": "活動"

+ 3
- 3
src/utils/ComboData.js 파일 보기

@@ -24,9 +24,9 @@ export const district = [
{ key: 16, type: 'easternCombo' },
{ key: 17, type: 'southernCombo' },
{ key: 18, type: 'wanChaiCombo' },
{ key: 19, type: 'lantauIslandCombo' },
{ key: 20, type: 'lammaIslandCombo' },
{ key: 21, type: 'pengChauCombo' }
// { key: 19, type: 'lantauIslandCombo' },
// { key: 20, type: 'lammaIslandCombo' },
// { key: 21, type: 'pengChauCombo' }
];

export const country = [


+ 4
- 4
src/utils/statusUtils/ProofStatus.js 파일 보기

@@ -1,10 +1,10 @@
import {getStatusTag} from "utils/statusUtils/Base";
import * as DateUtils from "utils/DateUtils";

const confirm = {color:"#22a13f", eng:"Confirmed", cht:"可以付印", cn:"可以付印"}
const confirm = {color:"#22a13f", eng:"Pass for printing", cht:"可以付印", cn:"可以付印"}
const unable = {color:"#d9372b", eng:"Re-proofing", cht:"未能付印", cn:"未能付印"}
const timeOut = {color:"#8a8784", eng:"No Reply", cht:"回覆逾時", cn:"回复逾时"}
const pendingReply = {color:"#f5a83d", eng:"Pending Reply", cht:"未回覆", cn:"未回复"}
const timeOut = {color:"#8a8784", eng:"Proofing timed out. Please apply again", cht:"校對回覆逾時，請重新申請", cn:"校对回复逾时，请重新申请"}
const pendingReply = {color:"#f5a83d", eng:"Proofing reply pending", cht:"校對待覆", cn:"校对待复"}
const cancel = {color:"#000", textColor:"#fff", eng:"Cancelled", cht:"已取消", cn:"已取消"}

export function getStatus_Cht(params) {
@@ -14,7 +14,7 @@ export function getStatus_Cht(params) {

export function getStatus_Eng(params) {
let status = getStatus(params);
return getStatusTag({color: status.color, textColor:status.textColor, text:status.eng })
return getStatusTag({color: status.color, textColor:status.textColor, text:status.eng})
}

export function getStatus_Cn(params) {


쓰기 미리보기
불러오는 중...
취소
저장