update business form

src/pages/Payment/Search_Public/SearchForm.js

@@ -192,7 +192,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                             variant="contained"
                             type="submit"
                         >
-                            提交
+                            <FormattedMessage id="submit"/>
                         </Button>
                     </Grid>
                     </ThemeProvider>

src/pages/Proof/Reply_Public/index.js

@@ -94,7 +94,7 @@ const Index = () => {
                         </div>
                     </Grid>
                     <Grid item xs={12} width="100%">
-                        <Button title="返回" sx={{ mt: 2.5, ml: 3 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/proof/search") }}>
+                        <Button title={intl.formatMessage({id: 'back'})} sx={{ mt: 2.5, ml: 3 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/proof/search") }}>
                             <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
                         </Button>
                     </Grid>

src/pages/Proof/Search_Public/SearchForm.js

@@ -285,7 +285,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
                             variant="contained"
                             type="submit"
                         >
-                            提交
+                            <FormattedMessage id="submit"/>
                         </Button>
                     </Grid>
                     </ThemeProvider>

src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js

@@ -137,7 +137,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
                 </div>
             </Grid>
             <Grid item xs={12} width={{xs:"90%", sm:"90%", md:"60%", lg:"60%"}}>
-                <Button title="返回" sx={{ ml: 0, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/publicNotice") }}>
+                <Button title={intl.formatMessage({id: 'back'})} sx={{ ml: 0, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/publicNotice") }}>
                     <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
                 </Button>
             </Grid>

src/pages/PublicNotice/Details_Public/index.js

@@ -164,7 +164,7 @@ const DashboardDefault = () => {
         <Grid container direction="column" justifyContent="flex-start" alignItems="center">
           <Grid item xs={12} width="75%">
             <Stack direction="row">
-              <Button title="返回" sx={{ ml: 0, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/publicNotice") }}>
+              <Button title={intl.formatMessage({id: 'back'})} sx={{ ml: 0, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/publicNotice") }}>
                 <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
               </Button>
               <Typography ml={3} mt={3} variant="h4">{title}</Typography>

src/pages/authentication/BusRegister.js

@@ -23,7 +23,7 @@ const AuthWrapper = Loadable(lazy(() => import('./AuthWrapperCustom')));
 import axios from "axios";
 import { GET_USERNAME, POST_VERIFY_CAPTCHA } from "utils/ApiPathConst";
 import {useTheme} from "@emotion/react";
-import {useIntl} from "react-intl";
+import {FormattedMessage, useIntl} from "react-intl";
 // import CustomFormWizard from './auth-forms/BusCustomFormWizard';
 // import AuthWrapper from './AuthWrapperCustom';
 
@@ -118,7 +118,7 @@ const BusRegister = () => {
 
     const test = await handleCheckUsername()
     if (test) {
-      notifyActionError("此用戶登入名稱已被注冊，請使用其他用戶登入名稱")
+      notifyActionError(intl.formatMessage({id: 'usernameTaken'}))
     } else {
       const newActiveStep =
         isLastStep() && !allStepsCompleted()
@@ -213,7 +213,9 @@ const BusRegister = () => {
                 sx={{ mr: 1 }}
                 variant="h5"
               >
-                <Typography variant="h5">返回</Typography>
+                <Typography variant="h5">
+                  <FormattedMessage id="back"/>
+                </Typography>
               </Button>
             ) : (
               <Button
@@ -223,7 +225,9 @@ const BusRegister = () => {
                 sx={{ mr: 1 }}
                 variant="h5"
               >
-                <Typography variant="h5">返回</Typography>
+                <Typography variant="h5">
+                  <FormattedMessage id="back"/>
+                </Typography>
               </Button>
             )
             }
@@ -231,19 +235,25 @@ const BusRegister = () => {
             {activeStep === totalSteps() - 2 ?
               (
                 <Button variant="outlined" onClick={handleNext} sx={{ mr: 1 }}>
-                  <Typography variant="h5">提交</Typography>
+                  <Typography variant="h5">
+                    <FormattedMessage id="submit"/>
+                  </Typography>
                 </Button>
               ) : (activeStep === totalSteps() - 1 ?
                 (
                   <Button variant="outlined" color="inherit"
                     disabled={true} sx={{ mr: 1 }}>
-                    <Typography variant="h5">提交</Typography>
+                    <Typography variant="h5">
+                      <FormattedMessage id="submit"/>
+                    </Typography>
                   </Button>
                 ) :
                 (
                   // <Button disabled={updateValid} variant="outlined" onClick={handleNext} sx={{ mr: 1 }}>
                   <Button disabled={!updateValid} variant="outlined" onClick={handleNext} sx={{ mr: 1 }}>
-                    <Typography variant="h5">繼續</Typography>
+                    <Typography variant="h5">
+                      <FormattedMessage id="continue"/>
+                    </Typography>
                   </Button>
                 )
               )}

src/pages/authentication/IAmSmartRegister.js

@@ -22,7 +22,7 @@ import Loadable from 'components/Loadable';
 import { lazy } from 'react';
 import { notifyActionError } from 'utils/CommonFunction';
 import axios from "axios";
-import {useIntl} from "react-intl";
+import {FormattedMessage, useIntl} from "react-intl";
 const CustomFormWizard = Loadable(lazy(() => import('./auth-forms/IAmSmartFormWizard')));
 const AuthWrapper = Loadable(lazy(() => import('./AuthWrapperCustom')));
 // ================================|| REGISTER ||================================ //
@@ -110,7 +110,7 @@ const Register = () => {
     }
     const test = await handleCheckID()
     if (test) {
-      notifyActionError("此用戶已注冊，請返回登入頁面並進行登入流程。")
+      notifyActionError(intl.formatMessage({id: 'userRegistered'}))
     } else {
       const newActiveStep =
         isLastStep() && !allStepsCompleted()
@@ -192,7 +192,9 @@ const Register = () => {
                 onClick={handleBack}
                 sx={{ mr: 1 }}
               >
-                <Typography variant="h5">返回</Typography>
+                <Typography variant="h5">
+                  <FormattedMessage id="back"/>
+                </Typography>
               </Button>
             ) : (
               <Button
@@ -201,7 +203,9 @@ const Register = () => {
                 onClick={handleBack}
                 sx={{ mr: 1 }}
               >
-                <Typography variant="h5">返回</Typography>
+                <Typography variant="h5">
+                  <FormattedMessage id="back"/>
+                </Typography>
               </Button>
             )
             }
@@ -209,19 +213,25 @@ const Register = () => {
             {activeStep === totalSteps() - 2 ?
               (
                 <Button variant="outlined" onClick={handleNext} sx={{ mr: 1 }}>
-                  <Typography variant="h5">提交</Typography>
+                  <Typography variant="h5">
+                    <FormattedMessage id="submit"/>
+                  </Typography>
                 </Button>
               ) : (activeStep === totalSteps() - 1 ?
                 (
                   <Button variant="outlined" color="inherit"
                     disabled={true} sx={{ mr: 1 }}>
-                    <Typography variant="h5">提交</Typography>
+                    <Typography variant="h5">
+                      <FormattedMessage id="submit"/>
+                    </Typography>
                   </Button>
                 ) :
                 (
                   // <Button disabled={updateValid} variant="outlined" onClick={handleNext} sx={{ mr: 1 }}>
                   <Button disabled={!updateValid} variant="outlined" onClick={handleNext} sx={{ mr: 1 }}>
-                    <Typography variant="h5">繼續</Typography>
+                    <Typography variant="h5">
+                      <FormattedMessage id="continue"/>
+                    </Typography>
                   </Button>
                 )
               )}

src/pages/authentication/Register.js

@@ -23,7 +23,7 @@ import { lazy } from 'react';
 import { notifyActionError } from 'utils/CommonFunction';
 import axios from "axios";
 import {useTheme} from "@emotion/react";
-import {useIntl} from "react-intl";
+import {FormattedMessage, useIntl} from "react-intl";
 const CustomFormWizard = Loadable(lazy(() => import('./auth-forms/CustomFormWizard')));
 const AuthWrapper = Loadable(lazy(() => import('./AuthWrapperCustom')));
 // ================================|| REGISTER ||================================ //
@@ -120,7 +120,7 @@ const Register = () => {
 
     const test = await handleCheckUsername()
     if (test) {
-      notifyActionError("此用戶登入名稱已被注冊，請使用其他用戶登入名稱")
+      notifyActionError(intl.formatMessage({id: 'usernameTaken'}))
     } else {
       const newActiveStep =
         isLastStep() && !allStepsCompleted()
@@ -215,7 +215,9 @@ const Register = () => {
                 sx={{ mr: 1 }}
                 variant="h5"
               >
-                <Typography variant="h5">返回</Typography>
+                <Typography variant="h5">
+                  <FormattedMessage id="back"/>
+                </Typography>
               </Button>
             ) : (
               <Button
@@ -225,7 +227,9 @@ const Register = () => {
                 sx={{ mr: 1 }}
                 variant="h5"
               >
-                <Typography variant="h5">返回</Typography>
+                <Typography variant="h5">
+                  <FormattedMessage id="back"/>
+                </Typography>
               </Button>
             )
             }
@@ -233,19 +237,25 @@ const Register = () => {
             {activeStep === totalSteps() - 2 ?
               (
                 <Button variant="outlined" onClick={handleNext} sx={{ mr: 1 }}>
-                  <Typography variant="h5">提交</Typography>
+                  <Typography variant="h5">
+                    <FormattedMessage id="submit"/>
+                  </Typography>
                 </Button>
               ) : (activeStep === totalSteps() - 1 ?
                 (
                   <Button variant="outlined" color="inherit"
                     disabled={true} sx={{ mr: 1 }}>
-                    <Typography variant="h5">提交</Typography>
+                    <Typography variant="h5">
+                      <FormattedMessage id="submit"/>
+                    </Typography>
                   </Button>
                 ) :
                 (
                   // <Button disabled={updateValid} variant="outlined" onClick={handleNext} sx={{ mr: 1 }}>
                   <Button disabled={!updateValid} variant="outlined" onClick={handleNext} sx={{ mr: 1 }}>
-                    <Typography variant="h5">繼續</Typography>
+                    <Typography variant="h5">
+                      <FormattedMessage id="continue"/>
+                    </Typography>
                   </Button>
                 )
               )}

src/pages/authentication/Verify.js

@@ -16,6 +16,7 @@ const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingCompo
 const AuthWrapper = Loadable(lazy(() => import('./AuthWrapperCustom')));
 import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline';
 import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
+import {FormattedMessage} from "react-intl";
 
 export default function Verify() {
 
@@ -62,7 +63,9 @@ export default function Verify() {
                             <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
                                 <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
                                 <Typography display="inline" variant="h4">帳戶已成功驗證。</Typography>
-                                <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">返回登入頁面</Typography></Button>
+                                <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">
+                                    <FormattedMessage id="backToLogin"/>
+                                </Typography></Button>
                             </Stack>
                             :
                             // ERROR page
@@ -70,7 +73,9 @@ export default function Verify() {
                                 {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
                                 <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
                                 <Typography display="inline" variant="h4">驗證失敗，請聯絡相關的系統管理員協助。</Typography>
-                                <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">返回登入頁面</Typography></Button>
+                                <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">
+                                    <FormattedMessage id="backToLogin"/>
+                                </Typography></Button>
                             </Stack>
                         }
                     </Grid>

src/pages/authentication/auth-forms/BusCustomFormWizard.js

@@ -188,18 +188,17 @@ const BusCustomFormWizard = (props) => {
         if (data.username !== "" &&
             data.password !== "" &&
             data.confirmPassword !== "" &&
-            data.password == data.confirmPassword &&
-            // (data.enCompanyName !=="" || selectedAddress5 ==="內地")&&
+            data.password === data.confirmPassword &&
             (data.chCompanyName !== "" || data.enCompanyName !== "") &&
             data.enName !== "" &&
             data.chName !== "" &&
             data.address1 !== "" &&
             data.email !== "" &&
             data.emailConfirm !== "" &&
-            data.email == data.emailConfirm &&
+            data.email === data.emailConfirm &&
             data.phone !== "" &&
             data.phoneCountryCode !== "" &&
-            termsAndConAccept == true &&
+            termsAndConAccept === true &&
             fileList.length !== 0 &&
             data.captchaField &&
             data.brNo !== "" &&
@@ -253,7 +252,7 @@ const BusCustomFormWizard = (props) => {
     }, [updateRows]);
 
     const handleBrNo = (brNo) => {
-        var brNo_pattern = /[0-9]{8}-[0-9]{3}-(0[1-9]|1[012])-[0-9]{2}-[0-9A-Z]{1}/
+        var brNo_pattern = /[0-9]{8}/
         if (brNo !== undefined) {
             if (brNo.match(brNo_pattern)) {
                 return true
@@ -631,7 +630,7 @@ const BusCustomFormWizard = (props) => {
                                         )}
                                         {checkUsername && (
                                             <FormHelperText error id="helper-text-username-signup">
-                                                此用戶登入名稱已被注冊，請使用其他用戶登入名稱
+                                                <FormattedMessage id="usernameTaken"/>
                                             </FormHelperText>
                                         )}
                                     </Stack>
@@ -752,10 +751,10 @@ const BusCustomFormWizard = (props) => {
                                             <Grid container spacing={2} alignItems="center">
                                                 <Grid item sx={{mt:1}}>
                                                     <Typography variant="subtitle1">
-                                                        •至少8個字元，字元越多越好 <br />
-                                                        •字母和數字的混合<br />
-                                                        •英文字母大寫與小寫的混合<br />
-                                                        •至少包含一個特殊符號，例如，@ # ?
+                                                        •<FormattedMessage id="pwRemark1"/> <br />
+                                                        •<FormattedMessage id="pwRemark2"/><br />
+                                                        •<FormattedMessage id="pwRemark3"/><br />
+                                                        •<FormattedMessage id="pwRemark4"/>
                                                     </Typography>
                                                 </Grid>
                                             </Grid>
@@ -1490,7 +1489,7 @@ const BusCustomFormWizard = (props) => {
                                 <Grid item xs={12} md={12} >
                                     <Stack spacing={1}>
                                         <Typography variant="pnspsFormHeader" color={theme.palette.grey[600]}>
-                                            商業登記證
+                                            <FormattedMessage id="businessRegCert"/>
                                         </Typography>
                                     </Stack>
                                 </Grid>
@@ -1566,7 +1565,7 @@ const BusCustomFormWizard = (props) => {
                                 <Grid item xs={12} md={12}>
                                     <Stack spacing={1} direction="row">
                                         <Typography variant="pnspsFormHeader" color={theme.palette.grey[600]}>
-                                            英文名稱:
+                                            <FormattedMessage id="userEnglishName"/>
                                         </Typography>
                                         <Typography variant="pnspsFormHeader" id="preview-enName-signup">
                                             {formik.values.enName}
@@ -1607,7 +1606,9 @@ const BusCustomFormWizard = (props) => {
                                     <Grid container>
                                         <Grid item xs={12} md={12}>
                                             <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
-                                                <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>身份證明文件</Typography>
+                                                <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
+                                                    <FormattedMessage id="userIdDoc"/>
+                                                </Typography>
                                                 {fileList != null ?
                                                     <PreviewUploadFileTable key="previewTable" recordList={fileListData} /> : null}
                                             </Stack>
@@ -1628,11 +1629,15 @@ const BusCustomFormWizard = (props) => {
                                     // SUCCESS page
                                     <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
                                         <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
-                                        <Typography display="inline" variant="h4">帳戶申請已成功提交。</Typography>
+                                        <Typography display="inline" variant="h4">
+                                            <FormattedMessage id="registerSubmitted"/>
+                                        </Typography>
                                         <Typography display="inline" variant="h4">
                                             <FormattedMessage id="emailSent"/>
                                         </Typography>
-                                        <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">返回登入頁面</Typography></Button>
+                                        <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">
+                                            <FormattedMessage id="backToLogin"/>
+                                        </Typography></Button>
                                     </Stack>
                                     :
                                     // ERROR page
@@ -1640,7 +1645,9 @@ const BusCustomFormWizard = (props) => {
                                         {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
                                         <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
                                         <Typography display="inline" variant="h4">申請失敗，請稍後嘗試</Typography>
-                                        <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">返回登入頁面</Typography></Button>
+                                        <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">
+                                            <FormattedMessage id="backToLogin"/>
+                                        </Typography></Button>
                                     </Stack>
                                 }
                             </Grid>

src/pages/authentication/auth-forms/CustomFormWizard.js

@@ -725,7 +725,7 @@ const CustomFormWizard = (props) => {
                                         )}
                                         {checkUsername && (
                                             <FormHelperText error id="helper-text-username-signup">
-                                                此用戶登入名稱已被注冊，請使用其他用戶登入名稱
+                                                <FormattedMessage id="usernameTaken"/>
                                             </FormHelperText>
                                         )}
                                     </Stack>
@@ -871,7 +871,7 @@ const CustomFormWizard = (props) => {
                                         <Stack spacing={1}>
                                             <InputLabel htmlFor="idDocType-signup">
                                                 <Typography variant="pnspsFormHeader">
-                                                    身份證明文件
+                                                    <FormattedMessage id="userIdDoc"/>
                                                     <span style={{ color: '#f10000' }}>*</span>
                                                 </Typography>
                                             </InputLabel>
@@ -1461,7 +1461,9 @@ const CustomFormWizard = (props) => {
                                     <Grid container>
                                         <Grid item xs={12} md={12}>
                                             <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
-                                                <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>身份證明文件<span style={{ color: '#f10000' }}>*</span></Typography>
+                                                <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
+                                                    <FormattedMessage id="userIdDoc"/>
+                                                    <span style={{ color: '#f10000' }}>*</span></Typography>
                                                 <Typography display="inline" variant="subtitle1" sx={{ color: 'primary.primary' }}>請上傳你的 有效身份證明文件 的數碼檔案，以驗證你的身份。</Typography>
                                                 <Typography display="inline" variant="subtitle1" sx={{ color: 'primary.primary' }}>如: 香港身份證; 護照; 中國內地身份證; 專業執業証書等</Typography>
                                                 <Stack mt={1} direction="row" justifyContent="flex-start" alignItems="center" spacing={2}>
@@ -1636,7 +1638,7 @@ const CustomFormWizard = (props) => {
                                 <Grid item xs={12} md={12} >
                                     <Stack spacing={1}>
                                         <Typography variant="pnspsFormHeader" color={theme.palette.grey[600]}>
-                                            身份證明文件
+                                            <FormattedMessage id="userIdDoc"/>
                                         </Typography>
                                     </Stack>
                                 </Grid>
@@ -1761,7 +1763,9 @@ const CustomFormWizard = (props) => {
                                     <Grid container>
                                         <Grid item xs={12} md={12}>
                                             <Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
-                                                <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>身份證明文件</Typography>
+                                                <Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
+                                                    <FormattedMessage id="userIdDoc"/>
+                                                </Typography>
                                                 {fileList != null ?
                                                     <PreviewUploadFileTable key="previewTable" recordList={fileListData} /> : null}
                                             </Stack>
@@ -1782,11 +1786,15 @@ const CustomFormWizard = (props) => {
                                     // SUCCESS page
                                     <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
                                         <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
-                                        <Typography display="inline" variant="h4">帳戶申請已成功提交。</Typography>
+                                        <Typography display="inline" variant="h4">
+                                            <FormattedMessage id="registerSubmitted"/>
+                                        </Typography>
                                         <Typography display="inline" variant="h4">
                                             <FormattedMessage id="emailSent"/>
                                         </Typography>
-                                        <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">返回登入頁面</Typography></Button>
+                                        <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">
+                                            <FormattedMessage id="backToLogin"/>
+                                        </Typography></Button>
                                     </Stack>
                                     :
                                     // ERROR page
@@ -1794,7 +1802,9 @@ const CustomFormWizard = (props) => {
                                         {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
                                         <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
                                         <Typography display="inline" variant="h4">申請失敗，請稍後嘗試</Typography>
-                                        <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">返回登入頁面</Typography></Button>
+                                        <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">
+                                            <FormattedMessage id="backToLogin"/>
+                                        </Typography></Button>
                                     </Stack>
                                 }
                             </Grid>

src/pages/authentication/auth-forms/IAmSmartFormWizard.js

@@ -912,7 +912,7 @@ const CustomFormWizard = (props) => {
                                 <Grid item xs={12} md={12} >
                                     <Stack spacing={1}>
                                         <Typography variant="h5" color={theme.palette.grey[600]}>
-                                            身份證明文件
+                                            <FormattedMessage id="userIdDoc"/>
                                         </Typography>
                                         <Typography variant="h5" name="preview-idDocType">
                                             {formik.values.idNo+"("+formik.values.checkDigit+")"}
@@ -1029,11 +1029,15 @@ const CustomFormWizard = (props) => {
                                     // SUCCESS page
                                     <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
                                         <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
-                                        <Typography display="inline" variant="h4">帳戶申請已成功提交。</Typography>
+                                        <Typography display="inline" variant="h4">
+                                            <FormattedMessage id="registerSubmitted"/>
+                                        </Typography>
                                         <Typography display="inline" variant="h4">
                                             <FormattedMessage id="emailSent"/>
                                         </Typography>
-                                        <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">返回登入頁面</Typography></Button>
+                                        <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">
+                                            <FormattedMessage id="backToLogin"/>
+                                        </Typography></Button>
                                     </Stack>
                                     :
                                     // ERROR page
@@ -1041,7 +1045,9 @@ const CustomFormWizard = (props) => {
                                         {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
                                         <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
                                         <Typography display="inline" variant="h4">申請失敗，請稍後嘗試</Typography>
-                                        <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">返回登入頁面</Typography></Button>
+                                        <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">
+                                            <FormattedMessage id="backToLogin"/>
+                                        </Typography></Button>
                                     </Stack>
                                 }
                             </Grid>

src/translations/en.json

@@ -12,6 +12,11 @@
   "registerTitle3": "Publisher now",
   "registerSubTitle": "Only takes 4-5 minutes",
   "or": "or",
+  "back": "Back",
+  "continue": "Continue",
+  "submit": "Submit",
+  "backToLogin": "Return to login page",
+  "registerSubmitted": "Account application submitted successfully.",
 
   "mainPage": "Main Page",
   "myPublicNotice": "My Public Notice",
@@ -32,6 +37,8 @@
   "forgotUserPassword": "Forgot Password",
   "learnMore": "Learn More",
   "createOrReActivate": "Create/reactivate account",
+  "usernameTaken": "This user login name has been registered, please use another user login name",
+  "userRegistered": "This user has already registered. Please return to the login page and proceed with the login process.",
 
   "user": "User",
   "personalUser": "Personal user",
@@ -65,6 +72,7 @@
   "requireVerify": "Please enter verification",
   "dialingCode": "Global Code",
   "userFaxNumber": "Fax number",
+  "userIdDoc": "Identification document",
   "userIDNo": "ID Card Number",
   "userEmailAddress": "Email Address",
   "userPhoneNumber": "Mobile Phone Number",
@@ -84,7 +92,21 @@
   "pleaseConfirmPassword": "Please confirm password",
   "pleaseEnterOrgOrCompName": "Please enter the English/Chinese name of the organisation/company",
   "sameAsBusinessRegistrationCert": "Same as Business Registration Certificate",
+  "businessRegCert": "Business Registration Certificate",
   "businessRegCertNumber": "Business Reg Cert Number",
+  "businessRegCertAndDoc":"Business Registration Certificate and other documents",
+  "pleaseUploadDoc": "Please upload a digital file of your valid business registration certificate and other documents to verify your identity.",
+  "uploadFile": "Upload business registration certificate and other documents",
+  "fileName": "File name",
+  "fileSize": "File size",
+  "fileSizeWarning": "Upload file size should be <10MB",
+  "noFile": "No file uploaded",
+  "termsAndCondition": "Terms and Conditions",
+  "acceptTerms": "I accept",
+  "rejectTerms": "I do not accept",
+  "verify": "Verify",
+  "validVerify": "Please enter valid verification",
+  "autoLogout": "Login verification has expired, please log in again.",
   "pleaseFillInBusinessRegCertNumber": "Please fill in Business Registration Certificate Number",
   "pleaseFillInValidBusinessRegCertNumber": "Please fill in valid Business Registration Certificate Number",
   "businessRegCertValidityDate": "Business Reg Cert validity date",
@@ -94,12 +116,33 @@
   "addressLine2": "Second line",
   "addressLine3": "Third line",
   "region": "Region (only applicable to Hong Kong)",
+  "validateAddressLine1": "Please enter the first line of address",
+  "validateAddressLine2": "Please enter the second line of address",
+  "validateAddressLine3": "Please enter the third line of address",
+  "validateEngOrChiName": "Please enter the English or Chinese name",
+  "notContainSpecialChar": "Does not contain special characters $/^/*/(/)",
+  "samePassword": "Please enter the same password",
+  "atLeast8CharPassword": "Please enter a password of at least 8 digits",
+  "atLeast1SpecialChar": "Please include at least 1 special character",
+  "atLeast1Number": "Please include at least 1 number",
+  "atLeastOneCapLetter": "Please include at least 1 capital letter",
+  "atLeastOneSmallLetter": "Please include at least 1 lowercase letter",
+  "noSpacePassword": "Password does not contain spaces",
+  "noSpaceAccount": "User name does not contain spaces",
+  "noSpecialCharAccount": "User name does not contain special characters",
+  "atLeast6CharAccount": "User name must be at least 6 characters",
+  "requireUsername": "Please enter user name",
+  "requirePassword": "Please enter password",
   "regionOrCountry": "Country/Region",
   "hongKong": "Hong Kong",
   "mainland": "Mainland China",
   "macau": "Macau",
   "yourContact": "Your Contact Information",
 
+  "pwRemark1": "At least 8 characters, the more characters the better",
+  "pwRemark2": "A mix of letters and numbers",
+  "pwRemark3": "A mix of uppercase and lowercase English letters",
+  "pwRemark4": "Contains at least one special symbol, for example, @ # ?",
   "pwWeak": "Weak",
   "pwNormal": "Normal",
   "pwGood": "Good",

src/translations/zh-CN.json

@@ -12,6 +12,11 @@
   "registerTitle3": "用户",
   "registerSubTitle": "只需4-5分钟",
   "or": "或",
+  "back": "返回",
+  "continue": "继续",
+  "submit": "提交",
+  "backToLogin": "返回登入页面",
+  "registerSubmitted": "帐户申请已成功提交。",
 
   "mainPage": "主页",
   "myPublicNotice": "我的公共启事",
@@ -32,6 +37,8 @@
   "forgotUserPassword": "忘记密码",
   "learnMore": "了解更多",
   "createOrReActivate": "建立/重新启动帐户",
+  "usernameTaken": "此用户登入名称已被注册，请使用其他用户登入名称",
+  "userRegistered": "此用户已注册，请返回登入页面并进行登入流程。",
 
   "user": "用戶",
   "personalUser": "個人用戶",
@@ -65,6 +72,7 @@
   "requireVerify": "请输入验证",
   "dialingCode": "国际区号",
   "userFaxNumber": "传真号码",
+  "userIdDoc": "身份证明文件",
   "userIDNo": "身份证号码",
   "userEmailAddress": "电邮地址",
   "userPhoneNumber": "手机号码",
@@ -84,6 +92,7 @@
   "pleaseConfirmPassword": "请确认密码",
   "pleaseEnterOrgOrCompName": "请输入机构/公司英文名称或中文名称",
   "sameAsBusinessRegistrationCert": "与商业登记证相同",
+  "businessRegCert": "商业登记证",
   "businessRegCertNumber": "商业登记证号码",
   "businessRegCertAndDoc":"商业登记证及其他文件",
   "pleaseUploadDoc": "请上传你的 有效商业登记证及其他文件 的数码档案，以验证你的身份。",
@@ -130,6 +139,10 @@
   "macau": "澳门",
   "yourContact": "你的联络资料",
 
+  "pwRemark1": "至少8个字元，字元越多越好",
+  "pwRemark2": "字母和数字的混合",
+  "pwRemark3": "英文字母大写与小写的混合",
+  "pwRemark4": "至少包含一个特殊符号，例如，@ # ?",
   "pwWeak": "弱",
   "pwNormal": "普通",
   "pwGood": "良好",

src/translations/zh-HK.json

@@ -12,6 +12,11 @@
   "registerTitle3": "用戶",
   "registerSubTitle": "只需4-5分鐘",
   "or": "或",
+  "back": "返回",
+  "continue": "繼續",
+  "submit": "提交",
+  "backToLogin": "返回登入頁面",
+  "registerSubmitted": "帳戶申請已成功提交。",
 
   "mainPage": "主頁",
   "myPublicNotice": "我的公共啟事",
@@ -32,6 +37,8 @@
   "forgotUserPassword": "忘記密碼",
   "learnMore": "了解更多",
   "createOrReActivate": "建立/重新啟動帳戶",
+  "usernameTaken": "此用戶登入名稱已被注冊，請使用其他用戶登入名稱",
+  "userRegistered": "此用戶已注冊，請返回登入頁面並進行登入流程。",
 
   "user": "用戶",
   "personalUser": "個人用戶",
@@ -65,6 +72,7 @@
   "requireVerify": "請輸入驗證",
   "dialingCode": "國際區號",
   "userFaxNumber": "傳真號碼",
+  "userIdDoc": "身份證明文件",
   "userIDNo": "身份證號碼",
   "userEmailAddress": "電郵地址",
   "userPhoneNumber": "手機號碼",
@@ -84,6 +92,7 @@
   "pleaseConfirmPassword": "請確認密碼",
   "pleaseEnterOrgOrCompName": "請輸入機構/公司英文名稱或中文名稱",
   "sameAsBusinessRegistrationCert": "與商業登記證相同",
+  "businessRegCert": "商業登記證",
   "businessRegCertNumber": "商業登記證號碼",
   "businessRegCertAndDoc":"商業登記證及其他文件",
   "pleaseUploadDoc": "請上傳你的 有效商業登記證及其他文件 的數碼檔案，以驗證你的身份。",
@@ -130,6 +139,10 @@
   "macau": "澳門",
   "yourContact": "你的聯絡資料",
 
+  "pwRemark1": "至少8個字元，字元越多越好",
+  "pwRemark2": "字母和數字的混合",
+  "pwRemark3": "英文字母大寫與小寫的混合",
+  "pwRemark4": "至少包含一個特殊符號，例如，@ # ?",
   "pwWeak": "弱",
   "pwNormal": "普通",
   "pwGood": "良好",