diff --git a/src/components/cards/AuthFooter.js b/src/components/cards/AuthFooter.js index 46260c6..4a1cf3f 100644 --- a/src/components/cards/AuthFooter.js +++ b/src/components/cards/AuthFooter.js @@ -36,7 +36,7 @@ const AuthFooter = () => { variant="subtitle2" color="secondary" component={Link} - href="https://www.gld.gov.hk/zh-hk/privacy-policy/" + href="/privacyPolicy" //href="/testMailPage" target="_blank" underline="hover" diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index 308a259..123f64f 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -78,9 +78,10 @@ function Header(props) { }; const handleLogout = async () => { - dispatch(handleLogoutFunction()); + await dispatch(handleLogoutFunction()); //await handleLogoutFunction(); - navigate('/login'); + + await navigate('/login'); }; const loginContent = ( @@ -496,6 +497,13 @@ function Header(props) { const logoutContent = (
+
  • + + + + + +
  • diff --git a/src/pages/Payment/FPS/FPSTest.js b/src/pages/Payment/FPS/FPSTest.js index 531d255..83da857 100644 --- a/src/pages/Payment/FPS/FPSTest.js +++ b/src/pages/Payment/FPS/FPSTest.js @@ -312,7 +312,7 @@ const Index = () => {
    二維碼有效期限3分鐘
    - 請在規定時間內完成付款流程 + 請在限規定時間內完成付款流程
    {"剩餘時間:"+timeDownCount}     diff --git a/src/pages/Payment/MultiPaymentWindow.js b/src/pages/Payment/MultiPaymentWindow.js index 3136b0c..e43826a 100644 --- a/src/pages/Payment/MultiPaymentWindow.js +++ b/src/pages/Payment/MultiPaymentWindow.js @@ -304,7 +304,7 @@ const MultiPaymentWindow = (props) => { {/* - 支付金額: HK$ {FormatUtils.currencyFormat(props.totalAmount)} + 付款金額: HK$ {FormatUtils.currencyFormat(props.totalAmount)} */} {!props.onReady ? diff --git a/src/pages/Proof/Create_FromApp/ProofForm.js b/src/pages/Proof/Create_FromApp/ProofForm.js index 0e5553b..1eef1cd 100644 --- a/src/pages/Proof/Create_FromApp/ProofForm.js +++ b/src/pages/Proof/Create_FromApp/ProofForm.js @@ -208,7 +208,7 @@ const FormPanel = ({ formData }) => { - Deadline for online proof with revision: + Deadline for online manuscript revision: - Deadline for confirm proof and payment + Deadline for confirm proof and payment： Before {DateUtils.datetimeStr(data.proofPaymentDeadline)} diff --git a/src/pages/Proof/Reply_GLD/ProofForm.js b/src/pages/Proof/Reply_GLD/ProofForm.js index 56f5b3f..e80858c 100644 --- a/src/pages/Proof/Reply_GLD/ProofForm.js +++ b/src/pages/Proof/Reply_GLD/ProofForm.js @@ -76,7 +76,7 @@ const FormPanel = ({ formData, isOverTime }) => { isOverTime ? - The response timed out, please apply again. + Proofing timed out. Please apply again. : diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js index 5693401..49a3d52 100644 --- a/src/pages/Proof/Reply_Public/ApplicationDetails.js +++ b/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' })}` } @@ -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' })}` } diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index 2be30a1..57b6b5c 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -336,7 +336,7 @@ const FormPanel = ({ formData }) => { /> - : + :
    { setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" })) setWarningText( @@ -438,10 +438,20 @@ const FormPanel = ({ formData }) => { setIsWarningPopUp(true); }}> - {DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} + { + 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", "下午")}` + } {/* {DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} */} @@ -461,7 +471,7 @@ const FormPanel = ({ formData }) => {
    { - setWarningTitle(intl.formatMessage({ id: "payDn" })) + setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payDn" })) setWarningText( <>
      @@ -477,7 +487,7 @@ const FormPanel = ({ formData }) => {
    - + ); setIsWarningPopUp(true); @@ -508,7 +518,7 @@ const FormPanel = ({ formData }) => {
    { - setWarningTitle(intl.formatMessage({ id: "payNPGOPopUpTitle" })) + setWarningTitle(intl.formatMessage({ id: "paymentMeans" }) + ": " + intl.formatMessage({ id: "payNPGOPopUpTitle" })) setWarningText( <>
      diff --git a/src/pages/Proof/Search_GLD/SearchForm.js b/src/pages/Proof/Search_GLD/SearchForm.js index 2869ba2..768c274 100644 --- a/src/pages/Proof/Search_GLD/SearchForm.js +++ b/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); diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js index 076979c..f840521 100644 --- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js +++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js @@ -60,8 +60,11 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => { enableReinitialize: true, initialValues: currentUserData, validationSchema: yup.object().shape({ - enName: yup.string().max(40, getMaxErrStr(40)).required(intl.formatMessage({ id: 'userRequireEnglishName' })), - chName: yup.string().max(6, getMaxErrStr(6)).required(intl.formatMessage({ id: 'userRequireChineseName' })), + enName: yup.string().max(40, getMaxErrStr(40)).when('chName', { + is: (chName) => chName?false:true, + then: yup.string().required(intl.formatMessage({ id: 'userRequireEnglishName' })) + }).nullable(), + chName: yup.string().max(6, getMaxErrStr(6)).nullable(), addressLine1: yup.string().max(40, getMaxErrStr(40)).required(intl.formatMessage({ id: 'validateAddressLine1' })), addressLine2: yup.string().max(40, getMaxErrStr(40)).nullable(), addressLine3: yup.string().max(40, getMaxErrStr(40)).nullable(), diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js index 24f7acf..86018de 100644 --- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js +++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js @@ -66,8 +66,11 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => { enableReinitialize: true, initialValues: currentUserData, validationSchema: yup.object().shape({ - enName: yup.string().max(40, getMaxErrStr(40)).required(intl.formatMessage({id: 'userRequireEnglishName'})), - chName: yup.string().max(6, getMaxErrStr(6)).required(intl.formatMessage({id: 'userRequireChineseName'})), + enName: yup.string().max(40, getMaxErrStr(40)).when('chName', { + is: (chName) => chName?false:true, + then: yup.string().required(intl.formatMessage({ id: 'userRequireEnglishName' })) + }).nullable(), + chName: yup.string().max(6, getMaxErrStr(6)).nullable(), addressLine1: yup.string().max(40).required(intl.formatMessage({id: 'validateAddressLine1'})), addressLine2: yup.string().max(40).nullable(), addressLine3: yup.string().max(40).nullable(), diff --git a/src/pages/authentication/AuthWrapper.js b/src/pages/authentication/AuthWrapper.js index 483b2ca..7a1e0af 100644 --- a/src/pages/authentication/AuthWrapper.js +++ b/src/pages/authentication/AuthWrapper.js @@ -51,6 +51,9 @@ const AuthWrapper = ({ children }) => ( + + + import('pages/extra-pages/LoadingComponent'))); + +const PrivacyPolicy = () => { + const intl = useIntl(); + const { locale } = intl; + const [onReady, setOnReady] = useState(false); + const [record, setRecord] = useState({}); + const [content, setContent] = useState(""); + + useEffect(() => { + setOnReady(true); + HttpUtils.get({ + url: PRIVACY_POLICY_PATH, + onSuccess: (responseData) => { + setRecord(responseData); + } + }); + }, []); + + useEffect(() => { + if (locale === 'zh-CN') { + setContent(record.cn); + } else if (locale === 'zh-HK') { + setContent(record.zh); + } else { + setContent(record.en); + } + }, [locale, record]); + + + return ( + !onReady ? + + + + + + : + ( + + +
      + + + + + +
      +       + +
      + + + ) + ); + +} + +export default PrivacyPolicy; \ No newline at end of file diff --git a/src/routes/LoginRoutes.js b/src/routes/LoginRoutes.js index dd0467a..c846e1d 100644 --- a/src/routes/LoginRoutes.js +++ b/src/routes/LoginRoutes.js @@ -12,6 +12,7 @@ const RegisterForm = Loadable(lazy(() => import('pages/authentication/Register') const BusRegisterForm = Loadable(lazy(() => import('pages/authentication/BusRegister'))); const IAmSmartRegister = Loadable(lazy(() => import('pages/authentication/IAmSmartRegister'))); const ErrorPage = Loadable(lazy(() => import('pages/extra-pages/ErrorPage'))); +const PrivacyPolicyPage = Loadable(lazy(() => import('pages/extra-pages/PrivacyPolicy'))); const ForgotPassword = Loadable(lazy(() => import('pages/authentication/ForgotPassword'))); const AfterForgotPasswordPage = Loadable(lazy(() => import('pages/authentication/ForgotPassword/AfterForgotPasswordPage'))); @@ -65,6 +66,10 @@ const LoginRoutes = { path: 'error', element: }, + { + path: 'privacyPolicy', + element: + }, { path: 'iamsmart/logincallback', element: diff --git a/src/translations/en.json b/src/translations/en.json index a394584..50c9185 100644 --- a/src/translations/en.json +++ b/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", @@ -36,10 +37,10 @@ "noMoreThen255Words": "Must not exceed 255 characters", "noMoreThenNWords": "{fieldname} Must not exceed {num} characters", "atLeastNCharAccount": "{fieldname} Please enter at least {num} digits", - "applyTickStr":"I ackmowledge and confirm that the information provided above is correct.", + "applyTickStr":"I acknowledge and confirm that the information provided above is correct.", "applyTickUnderStr1":"1. The public notice submitted for publication in the Gazette must be accurate and is in its final form. The publication of a public notice in the Gazette reject public notices which are considered not suitable for publication. ", "applyTickUnderStr2":"2. Further details please refer to the `Notes on Publication of Public Notice in the Gazette' published in Supplement No. 6 to the Gazette or on the Government Logistics Department website (http://www.gld.gov.hk/eng/services_6.htm)", - "applyTickUnderStr3":"3. The personal data provided by the applicant in this form would be used for application of public notice publication and for assumption of liability. The personal data provided in this form may be disclosed to other bureau / departments. The applicant has a right of access and correction with respect to personal data. Requests for access to or correction of personal data should be addressed to the Personal Data Privacy Officer, Government Logistics Department, 10/F, North Point Government Offices, 333 Java Road, North Point, Hong Kong. ", + "applyTickUnderStr3":"3. The personal data provided by the applicant in this form would be used for application of public notice publication and for assumption of liability. The personal data provided in this form may be disclosed to other bureaux / departments. The applicant has a right of access and correction with respect to personal data. Requests for access to or correction of personal data should be addressed to the Personal Data Privacy Officer, Government Logistics Department, 10/F, North Point Government Offices, 333 Java Road, North Point, Hong Kong. ", "submitted": "Submitted", "MSG.registerIAmSmart": "You may click the \"iAM Smart\" button to fill the personal information automatically or enter the information manually to activate the PNSPS account now.
      If you want to use \"iAM Smart\" to fill the personal information, please download the \"iAM Smart\" mobile app and register as an \"iAM Smart\" user first.", @@ -69,20 +70,20 @@ "MSG.paymentFailMsg7": "Attempt to make the payment using an alternative payment method.", "MSG.paymentFailMsg8": "Check if there are any abnormalities or restrictions in your payment account.", "MSG.paymentFailMsg9": "Contact our customer service representatives for assistance.", - "MSG.paymentFailMsg10": "If you need further assistance or have any questions, please feel free to contact us. We apologize for any inconvenience caused and will resolve your payment issue as soon as possible. Thank you.", + "MSG.paymentFailMsg10": "If you need further assistance or have any questions, please feel free to contact us. We apologise for any inconvenience caused and will resolve your payment issue as soon as possible. Thank you.", "MSG.payMsg1": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}.", "MSG.payMsg2_1": "Please complete the payment before ", "MSG.payMsg2_2": " and we will process the publication after receiving payment confirmation.", - "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.payMsg3": "If you have multiple Public Notice applications within the Year {issueYear}, Volume {issueVolume}, Issue {issueNo} of the 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.", @@ -110,7 +111,7 @@ "publicNoticePaymentCancel": "Public Notice: Payment Canceled", "publicNoticePaymentFPSPay": "Public Notice: FPS Payment", "publicNoticePaymentProofDone": "Public Notice: Proofreading completed", - "publicNoticePaymentProofDoneAndPaid": "Public Notice: Proofreading Completed and Payment", + "publicNoticePaymentProofDoneAndPaid": "Public Notice: Proofreading Completed and Payment made", "publicNoticePaymentProofComment": "Public Notice: Proofreading Reply", "publicNoticePaymentProofInfo": "Public Notice: Proofreading", @@ -142,13 +143,13 @@ "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", "continueWithIAmSmart": "Continue with iAM Smart", - "authorizeIAmSmartForInfo": "Authorize \"iAM Smart\" to provide personal information", - "iAmSmartSubTitle": "In order to complete the account opening and establish a connection with \"iAM Smart\", please authorize \"iAM Smart\" to provide the following personal information:", + "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", "userLoginName": "Username", @@ -411,14 +412,14 @@ "gazetteCount2_1" :"Client Remark / Other Remark", "gazetteCount3" :"Gazette Issue No./ Client Remark / Other Remark", "careOf":"Client Remark", - "careOfWarning":"You have been selected different Client Remark applications. Are you want to pay?", + "careOfWarning":"You have been selected different Client Remark applications. Do you want to pay?", "warning":"Warning", "publishDate": "Publish Date", "draftFile": "Manuscript File", "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", @@ -475,14 +476,14 @@ "proofReply": "Proof Reply", "proofErrorFree": "Pass for printing (without correction)", "proofWithError": "Further proof required (with correction)", - "proofExpired": "Response timed out, please apply again.", + "proofExpired": "Proofing timed out. Please apply again.", "sign": "Sign", "requireLoginPassword": "Please enter your login password", "submitReply": "Submit", "requiredUploadFix": "Please upload the modified file of the manuscript", "upload": "Upload", "actionFail": "Action failed: Please check the content and submit the reply again", - "issueInvalidMsg": "Action failed: The Gazette Issue invalid, please apply again", + "issueInvalidMsg": "Action failed: The Gazette Issue is invalid, please apply again", "singleCol":"Single Column", "doubleCol":"Double Column", @@ -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" diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 5389fd1..75f6fa8 100644 --- a/src/translations/zh-CN.json +++ b/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": "重要告示", @@ -65,19 +66,19 @@ "drafts":"汇票", "cashierOrders":"本票", "paymentMethodAndDeadLine":"付款方式/期限", - "payOnlineMethod":"网上支付", - "payDnMethod":"缴款单支付", - "payNPGOMethod":"收款办公室付款", + "payOnlineMethod":"网上付款", + "payDnMethod":"缴款单付款", + "payNPGOMethod":"在北角政府合署收款处付款", "payOnlineBtn":"网上付款", "fpsQrcodeTitle1":"请扫描以下二维码", "fpsQrcodeTitle2":"二维码有效期限3分钟", - "fpsQrcodeTitle3":"请在规定时间内完成付款流程", + "fpsQrcodeTitle3":"请在限规定时间内完成付款流程", "fpsQrcodeTitle4":"剩余时间:", "fpsQrcodeTitle5":"秒", - "payDnRemark": "在{date}之前将付款证明（如自动柜员机收据、网上银行记录）电邮寄至 gld_acct@gld.gov.hk ", - "payNPGORemark" :"在{date}之前在收款办公室完成付款", - "payOnlineRemark" :"在{date}之前在 GPNSPS 完成网上付款", + "payDnRemark": "请在{date}前缴付款项并将相关付款证明（例如银行入数纸或网上银行付款记录）连同申请编号电邮至gld_acct@gld.gov.hk。", + "payNPGORemark" :"在{date}之前在北角政府合署收款处完成付款", + "payOnlineRemark" :"请选择即时完成付款，或在{date}下午2时30分前完成付款。", "MSG.registerIAmSmart": "你可点击「智方便」按钮，系统会自动输入个人资料，或自行输入个人资料，以即时启动 公共启事提交及缴费系统 帐户。
      如欲使用「智方便」提供个人资料，请先下载「智方便」流动应用程式并登记成为「智方便」用户。", "MSG.registerPersonal": "需上载身份证明文件数码档案以进行网上申请。
      如：香港身份证; 护照; 中国内地身份证; 专业执业证书等", @@ -89,38 +90,38 @@ "MSG.paymentCancelMsg1": "付款取消讯息：", "MSG.paymentCancelMsg2": "你的付款已被取消。我们收到了你的付款请求，但由于某些原因，付款无法完成。请注意以下事项：", - "MSG.paymentCancelMsg3": "如果你主动取消了支付，请确认并确保取消是你的意愿。", + "MSG.paymentCancelMsg3": "如果你主动取消付款，请确认并确保取消是你的意愿。", "MSG.paymentCancelMsg4": "如果付款被取消是由于系统问题或其他原因，请你尝试以下解决方法：", - "MSG.paymentCancelMsg5": "检查支付帐户是否有任何异常或限制。", + "MSG.paymentCancelMsg5": "检查付款帐户是否有任何异常或限制。", "MSG.paymentCancelMsg6": "确保付款资讯准确无误。", "MSG.paymentCancelMsg7": "检查网路连线是否正常。", - "MSG.paymentCancelMsg8": "如果需要进一步的协助或有任何疑问，请随时与我们联系，我们将尽快解决你的付款问题。谢谢！", + "MSG.paymentCancelMsg8": "如果需要进一步的协助或有任何疑问，请在办公时间与我们联络，我们将尽快处理你的付款问题。谢谢！", "MSG.paymentFailMsg1": "付款失败讯息：", - "MSG.paymentFailMsg2": "很遗憾你的付款操作未成功。我们在处理你的付款时遇到了问题。请仔细检查以下事项：", - "MSG.paymentFailMsg3": "支付帐户余额是否足够。", + "MSG.paymentFailMsg2": "很遗憾你的付款操作未能成功。我们在处理你的付款时遇到了问题。请仔细检查以下事项：", + "MSG.paymentFailMsg3": "付款帐户余额是否足够。", "MSG.paymentFailMsg4": "你提供的付款资讯是否准确无误。", "MSG.paymentFailMsg5": "请检查网路连线是否正常。", "MSG.paymentFailMsg6": "如果已确认以上问题无误，但付款失败，请尝试以下解决方法：", "MSG.paymentFailMsg7": "尝试使用其他付款方式进行付款。", - "MSG.paymentFailMsg8": "检查支付帐户是否有异常或限制。", + "MSG.paymentFailMsg8": "检查付款帐户是否有异常或限制。", "MSG.paymentFailMsg9": "联络我们的客服人员寻求协助。", - "MSG.paymentFailMsg10": "如果需要进一步的协助或有任何疑问，请随时与我们联系。非常抱歉给你带来不便，我们将尽快解决你的付款问题。谢谢！", + "MSG.paymentFailMsg10": "如果需要进一步的协助或有任何疑问，请在办公时间与我们联络。我们将尽快处理你的付款问题。谢谢！", - "MSG.payMsg1": "我们已收到申请编号: {appNo} 的稿件校对确定及可付印的指示。", + "MSG.payMsg1": "我们已收到申请编号: {appNo} 的稿件校对确定及可付印指示。", "MSG.payMsg2_1": "请于 " , "MSG.payMsg2_2": " 前 完成缴费，我们将于收到缴费确认后处理刊出事宜。" , "MSG.payMsg3": "如你在宪报期数{issueYear} 年{issueVolume} 卷, 第{issueNo} 期内有多于一个公共启事的申请，你可选择完成所有此期所有稿件校对确定后，于缴费期限前在「我的公共启事」内合并付款。 ", "MSG.proofOutOfTime": "回复逾时，请重新申请。", - "MSG.overReviseDeadline": "超过修改期限", + "MSG.overReviseDeadline": "网上俢订稿件最后限期已过，请按情况重新申请。", "MSG.plzSelectPaymentMethod": "请选择付款方式", "MSG.plzSelectApp": "请选择公共启事。", "MSG.actionFail": "行动失败", - "MSG.paymentHolded": "申请编号 {appNo} 已正在付款的流程中，如相关付款没有成功，请于30分钟后再尝试付款，不便之处，请见谅！", - "MSG.pay_credity1": "我们已收到你已确定申请编号: {appNo} 的稿件校对确定及可付印的指示，并将安排刊登于宪报期数{year} 年{issueVolume} 卷第{issueNo } 期内。", - "MSG.pay_credity2": "此公共启事申请的费用将于下期发出的缴费发票时收取，请依时缴费。", - "MSG.plzonlinePayment": "只能选择付款方式是网上支付的申请。", + "MSG.paymentHolded": "申请编号 {appNo}的付款正在处理中，如相关付款未能成功，请于30分钟后再尝试付款，不便之处，敬请原谅。", + "MSG.pay_credity1": "我们已收到申请编号{appNo}的稿件校对确认及可付印指示，并将安排刊登于宪报期数{year} 年{issueVolume} 卷第{issueNo } 期内。", + "MSG.pay_credity2": "宪报刊登后第十四个历日，发出「一般缴款单」通知缴款。请按照缴款单上的指示，依时缴费。", + "MSG.plzonlinePayment": "只能选择付款方式是网上付款的申请。", "registerTitle1": "立即成为", "registerTitle2": "宪报刊登公共启事", @@ -144,30 +145,30 @@ "publicNoticePaymentFail": "公共启事：付款失败", "publicNoticePaymentSuccess": "公共启事：付款成功", "publicNoticePaymentCancel": "公共启事：付款取消", - "publicNoticePaymentFPSPay": "公共启事：FPS付款", + "publicNoticePaymentFPSPay": "公共启事：FPS转数快付款", "publicNoticePaymentProofDone": "公共启事：校对完成", "publicNoticePaymentProofDoneAndPaid": "公共启事：校对完成及付款", "publicNoticePaymentProofComment": "公共启事：校对回复", "publicNoticePaymentProofInfo": "公共启事：校对", "proofPaymentHeader_demandNote": "公共启事: 已完成校对并已选择付款方式", - "proofPaymentBody_demandNote": "我们已收到以下申请编号的稿件校对确认和印刷指示。
      {appNo}

      您已选择以一般缴款单付款。", - "proofPaymentBody_demandNote2": "一般缴款单将在一个工作天内，但不迟于{closingDateOff} 晚上9时前发送至以下电子邮件地址：
      {email}", - "proofPaymentBody_demandNote3": "请在{paymentDeadline}前缴交费用并将付款证明连同申请编号（例如自动柜员机收据、网上银行记录）发送至gld_acct@gld.gov.hk。", - "proofPaymentBody_demandNote4": "我们将在收到付款确认通知后处理刊登事宜。", + "proofPaymentBody_demandNote": "我们已收到以下申请编号的稿件校对确认及可付印指示。
      {appNo}

      你已选择以一般缴款单付款。", + "proofPaymentBody_demandNote2": "一般缴款单将在一个工作天内，但不迟于{closingDateOff} 晚上9时前发送至以下电邮地址：
      {email}", + "proofPaymentBody_demandNote3": "请在{paymentDeadline}前缴付款项并将相关付款证明（例如银行入数纸或网上银行付款记录）连同申请编号电邮至gld_acct@gld.gov.hk。", + "proofPaymentBody_demandNote4": "我们将在收到付款后处理刊登事宜。", "proofPaymentHeader_office": "公共启事: 已完成校对并已选择付款方式", - "proofPaymentBody_office": "我们已收到以下申请编号的稿件校对确认和印刷指示。
      {appNo}", - "proofPaymentBody_office2": "您已选择在北角政府合署收款处付款：

      香港北角渣华道333号
      北角政府合署10楼
      会计部收款处
      ", + "proofPaymentBody_office": "我们已收到以下申请编号的稿件校对确认及可付印指示。
      {appNo}", + "proofPaymentBody_office2": "你已选择在北角政府合署收款处付款：

      香港北角渣华道333号
      北角政府合署10楼
      会计部收款处
      ", "proofPaymentBody_office3": "收款处的办公时间为星期一至五上午八时三十分至下午一时及下午二时至五时。", - "proofPaymentBody_office4": "凡支票、汇票或本票均须书明支付「香港特别行政区政府」并加划线，抬头人不应为个别职员。客户以支票、汇票或本票方式付款，须待其兑现后方为有效。", - "proofPaymentBody_office5": "请打印此页面或使用电子屏幕设备向收款处职员展示申请详情，并在{paymentDeadline}前完成付款。", - "proofPaymentBody_office6": "我们将在收到付款确认通知后处理刊登事宜。", + "proofPaymentBody_office4": "凡支票、汇票或本票均须书明支付「香港特别行政区政府」并加划线。", + "proofPaymentBody_office5": "请列印此页面或出示电子设备屏幕上所显示的申请资料，以供收款处职员查阅，并在{paymentDeadline}下午12时30分前完成付款。", + "proofPaymentBody_office6": "我们将在收到付款后处理刊登事宜。", "proofPaymentHeader_online": "公共启事: 已完成校对并已选择付款方式", - "proofPaymentBody_online": "我们已收到以下申请编号的稿件校对确认和印刷指示。
      {appNo}", + "proofPaymentBody_online": "我们已收到以下申请编号的稿件校对确认及可付印指示。
      {appNo}", "proofPaymentBody_online2": "请选择即时完成付款，或在{paymentDeadline}前完成付款。", - "proofPaymentBody_online3": "我们将在收到付款确认通知后处理刊登事宜。", + "proofPaymentBody_online3": "我们将在收到付款后处理刊登事宜。", "proofRecord": "校对记录", "onlinePaymentHistory": "网上付款记录", @@ -177,6 +178,7 @@ "welcomeMsg_pm": "午安! 请选择所需服务。", "welcomeMsg_night": "晚安! 请选择所需服务。", + "aboutUs": "关于我们", "login": "登录", "logout": "登出", "iAmSmartLogin": "以智方便继续", @@ -189,14 +191,14 @@ "userPassword": "密码", "loginErrorMessage1":"帐户已被封锁", - "loginErrorMessage2":"由于您的帐户因连续五次登录错误而被锁定，请通过忘记密码来找回您的密码，或联系系统管理员寻求进一步帮助。", + "loginErrorMessage2":"由于你的帐户因连续五次登录错误而被锁定，请通过忘记密码来找回你的密码，或联系系统管理员寻求进一步帮助。", "loginErrorMessage3":"帐户尚未验证", "loginErrorMessage4":"系统连接失败", "loginErrorMessage5":"用户名或密码错误", "loginErrorMessage6":"找不到用户帐户", "loginSuccessMessage1":"成功连结现有帐户", - "loginSuccessMessage2":"你是我们的现有用户，已成功连结现有帐户。
      以后可以透过「智方便」登入。", + "loginSuccessMessage2":"你是我们的现有客户，已成功连结现有帐户。
      以后可以透过「智方便」登入。", "loginSuccessMessage3":"继续使用e-Service", "oldPassword": "旧密码", @@ -210,9 +212,9 @@ "forgotPasswordSubTitle2": "以重设密码", "resetPasswordSuccess": "已成功重设密码。", "securityCode": "安全验证码", - "sentSecurityCode1": "我们已将验证码送至你的电邮：", - "sentSecurityCode2": "请查看你的电子邮件信箱中是否有包含验证码的信件。", - "sentSecurityCode3": "请查看你的电子邮件信箱中", + "sentSecurityCode1": "我们已将验证码送至你的电邮地址：", + "sentSecurityCode2": "请查看你的电邮信箱中是否有包含验证码的信件。", + "sentSecurityCode3": "请查看你的电邮信箱中", "sentSecurityCode4": "是否有包含验证码的信件。", "requireSecurityCode": "请输入安全验证码", "learnMore": "了解更多", @@ -235,13 +237,13 @@ "userRequireChineseName": "請輸入中文姓名", "userRequireEnglishName": "請輸入英文姓名", "userRequireName": "請輸入姓名", - "userContactEmail": "电邮", - "confirmEmail": "确认电邮", - "requireEmail": "请输入电邮", + "userContactEmail": "电邮地址", + "confirmEmail": "确认电邮地址", + "requireEmail": "请输入电邮地址", "validEmailFormat": "请输入电邮格式", - "validSameEmail": "请输入相同电邮", - "emailUsed": "此电邮已被注册，请使用其他电邮", - "emailSent": "验证电邮将发送到你的电邮地址，请依指示完成验证及登入系统。", + "validSameEmail": "请输入相同电邮地址", + "emailUsed": "此电邮地址已被注册，请使用其他电邮地址", + "emailSent": "验证电邮将发送至你的电邮地址，请依指示完成验证及登入系统。", "userContactNumber": "联络电话", "contactFaxNumber": "联络传真", "requiredValidNumber": "请输入有效联络电话", @@ -253,7 +255,7 @@ "requireDialingCode": "请输入国际区号", "requireVerify": "请输入验证", "verifySuccess": "帐户已成功验证。", - "passwordExpired": "您的密码已过期，请立即更改密码以继续使用系统。", + "passwordExpired": "你的密码已过期，请立即更改密码以继续使用系统。", "verifyFail": "验证失败，请联络相关的系统管理员协助。", "dialingCode": "国际区号", "userFaxNumber": "传真号码", @@ -289,7 +291,7 @@ "fileName": "档案名称", "fileSize": "档案大小", "fileSizeWarning": "上传档案应不大于 10MB", - "dnOverdueWarning": "请尽快缴付所有逾期未缴交的款额。", + "dnOverdueWarning": "请尽快缴付所有逾期未缴交的款項。", "noFile": "没有上传档案", "termsAndCondition": "条款和条件", "acceptTerms": "我接受", @@ -383,7 +385,7 @@ "submitDateFrom": "提交日期 (从)", "submitDateTo": "提交日期 (到)", "myRemarks": "其他备注", - "careOfRemark": "如果您想在付款收据上显示客户的名称，您可以在此处输入（例如个人或公司名称）。", + "careOfRemark": "如果你想在付款收据上显示客户的名称，你可以在此处输入（例如个人或公司名称）。", "uploadApplicationFileRemark": "只接受.docx及.xlsx档案格式 及一个档案只适用于一个申请。", "status": "状态", "viewDetail": "查看详情", @@ -424,7 +426,7 @@ "currencyAmountTitle": "金额 (HK$):", "transactionRefNo": "交易参考编号", "selectedPaymentMethod": "已选择付款方法", - "paymentMethodNotAvailable":"付款功能现在不可用", + "paymentMethodNotAvailable":"付款功能现在不可使用", "paymentLimitPrice1":"只适用于最小金额为 1.00 及最高金额为 9,999,999.99", "paymentLimitPrice2":"只适用于最小金额为 0.10 及最高金额为 9,999,999.99", "paymentLimitPPS":"付款不适用于流动装置的浏览器，请使用桌面电脑。", @@ -439,26 +441,26 @@ "gazetteCount2_1" :"客户备注/ 其他备注", "gazetteCount3" :"宪报期数/ 客户备注/ 其他备注", "careOf":"客户备注", - "careOfWarning":"您已选择了不同的客户备注申请。您要付款吗？", + "careOfWarning":"你已选择了不同的客户备注申请。你要付款吗？", "warning":"警告", "publishDate": "发布日期", "draftFile": "稿件档案", "download": "下载", "paymentHistory": "付款记录", "proofId": "校对编号", - "proofDate": "出稿日期", + "proofDate": "网上修订稿件最后限期", "proofDateFrom": "出稿日期 (从)", "proofDateTo": "出稿日期 (到)", "replyDate": "回复日期", "fee": "金额 ($)", "payFeeFor": "应缴金额 ($)", - "payFor": "支付", - "payFee": "支付金额 ($)", - "replyBefore": "此日期前回复", + "payFor": "付款", + "payFee": "付款金额 ($)", + "replyBefore": "网上确定付印最后限期", "applicationPublishDate": "刊出日期", "pleaseCheckReminder": "请下载下列印刷稿档案，并仔细校对", "payAnd": "缴费及", - "commentDeadline": "网上返稿最后限期", + "commentDeadline": "网上修订稿件最后限期", "paymentDeadline": "网上确定付印最后限期", "before": "前", "page": "页", @@ -480,10 +482,10 @@ "paymentNo": "付款编号", "paymentDate": "付款日期", "paymentTime": "付款时间", - "paymentRefCode": "付款参考号码", + "paymentRefCode": "付款参考编号", "paymentInfoRecord": "缴款通知记录", - "paymentRecordId": "缴款单号", + "paymentRecordId": "缴款单编号", "sendDate": "发出日期", "sendDateTime": "发出时间", "sendDateFrom": "发出日期 (从)", @@ -501,7 +503,7 @@ "MSG.revokePrimay": "是否确定要撤销 “{username}” 为主要用户吗？", "submitApplication": "提交公共启事申请", - "applicationSubheading": "提供你的启事内容作排版，校对及计价。", + "applicationSubheading": "提供你的启事内容作排版，校对及计算所需费用。", "announcement": "通告", "viewAllAnnouncement": "显示所有通告", "systemMessage": "系统消息", @@ -532,7 +534,7 @@ "organizationProfile": "机构资料", "organizationDetails": "机构详情", "brNo": "商业登记证号码", - "creditorAccount": "债权人帐户", + "creditorAccount": "已获安排在宪报刊登公共启事后才须缴付款项的用户", "nameEng": "姓名 (英文)", "nameChi": "姓名 (中文)", "expiryDate": "屆滿日期", @@ -545,8 +547,8 @@ "proofConfirmed":"可以付印", "proofReProofing":"未能付印", - "proofNoReply":"回复逾时", - "proofPendingReply":"未回复", + "proofNoReply":"校对回复逾时，请重新申请", + "proofPendingReply":"校对待复", "Dashboard": "仪表板", "event": "活动" diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index fe9576b..654a40a 100644 --- a/src/translations/zh-HK.json +++ b/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": "重要告示", @@ -65,19 +66,19 @@ "drafts":"匯票", "cashierOrders":"本票", "paymentMethodAndDeadLine":"付款方式/期限", - "payOnlineMethod":"網上支付", - "payDnMethod":"繳款單支付", - "payNPGOMethod":"收款辦公室付款", + "payOnlineMethod":"網上付款", + "payDnMethod":"繳款單付款", + "payNPGOMethod":"在北角政府合署收款處付款", "payOnlineBtn":"網上付款", "fpsQrcodeTitle1":"請掃描以下二維碼", "fpsQrcodeTitle2":"二維碼有效期限3分鐘", - "fpsQrcodeTitle3":"請在規定時間內完成付款流程", + "fpsQrcodeTitle3":"請在限規定時間內完成付款流程", "fpsQrcodeTitle4":"剩餘時間:", "fpsQrcodeTitle5":"秒", - "payDnRemark": "在{date}之前將付款證明（如自動櫃員機收據、網上銀行記錄）電郵寄至 gld_acct@gld.gov.hk ", - "payNPGORemark" :"在{date}之前在收款辦公室完成付款", - "payOnlineRemark" :"在{date}之前在 GPNSPS 完成網上付款", + "payDnRemark": "請在{date}前繳付款項並將相關付款證明（例如銀行入數紙或網上銀行付款記錄）連同申請編號電郵至gld_acct@gld.gov.hk。 ", + "payNPGORemark" :"在{date}之前在北角政府合署收款處完成付款", + "payOnlineRemark" :"請選擇即時完成付款，或在{date}下午2時30分前完成付款。", "MSG.registerIAmSmart": "你可點擊「智方便」按鈕，系統會自動輸入個人資料，或自行輸入個人資料，以即時啟動 公共啟事提交及繳費系統 帳戶。
      如欲使用「智方便」提供個人資料，請先下載「智方便」流動應用程式並登記成為「智方便」用戶。", "MSG.registerPersonal": "需上載身份證明文件數碼檔案以進行網上申請。
      如：香港身份證; 護照; 中國內地身份證; 專業執業証書等", @@ -89,38 +90,38 @@ "MSG.paymentCancelMsg1": "付款取消訊息：", "MSG.paymentCancelMsg2": "你的付款已被取消。我們收到了你的付款請求，但由於某些原因，付款無法完成。請注意以下事項：", - "MSG.paymentCancelMsg3": "如果你主動取消了支付，請確認並確保取消是你的意願。", + "MSG.paymentCancelMsg3": "如果你主動取消付款，請確認並確保取消是你的意願。", "MSG.paymentCancelMsg4": "如果付款被取消是由於系統問題或其他原因，請嘗試以下解決方法：", - "MSG.paymentCancelMsg5": "檢查支付帳戶是否有任何異常或限制。", + "MSG.paymentCancelMsg5": "檢查付款帳戶是否有任何異常或限制。", "MSG.paymentCancelMsg6": "確保付款資訊準確無誤。", "MSG.paymentCancelMsg7": "檢查網路連線是否正常。", - "MSG.paymentCancelMsg8": "如果需要進一步的協助或有任何疑問，請隨時與我們聯繫，我們將盡快解決你的付款問題。謝謝！", + "MSG.paymentCancelMsg8": "如果需要進一步的協助或有任何疑問，請在辦公時間與我們聯絡，我們將盡快處理你的付款問題。謝謝！", "MSG.paymentFailMsg1": "付款失敗訊息：", - "MSG.paymentFailMsg2": "很遺憾你的付款操作未成功。我們在處理你的付款時遇到了問題。請仔細檢查以下事項：", - "MSG.paymentFailMsg3": "支付帳戶餘額是否足夠。", + "MSG.paymentFailMsg2": "很遺憾你的付款操作未能成功。我們在處理你的付款時遇到了問題。請仔細檢查以下事項：", + "MSG.paymentFailMsg3": "付款帳戶餘額是否足夠。", "MSG.paymentFailMsg4": "你提供的付款資訊是否準確無誤。", "MSG.paymentFailMsg5": "請檢查網路連線是否正常。", "MSG.paymentFailMsg6": "如果已確認以上問題無誤，但付款失敗，請嘗試以下解決方法：", "MSG.paymentFailMsg7": "嘗試使用其他付款方式進行付款。", - "MSG.paymentFailMsg8": "檢查支付帳戶是否有異常或限制。", + "MSG.paymentFailMsg8": "檢查付款帳戶是否有異常或限制。", "MSG.paymentFailMsg9": "聯絡我們的客服人員尋求協助。", - "MSG.paymentFailMsg10": "如果需要進一步的協助或有任何疑問，請隨時與我們聯繫。非常抱歉給你帶來不便，我們將盡快解決你的付款問題。謝謝！", + "MSG.paymentFailMsg10": "如果需要進一步的協助或有任何疑問，請在辦公時間與我們聯絡。我們將盡快處理你的付款問題。謝謝！", - "MSG.payMsg1": "我們已收到申請編號: {appNo} 的稿件校對確定及可付印的指示。", + "MSG.payMsg1": "我們已收到申請編號: {appNo} 的稿件校對確定及可付印指示。", "MSG.payMsg2_1": "請於 ", "MSG.payMsg2_2": " 前 完成繳費，我們將於收到繳費確認後處理刊出事宜。", "MSG.payMsg3": "如你在憲報期數 {issueYear} 年 {issueVolume} 卷, 第 {issueNo} 期內有多於一個公共啟事的申請，你可選擇完成所有此期所有稿件校對確定後，於繳費期限前在「我的公共啟事」內合併付款。", "MSG.proofOutOfTime": "回覆逾時，請重新申請。", - "MSG.overReviseDeadline": "超過修改期限", + "MSG.overReviseDeadline": "網上俢訂稿件最後限期已過，請按情況重新申請。", "MSG.plzSelectApp": "請選擇公共啟事。", "MSG.plzSelectPaymentMethod": "請選擇付款方式", "MSG.actionFail": "行動失敗", - "MSG.paymentHolded": "申請編號 {appNo} 已正在付款的流程中，如相關付款沒有成功，請於30分鐘後再嘗試付款，不便之處，請見諒！", - "MSG.pay_credity1": "我們已收到你已確定申請編號: {appNo} 的稿件校對確定及可付印的指示，並將安排刊登於憲報 期數 {year} 年 {issueVolume} 卷 第 {issueNo} 期內。", + "MSG.paymentHolded": "申請編號 {appNo}的付款正在處理中，如相關付款未能成功，請於30分鐘後再嘗試付款，不便之處，敬請原諒。", + "MSG.pay_credity1": "我們已收到申請編號{appNo}的稿件校對確認及可付印指示，並將安排刊登於憲報 期數 {year} 年 {issueVolume} 卷 第 {issueNo} 期內。", "MSG.pay_credity2": "此公共啟事申請的費用將於憲報刊登後第十四個曆日，發出「一般繳款單」通知繳款。請按照繳款單上的指示，依時繳費。", - "MSG.plzonlinePayment": "只能選擇付款方式是網上支付的申請。", + "MSG.plzonlinePayment": "只能選擇付款方式是網上付款的申請。", "registerTitle1": "立即成為", "registerTitle2": "憲報刊登公共啟事", @@ -144,30 +145,30 @@ "publicNoticePaymentFail": "公共啟事：付款失敗", "publicNoticePaymentSuccess": "公共啟事：付款成功", "publicNoticePaymentCancel": "公共啟事：付款取消", - "publicNoticePaymentFPSPay": "公共啟事：FPS付款", + "publicNoticePaymentFPSPay": "公共啟事：FPS轉數快付款", "publicNoticePaymentProofDone": "公共啟事：校對完成", "publicNoticePaymentProofDoneAndPaid": "公共啟事：校對完成及付款", "publicNoticePaymentProofComment": "公共啟事：校對回覆", "publicNoticePaymentProofInfo": "公共啟事：校對", "proofPaymentHeader_demandNote": "公共啟事: 已完成校對並已選擇付款方式", - "proofPaymentBody_demandNote": "我們已收到以下申請編號的稿件校對確認和印刷指示。
      {appNo}
      您已選擇以一般繳款單付款。", - "proofPaymentBody_demandNote2": "一般繳款單將在一個工作天內，但不遲於{closingDateOff} 晚上9時前發送至以下電子郵件地址：
      {email}", - "proofPaymentBody_demandNote3": "請在{paymentDeadline}前繳交費用並將付款證明連同申請編號（例如自動櫃員機收據、網上銀行記錄）發送至gld_acct@gld.gov.hk。", - "proofPaymentBody_demandNote4": "我們將在收到付款確認通知後處理刊登事宜。", + "proofPaymentBody_demandNote": "我們已收到以下申請編號的稿件校對確認及可付印指示。
      {appNo}
      你已選擇以一般繳款單付款。", + "proofPaymentBody_demandNote2": "一般繳款單將在一個工作天內，但不遲於{closingDateOff} 晚上9時前發送至以下電郵地址：
      {email}", + "proofPaymentBody_demandNote3": "請在{paymentDeadline}前繳付款項並將相關付款證明（例如銀行入數紙或網上銀行付款記錄）連同申請編號電郵至gld_acct@gld.gov.hk。 ", + "proofPaymentBody_demandNote4": "我們將在收到付款後處理刊登事宜。", "proofPaymentHeader_office": "公共啟事: 已完成校對並已選擇付款方式", - "proofPaymentBody_office": "我們已收到以下申請編號的稿件校對確認和印刷指示。
      {appNo}", - "proofPaymentBody_office2": "您已選擇在北角政府合署收款處付款：

      香港北角渣華道333號
      北角政府合署10樓
      會計部收款處
      ", + "proofPaymentBody_office": "我們已收到以下申請編號的稿件校對確認及可付印指示。
      {appNo}", + "proofPaymentBody_office2": "你已選擇在北角政府合署收款處付款：

      香港北角渣華道333號
      北角政府合署10樓
      會計部收款處
      ", "proofPaymentBody_office3": "收款處的辦公時間為星期一至五上午八時三十分至下午一時及下午二時至五時。", - "proofPaymentBody_office4": "凡支票、匯票或本票均須書明支付「香港特別行政區政府」並加劃線，抬頭人不應為個別職員。客戶以支票、匯票或本票方式付款，須待其兌現後方為有效。", - "proofPaymentBody_office5": "請列印此頁面或使用電子屏幕設備向收款處職員展示申請詳情，並在{paymentDeadline}之前完成付款。", - "proofPaymentBody_office6": "我們將在收到付款確認通知後處理刊登事宜。", + "proofPaymentBody_office4": "凡支票、匯票或本票均須書明支付「香港特別行政區政府」並加劃線。", + "proofPaymentBody_office5": "請列印此頁面或出示電子設備屏幕上所顯示的申請資料，以供收款處職員查閱，並在{paymentDeadline}下午12時30分前完成付款。", + "proofPaymentBody_office6": "我們將在收到付款後處理刊登事宜。", "proofPaymentHeader_online": "公共啟事: 已完成校對並已選擇付款方式", - "proofPaymentBody_online": "我們已收到以下申請編號的稿件校對確認和印刷指示。
      {appNo}", + "proofPaymentBody_online": "我們已收到以下申請編號的稿件校對確認及可付印指示。
      {appNo}", "proofPaymentBody_online2": "請選擇即時完成付款，或在{paymentDeadline}前完成付款。", - "proofPaymentBody_online3": "我們將在收到付款確認通知後處理刊登事宜。", + "proofPaymentBody_online3": "我們將在收到付款後處理刊登事宜。", @@ -179,6 +180,7 @@ "welcomeMsg_pm": "午安! 請選擇所需服務。", "welcomeMsg_night": "晚安! 請選擇所需服務。", + "aboutUs": "關於我們", "login": "登入", "logout": "登出", "iAmSmartLogin": "以智方便繼續", @@ -191,14 +193,14 @@ "userPassword": "密碼", "loginErrorMessage1":"帳戶已被封鎖", - "loginErrorMessage2":"由於您的帳號因連續五次登入錯誤而被鎖定，請透過忘記密碼找回密碼或聯絡系統管理員尋求進一步協助。", + "loginErrorMessage2":"由於你的帳號因連續五次登入錯誤而被鎖定，請透過忘記密碼找回密碼或聯絡系統管理員尋求進一步協助。", "loginErrorMessage3":"帳戶尚未驗證", "loginErrorMessage4":"系統連接失敗", "loginErrorMessage5":"用戶名或密碼錯誤", "loginErrorMessage6":"找不到用戶帳戶", "loginSuccessMessage1":"成功連結現有帳戶", - "loginSuccessMessage2":"你是我們的現有用戶，已成功連結現有帳戶。
      以後可以透過「智方便」登入。", + "loginSuccessMessage2":"你是我們的現有客戶，已成功連結現有帳戶。
      以後可以透過「智方便」登入。", "loginSuccessMessage3":"繼續使用e-Service", "oldPassword": "舊密碼", @@ -210,20 +212,20 @@ "forgotPasswordSubTitle": "請輸入你的用戶登入名稱以重設密碼", "forgotPasswordSubTitle1": "請輸入你的用戶登入名稱", "forgotPasswordSubTitle2": "以重設密碼", - "forgotUsernameSubTitle": "請輸入你的電郵以重設密碼", - "forgotUsernameSubTitle1": "請輸入你的電郵", + "forgotUsernameSubTitle": "請輸入你的電郵地址以重設密碼", + "forgotUsernameSubTitle1": "請輸入你的電郵地址", "resetPasswordSuccess": "已成功重設密碼。", "securityCode": "安全驗證碼", - "sentSecurityCode1": "我們已將驗證碼送至你的電郵：", - "sentSecurityCode2": "請查看你的電子郵件信箱中是否有包含驗證碼的信件。", - "sentSecurityCode3": "請查看你的電子郵件信箱中", + "sentSecurityCode1": "我們已將驗證碼送至你的電郵地址：", + "sentSecurityCode2": "請查看你的電郵信箱中是否有包含驗證碼的信件。", + "sentSecurityCode3": "請查看你的電郵信箱中", "sentSecurityCode4": "是否有包含驗證碼的信件。", "requireSecurityCode": "請輸入安全驗證碼", "learnMore": "了解更多", "createOrReActivate": "建立帳戶", - "usernameTaken": "此用戶登入名稱已被注冊，請使用其他用戶登入名稱", - "userRegistered": "此用戶已注冊，請返回登入頁面並進行登入流程。", + "usernameTaken": "此用戶登入名稱已被註冊，請使用其他用戶登入名稱", + "userRegistered": "此用戶已註冊，請返回登入頁面並進行登入流程。", "user": "用戶", "personalUser": "個人用戶", @@ -240,13 +242,13 @@ "userRequireChineseName": "請輸入中文姓名", "userRequireEnglishName": "請輸入英文姓名", "userRequireName": "請輸入姓名", - "userContactEmail": "電郵", - "confirmEmail": "確認電郵", - "requireEmail": "請輸入電郵", + "userContactEmail": "電郵地址", + "confirmEmail": "確認電郵地址", + "requireEmail": "請輸入電郵地址", "validEmailFormat": "請輸入電郵格式", - "validSameEmail": "請輸入相同電郵", - "emailUsed": "此電郵已被注冊，請使用其他電郵", - "emailSent": "驗證電郵將發送到你的電郵地址，請依指示完成驗證及登入系統。", + "validSameEmail": "請輸入相同電郵地址", + "emailUsed": "此電郵地址已被注冊，請使用其他電郵地址", + "emailSent": "驗證電郵將發送至你的電郵地址，請依指示完成驗證及登入系統。", "userContactNumber": "聯絡電話", "contactFaxNumber": "聯絡傳真", "requiredValidNumber": "請輸入有效聯絡電話", @@ -291,14 +293,14 @@ "fileName": "檔案名稱", "fileSize": "檔案大小", "fileSizeWarning": "上傳檔案應不大於 10MB", - "dnOverdueWarning": "請盡快繳付所有逾期未繳交的款額。", + "dnOverdueWarning": "請盡快繳付所有逾期未繳交的款項。", "noFile": "沒有上傳檔案", "termsAndCondition": "條款和條件", "acceptTerms": "我接受", "rejectTerms": "我不接受", "verify": "驗證", "verifySuccess": "帳戶已成功驗證。", - "passwordExpired": "您的密碼已過期，請立即變更密碼以繼續使用系統。", + "passwordExpired": "你的密碼已過期，請立即變更密碼以繼續使用系統。", "verifyFail": "驗證失敗，請聯絡相關的系統管理員協助。", "validVerify": "請輸入有效驗證", "requiredValid": "請輸入有效的", @@ -388,7 +390,7 @@ "submitDateFrom": "提交日期 (從)", "submitDateTo": "提交日期 (到)", "myRemarks": "其他備註", - "careOfRemark": "如果您想在付款收據上顯示客戶的名稱，您可以在此處輸入（例如個人或公司名稱）。", + "careOfRemark": "如果你想在付款收據上顯示客戶的名稱，你可以在此處輸入（例如個人或公司名稱）。", "uploadApplicationFileRemark": "只接受.docx及.xlsx檔案格式 及一個檔案只適用於一個申請。", "status": "狀態", "viewDetail": "查看詳情", @@ -429,7 +431,7 @@ "currencyAmountTitle": "金額 (HK$):", "transactionRefNo": "交易參考編號", "selectedPaymentMethod": "已選擇付款方法", - "paymentMethodNotAvailable":"付款功能現在不可用", + "paymentMethodNotAvailable":"付款功能現在不可使用", "paymentLimitPrice1":"只適用於最小金額為 1.00 及最高金額為 9,999,999.99", "paymentLimitPrice2":"只適用於最小金額為 0.10 及最高金額為 9,999,999.99", "paymentLimitPPS":"付款不適用於流動裝置的瀏覽器，請使用桌面電腦。", @@ -444,26 +446,26 @@ "gazetteCount2_1" :"客戶備註/ 其他備註", "gazetteCount3" :"憲報期數/ 客戶備註/ 其他備註", "careOf":"客戶備註", - "careOfWarning":"您已選擇了不同的客戶備註申請。您要付款嗎？", + "careOfWarning":"你已選擇了不同的客戶備註申請。你要付款嗎？", "warning":"警告", "publishDate": "發佈日期", "draftFile": "稿件檔案", "download": "下載", "paymentHistory": "付款記錄", "proofId": "校對編號", - "proofDate": "出稿日期", + "proofDate": "網上俢訂稿件最後限期", "proofDateFrom": "出稿日期 (從)", "proofDateTo": "出稿日期 (到)", "replyDate": "回覆日期", "fee": "金額 ($)", "payFeeFor": "應繳金額 ($)", - "payFor": "支付", - "payFee": "支付金額 ($)", - "replyBefore": "此日期前回覆", + "payFor": "付款", + "payFee": "付款金額 ($)", + "replyBefore": "網上確定付印最後限期", "applicationPublishDate": "刊出日期", "pleaseCheckReminder": "請下載下列印刷稿檔案，並仔細校對", "payAnd": "繳費及", - "commentDeadline": "網上返稿最後限期", + "commentDeadline": "網上俢訂稿件最後限期", "paymentDeadline": "網上確定付印最後限期", "before": "前", "page": "頁", @@ -485,10 +487,10 @@ "paymentNo": "付款編號", "paymentDate": "付款日期", "paymentTime": "付款時間", - "paymentRefCode": "付款參考號碼", + "paymentRefCode": "付款參考編號", "paymentInfoRecord": "繳款通知記錄", - "paymentRecordId": "繳款單號", + "paymentRecordId": "繳款單編號", "sendDate": "發出日期", "sendDateTime": "發出時間", "sendDateFrom": "發出日期 (從)", @@ -506,7 +508,7 @@ "MSG.revokePrimay": "是否確定要撤銷 “{username}” 為主要使用者嗎？", "submitApplication": "提交公共啟事申請", - "applicationSubheading": "提供你的公共啟事內容作排版，校對及計價。", + "applicationSubheading": "提供你的公共啟事內容作排版，校對及計算所需費用。", "announcement": "通告", "viewAllAnnouncement": "顯示所有通告", "systemMessage": "系統消息", @@ -537,7 +539,7 @@ "organizationProfile": "機構資料", "organizationDetails": "機構詳情", "brNo": "商業登記證號碼", - "creditorAccount": "債權人帳戶", + "creditorAccount": "已獲安排在憲報刊登公共啟事後才須繳付款項的用戶", "nameEng": "姓名 (英文)", "nameChi": "姓名 (中文)", "expiryDate": "屆滿日期", @@ -550,8 +552,8 @@ "proofConfirmed":"可以付印", "proofReProofing":"未能付印", - "proofNoReply":"回覆逾時", - "proofPendingReply":"未回覆", + "proofNoReply":"校對回覆逾時，請重新申請", + "proofPendingReply":"校對待覆", "Dashboard": "儀表板", "event": "活動" diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js index 9a88d94..3fa1a32 100644 --- a/src/utils/ApiPathConst.js +++ b/src/utils/ApiPathConst.js @@ -8,6 +8,7 @@ export const REFRESH_TOKEN = "/refresh-token" export const CHANGE_PASSWORD_PATH = "/user/change-password" export const GET_SYS_PARAMS = apiPath+'/settings'; +export const PRIVACY_POLICY_PATH = apiPath+'/privacyPolicy'; //Group Config export const GET_GROUP_LIST_PATH = apiPath+'/group'; diff --git a/src/utils/ComboData.js b/src/utils/ComboData.js index d18f34b..792e3b9 100644 --- a/src/utils/ComboData.js +++ b/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 = [ diff --git a/src/utils/statusUtils/ProofStatus.js b/src/utils/statusUtils/ProofStatus.js index e7e6831..b5a26c4 100644 --- a/src/utils/statusUtils/ProofStatus.js +++ b/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) {