update string

src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js

@@ -271,6 +271,15 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
                             <form onSubmit={formik.handleSubmit}>
                                 <Grid container spacing={1} sx={{ minHeight: '80vh' }} direction="row" justifyContent="flex-start" alignItems="center">
                                     <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}>
+                                        {FieldUtils.getTextField({
+                                            label: intl.formatMessage({ id: 'applyPerson' }) + ":",
+                                            valueName: "applyPerson",
+                                            form: formik,
+                                            disabled: true,
+                                            autoFocus: false
+                                        })}
+                                    </Grid>
+                                    <Grid item xs={12} md={12}>
                                         {FieldUtils.getTextField({
                                             label: intl.formatMessage({ id: 'contactPerson' }) + ":",
                                             valueName: "contactPerson",
@@ -327,7 +336,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
                                         </Grid>
                                     </Grid>
 
-                                    {!isCreditorLoggedIn()?
+                                    {!isCreditorLoggedIn() ?
                                         <Grid item xs={12} alignItems={"center"} sx={{ p: 2 }}>
                                             <table style={tabelStyle}>
                                                 <tbody>
@@ -379,7 +388,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
                                                                         </ul>
                                                                         <Typography variant="h6">
                                                                             <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
-                                                                        </Typography>  
+                                                                        </Typography>
                                                                     </>
                                                                 );
                                                                 setIsWarningPopUp(true);
@@ -532,13 +541,20 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
                                             </Grid>
                                     }
 
-                                    <Grid item xs={12}>
-                                        <Typography variant="h6" height="100%" >
-                                            <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "tradeMarkFootnote" }) }} />
+                                    <Grid item xs={12} mr={1} mb={2}>
+                                        <Typography variant="pnspsFormParagraphBold">
+                                            <span style={{ textAlign: 'justify', }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickUnderStr0" }) }} />
+                                        </Typography>
+                                        <Typography display="inline" variant="subtitle1" sx={{ color: 'primary.primary' }} >
+                                            <ol style={{ textAlign: 'justify', }}>
+                                                <li dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickUnderStr1" }) }} />
+                                                <li dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickUnderStr2" }) }} />
+                                                <li dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickUnderStr3" }) }} />
+                                                <li dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "tradeMarkFootnote" }) }} />
+                                            </ol>
                                         </Typography>
                                     </Grid>
 
-
                                     <Grid item xs={12}>
                                         <Stack direction="row">
                                             <Checkbox
@@ -551,19 +567,11 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
                                                 size="small"
                                             />
                                             <Typography variant="h6" height="100%" >
-                                                <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickStr" }) }} />
+                                                <div style={{ padding: 12, textAlign: 'justify' }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickStr" }) }} />
                                             </Typography>
                                         </Stack>
                                     </Grid>
 
-                                    <Grid item xs={12} ml={1} mr={1} mb={2}>
-                                        <Typography variant="h6" height="100%" sx={{ textAlign: "justify"}} >
-                                            <div style={{ padding: 5 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickUnderStr1" }) }} />
-                                            <div style={{ padding: 5 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickUnderStr2" }) }} />
-                                            <div style={{ padding: 5 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickUnderStr3" }) }} />
-                                        </Typography>
-                                    </Grid>
-
                                     <Grid item xs={12}>
                                         <center>
                                             <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>

src/translations/en.json

@@ -38,10 +38,11 @@
   "noMoreThen255Words": "Must not exceed 255 characters",
   "noMoreThenNWords": "{fieldname} Must not exceed {num} characters",
   "atLeastNCharAccount": "{fieldname} Please enter at least {num} digits",
-  "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 (<a href='http://www.gld.gov.hk/eng/services_6.htm' target= '_blank'>http://www.gld.gov.hk/eng/services_6.htm</a>)",
-  "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. ",
+  "applyTickStr":"I acknowledge and confirm that the information provided above is correct.  I have also read and understood the above “Points to note”.",
+  "applyTickUnderStr0":"Points to note:",
+  "applyTickUnderStr1":"<p>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. </p>",
+  "applyTickUnderStr2":"<p>For further details, please refer to the “<a href='/aboutUs' target= '_blank'>Notes on Publishing Public Notices in the Gazette through PNSPS</a>”.</p>",
+  "applyTickUnderStr3":"<p>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. </p>",
   "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.<br/>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.",
@@ -361,7 +362,7 @@
   "submitDateTo": "Submit Date (To)",
   "myRemarks": "Other Remark",
   "careOfRemark": "You can insert your client (e.g. individual or company name) here if you want to show your client's name on the payment receipt.",
-  "uploadApplicationFileRemark": "Only accept files in .docx and .xlsx formats, and submit each application in its own file.",
+  "uploadApplicationFileRemark": "Only accept files in .docx and .xlsx formats.  Each submission should be for one single public notice application.",
   "status": "Status",
   "viewDetail": "View details",
   "price": "Amount ($)",
@@ -471,7 +472,7 @@
 
   "payDnRemark": "Payment proof (e.g. ATM receipt, internet banking record) to be sent to [email protected] by {date}",
   "payNPGORemark" :"Payment to be completed at NPGO Collection Office by {date}",
-  "payOnlineRemark" :"Payment to be completed in this system by {date}",
+  "payOnlineRemark" :"Payment to be completed via this system by {date}",
 
   "before": "Before",
   "page": "Page",

src/translations/zh-CN.json

@@ -38,10 +38,11 @@
   "noMoreThen255Words": "不得超过 255 个字符",
   "noMoreThenNWords": "{fieldname}不得超过 {num} 个字符",
   "atLeastNCharAccount": "{fieldname}最少{num}个字符",
-  "applyTickStr":"我确认上述提供的资料无误。",
-  "applyTickUnderStr1":"1. 递交的公共启事必须正确，并且是最后的版本。在宪报上刊登公共启事一般是为符合香港法例或法院命令的规定。政府物流服务署署长有权拒收不适宜刊登的公共启事。 ",
-  "applyTickUnderStr2":"2. 有关刊登详情，请参阅宪报第6 号副刊或政府物流服务署网页 (<a href='http://www.gld.gov.hk/chi/services_6.htm' target= '_blank'>http://www.gld.gov.hk/chi/services_6.htm</a>) 所载的「于宪报刊登公共启事须知」。 ",
-  "applyTickUnderStr3":"3. 申请人在本申请表格内所提供的个人资料会供申请刊登公共启事及为承担法律责任用途。政府物流服务署可能会向其他政策局/ 部门披露你在此表格内填报的个人资料。申请人有权查阅及改正个人资料。如要查阅或改正个人资料，请向本署个人资料私隐主任提出，地址为香港北角渣华道333号北角政府合署十楼。 " ,
+  "applyTickStr":"我确认上述提供的资料正确无误，和已阅读并明白上述「注意事项」。",
+  "applyTickUnderStr0":"注意事项：",
+  "applyTickUnderStr1":"<p>递交的公共启事必须正确，并且是最后的版本。在宪报上刊登公共启事一般是为符合香港法例或法院命令的规定。政府物流服务署署长有权拒收不适宜刊登的公共启事。 </p>",
+  "applyTickUnderStr2":"<p>有关申请刊登详情，请参阅「<a href='/aboutUs' target= '_blank'>透过系统于宪报刊登公共启事须知</a>」。 </p>",
+  "applyTickUnderStr3":"<p>申请人在本申请表格内所提供的个人资料会供申请刊登公共启事及为承担法律责任用途。政府物流服务署可能会向其他政策局/ 部门披露你在此表格内填报的个人资料。申请人有权查阅及改正个人资料。如要查阅或改正个人资料，请向本署个人资料私隐主任提出，地址为香港北角渣华道333号北角政府合署十楼。 </p>" ,
   "submitted": "提交成功",
 
   "confirmingDealine": "确认校对截止日期",
@@ -393,7 +394,7 @@
   "submitDateTo": "提交日期 (到)",
   "myRemarks": "其他备注",
   "careOfRemark": "如果你想在付款收据上显示客户的名称，你可以在此处输入（例如个人或公司名称）。",
-  "uploadApplicationFileRemark": "只接受.docx及.xlsx档案格式 及一个档案只适用于一个申请。",
+  "uploadApplicationFileRemark": "只接受.docx及.xlsx档案格式。每个稿件档案只可申请单一公共启事。",
   "status": "状态",
   "viewDetail": "查看详情",
   "price": "金额 ($)",

src/translations/zh-HK.json

@@ -38,10 +38,11 @@
   "noMoreThen255Words": "不得超過 255 個字符",
   "noMoreThenNWords": "{fieldname}不得超過 {num} 個字符",
   "atLeastNCharAccount": "{fieldname}最少{num}個字符",
-  "applyTickStr":"我確認上述提供的資料無誤。",
-  "applyTickUnderStr1":"1. 遞交的公共啟事必須正確，並且是最後的版本。在憲報上刊登公共啟事一般是為符合香港法例或法院命令的規定。政府物流服務署署長有權拒收不適宜刊登的公共啟事。 ",
-  "applyTickUnderStr2":"2. 有關刊登詳情，請參閱憲報第 6 號副刊或政府物流服務署網頁 (<a href='http://www.gld.gov.hk/chi/services_6.htm' target='_blank'>http://www.gld.gov.hk/chi/services_6.htm</a>) 所載的「於憲報刊登公共啟事須知」。",
-  "applyTickUnderStr3":"3. 申請人在本申請表格內所提供的個人資料會供申請刊登公共啟事及為承擔法律責任用途。政府物流服務署可能會向其他政策局 / 部門披露你在此表格內填報的個人資料。申請人有權查閱及改正個人資料。如要查閱或改正個人資料，請向本署個人資料私隱主任提出，地址為香港北角渣華道333號北角政府合署十樓。 ",
+  "applyTickStr":"我確認上述提供的資料正確無誤，和已閱讀並明白上述“注意事項”。",
+  "applyTickUnderStr0":"注意事項：",
+  "applyTickUnderStr1":"<p>遞交的公共啟事必須正確，並且是最後的版本。在憲報上刊登公共啟事一般是為符合香港法例或法院命令的規定。政府物流服務署署長有權拒收不適宜刊登的公共啟事。 </p>",
+  "applyTickUnderStr2":"<p>有關申請刊登詳情，請參閱「<a href='/aboutUs' target= '_blank'>透過系統於憲報刊登公共啟事須知</a>」。</p>",
+  "applyTickUnderStr3":"<p>申請人在本申請表格內所提供的個人資料會供申請刊登公共啟事及為承擔法律責任用途。政府物流服務署可能會向其他政策局 / 部門披露你在此表格內填報的個人資料。申請人有權查閱及改正個人資料。如要查閱或改正個人資料，請向本署個人資料私隱主任提出，地址為香港北角渣華道333號北角政府合署十樓。 </p>",
   "submitted": "提交成功",
   
   "confirmingDealine": "確認校對截止日期",
@@ -394,7 +395,7 @@
   "submitDateTo": "提交日期 (到)",
   "myRemarks": "其他備註",
   "careOfRemark": "如果你想在付款收據上顯示客戶的名稱，你可以在此處輸入（例如個人或公司名稱）。",
-  "uploadApplicationFileRemark": "只接受.docx及.xlsx檔案格式 及一個檔案只適用於一個申請。",
+  "uploadApplicationFileRemark": "只接受.docx及.xlsx檔案格式。每個稿件檔案只可申請單一公共啟事。",
   "status": "狀態",
   "viewDetail": "查看詳情",
   "price": "金額 ($)",