From a94c53fb78834d16360e4df4a67e4b490332b97d Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Wed, 10 Jan 2024 18:14:21 +0800 Subject: [PATCH] update i18n --- .../DemandNote/Search_Public/SearchForm.js | 5 +- .../DetailPage/OrganizationCard.js | 4 +- .../OrganizationCard_loadFromUser.js | 5 +- src/pages/Payment/Search_Public/SearchForm.js | 3 +- src/pages/Proof/Search_Public/SearchForm.js | 3 +- .../ListPanel/SearchPublicNoticeForm.js | 5 +- .../UserInformationCard_Organization.js | 5 +- src/pages/authentication/BusRegister.js | 10 ++- src/pages/authentication/IAmSmartRegister.js | 8 +- src/pages/authentication/Register.js | 10 ++- .../auth-forms/BusCustomFormWizard.js | 79 +++++++++++-------- .../auth-forms/CustomFormWizard.js | 47 +++++++---- .../auth-forms/IAmSmartFormWizard.js | 27 ++++--- src/translations/en.json | 25 ++++++ src/translations/zh-CN.json | 25 ++++++ src/translations/zh-HK.json | 25 ++++++ 16 files changed, 213 insertions(+), 73 deletions(-) diff --git a/src/pages/DemandNote/Search_Public/SearchForm.js b/src/pages/DemandNote/Search_Public/SearchForm.js index a963e8c..0044f88 100644 --- a/src/pages/DemandNote/Search_Public/SearchForm.js +++ b/src/pages/DemandNote/Search_Public/SearchForm.js @@ -12,6 +12,7 @@ import * as React from "react"; import * as ComboData from "utils/ComboData"; import * as DateUtils from "utils/DateUtils"; import * as FormatUtils from "utils/FormatUtils"; +import {FormattedMessage} from "react-intl"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -215,7 +216,9 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData textTransform: 'capitalize', alignItems: 'end' }}> - 重置 + + + diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js index 0509884..3768d63 100644 --- a/src/pages/Organization/DetailPage/OrganizationCard.js +++ b/src/pages/Organization/DetailPage/OrganizationCard.js @@ -56,8 +56,8 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { tel_countryCode: yup.string().min(3, displayErrorMsg('請輸入國際區號')), phoneNumber: yup.string().min(8, displayErrorMsg('請輸入有效聯絡電話')).required(displayErrorMsg('請輸入聯絡電話')), faxNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).nullable(), - brExpiryDate: yup.string().min(8).required(displayErrorMsg('請輸入商業登記證有效日期')), - brNo: yup.string().required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(`請輸入有效商業登記證號碼`)), function (value) { + brExpiryDate: yup.string().min(8).required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertValidityDate'}))), + brNo: yup.string().required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertNumber'}))).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInValidBusinessRegCertNumber'}))), function (value) { var brNo_pattern = /[0-9]{8}/ if (value !== undefined) { if (value.match(brNo_pattern)) { diff --git a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js index 9f21937..9c5d49f 100644 --- a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js +++ b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js @@ -54,8 +54,9 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => { tel_countryCode: yup.string().min(3, displayErrorMsg("請輸入國際區號")), phoneNumber: yup.string().min(8, displayErrorMsg('請輸入有效聯絡電話')).required(displayErrorMsg('請輸入聯絡電話')), faxNumber: yup.string().min(8).nullable(), - brExpiryDate: yup.string().min(8).required(displayErrorMsg('請輸入商業登記證有效日期')), - brNo: yup.string().max(8).required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234)`)), function (value) { + brExpiryDate: yup.string().min(8).required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertValidityDate'}))), + brNo: yup.string().max(8).required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertNumber'}))) + .test('checkBrNoFormat', displayErrorMsg(displayErrorMsg(`${intl.formatMessage({id: 'pleaseFillInValidBusinessRegCertNumber'})} (e.g. 12341234)`)), function (value) { var brNo_pattern = /[0-9]{8}/ if (value !== undefined) { if (value.size==8 && value.match(brNo_pattern)) { diff --git a/src/pages/Payment/Search_Public/SearchForm.js b/src/pages/Payment/Search_Public/SearchForm.js index ab2d8dd..dbcac21 100644 --- a/src/pages/Payment/Search_Public/SearchForm.js +++ b/src/pages/Payment/Search_Public/SearchForm.js @@ -13,6 +13,7 @@ import * as DateUtils from "utils/DateUtils"; import * as ComboData from "utils/ComboData"; import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; import {ThemeProvider} from "@emotion/react"; +import {FormattedMessage} from "react-intl"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -182,7 +183,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { variant="contained" onClick={resetForm} > - 重置 + diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js index cf9dfe9..2dbe8c9 100644 --- a/src/pages/Proof/Search_Public/SearchForm.js +++ b/src/pages/Proof/Search_Public/SearchForm.js @@ -14,6 +14,7 @@ import * as DateUtils from "utils/DateUtils"; import * as FormatUtils from "utils/FormatUtils"; import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; import {ThemeProvider} from "@emotion/react"; +import {FormattedMessage} from "react-intl"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -275,7 +276,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData variant="contained" onClick={resetForm} > - 重置 + diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js index 7244e94..3f50227 100644 --- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js +++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js @@ -15,6 +15,7 @@ import { } from "utils/Utils"; import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; import {ThemeProvider} from "@emotion/react"; +import {FormattedMessage} from "react-intl"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -212,7 +213,9 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { variant="contained" onClick={resetForm} > - 重置 + + + diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js index 0c4e812..7342f4d 100644 --- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js +++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js @@ -58,8 +58,9 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => fax_countryCode: yup.string().min(3, displayErrorMsg('請輸入3位數字')).nullable(), phoneNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).required(displayErrorMsg('請輸入聯絡電話')), faxNumber: yup.string().min(8, displayErrorMsg('請輸入8位數字')).nullable(), - brExpiryDate: yup.string().min(8, displayErrorMsg('請輸入商業登記證有效日期')), - brNo: yup.string().max(8).required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234)`), function (value) { + brExpiryDate: yup.string().min(8, displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertValidityDate'}))), + brNo: yup.string().max(8).required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertNumber'}))) + .test('checkBrNoFormat', displayErrorMsg(`${intl.formatMessage({id: 'pleaseFillInValidBusinessRegCertNumber'})} (e.g. 12341234)`), function (value) { var brNo_pattern = /[0-9]{8}/ if (value !== undefined) { if (value.match(brNo_pattern)) { diff --git a/src/pages/authentication/BusRegister.js b/src/pages/authentication/BusRegister.js index 66061b7..7e72529 100644 --- a/src/pages/authentication/BusRegister.js +++ b/src/pages/authentication/BusRegister.js @@ -23,12 +23,11 @@ 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 CustomFormWizard from './auth-forms/BusCustomFormWizard'; // import AuthWrapper from './AuthWrapperCustom'; // ================================|| REGISTER ||================================ // -const steps = ['個人資料', '預覽', '完成提交']; - const BusRegister = () => { const [activeStep, setActiveStep] = useState(0); const [completed, setCompleted] = useState([false]); @@ -37,6 +36,13 @@ const BusRegister = () => { const [base64Url, setBase64Url] = useState("") const [checkCode, setCheckCode] = useState("") const theme = useTheme(); + const intl = useIntl(); + const steps = [ + intl.formatMessage({id: 'personalInformation'}), + intl.formatMessage({id: 'preview'}), + intl.formatMessage({id: 'finishSubmission'}) + ]; + const stepStyle = { [theme.breakpoints.up('lg')]: { width: '40%', diff --git a/src/pages/authentication/IAmSmartRegister.js b/src/pages/authentication/IAmSmartRegister.js index 2e4c7be..49c0960 100644 --- a/src/pages/authentication/IAmSmartRegister.js +++ b/src/pages/authentication/IAmSmartRegister.js @@ -22,6 +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"; const CustomFormWizard = Loadable(lazy(() => import('./auth-forms/IAmSmartFormWizard'))); const AuthWrapper = Loadable(lazy(() => import('./AuthWrapperCustom'))); // ================================|| REGISTER ||================================ // @@ -49,7 +50,6 @@ const stepStyle = { } } } -const steps = ['個人資料', '預覽', '完成提交']; const Register = () => { const [activeStep, setActiveStep] = useState(0); @@ -58,6 +58,12 @@ const Register = () => { const [base64Url, setBase64Url] = useState("") const [checkCode, setCheckCode] = useState("") const [idNo, setIdNo] = useState(""); + const intl = useIntl(); + const steps = [ + intl.formatMessage({id: 'personalInformation'}), + intl.formatMessage({id: 'preview'}), + intl.formatMessage({id: 'finishSubmission'}) + ]; const totalSteps = () => { return steps.length; diff --git a/src/pages/authentication/Register.js b/src/pages/authentication/Register.js index f8c17ed..c298f86 100644 --- a/src/pages/authentication/Register.js +++ b/src/pages/authentication/Register.js @@ -23,12 +23,11 @@ import { lazy } from 'react'; import { notifyActionError } from 'utils/CommonFunction'; import axios from "axios"; import {useTheme} from "@emotion/react"; +import {useIntl} from "react-intl"; const CustomFormWizard = Loadable(lazy(() => import('./auth-forms/CustomFormWizard'))); const AuthWrapper = Loadable(lazy(() => import('./AuthWrapperCustom'))); // ================================|| REGISTER ||================================ // -const steps = ['個人資料', '預覽', '完成提交']; - const Register = () => { const [activeStep, setActiveStep] = useState(0); const [completed, setCompleted] = useState([false]); @@ -37,6 +36,13 @@ const Register = () => { const [base64Url, setBase64Url] = useState("") const [checkCode, setCheckCode] = useState("") const theme = useTheme(); + const intl = useIntl(); + const steps = [ + intl.formatMessage({id: 'personalInformation'}), + intl.formatMessage({id: 'preview'}), + intl.formatMessage({id: 'finishSubmission'}) + ]; + const stepStyle = { [theme.breakpoints.up('lg')]: { width: '40%', diff --git a/src/pages/authentication/auth-forms/BusCustomFormWizard.js b/src/pages/authentication/auth-forms/BusCustomFormWizard.js index 299ace5..ec29456 100644 --- a/src/pages/authentication/auth-forms/BusCustomFormWizard.js +++ b/src/pages/authentication/auth-forms/BusCustomFormWizard.js @@ -505,7 +505,7 @@ const BusCustomFormWizard = (props) => { .matches(/^(?=.*[A-Z])/, { message: displayErrorMsg('請包括最少1個大寫字母') }) .matches(/^(?=.*[0-9])/, { message: displayErrorMsg('請包括最少1個數字') }) .matches(/^(?=.*[!@#%&])/, { message: displayErrorMsg('請包括最少1個特殊字符') }), - confirmPassword: yup.string().min(8, displayErrorMsg('請最少輸入8位密碼')).required(displayErrorMsg('請確認密碼')).oneOf([yup.ref('password'), null], displayErrorMsg('請輸入相同密碼')), + confirmPassword: yup.string().min(8, displayErrorMsg('請最少輸入8位密碼')).required(displayErrorMsg(intl.formatMessage({id: 'pleaseConfirmPassword'}))).oneOf([yup.ref('password'), null], displayErrorMsg('請輸入相同密碼')), enName: yup.string().max(255).required(displayErrorMsg('請輸入英文姓名')), enCompanyName: yup.string().matches(/^[^$^*()]+$/, { message: displayErrorMsg('No special characters $/^/*/(/)') }).when('chCompanyName', { is: (chCompanyName) => !chCompanyName || chCompanyName.length === 0, @@ -525,8 +525,10 @@ const BusCustomFormWizard = (props) => { faxCountryCode: yup.string().min(2, displayErrorMsg('請輸入最少2位數字')), phone: yup.string().min(8, displayErrorMsg('請輸入最少8位數字')).required(displayErrorMsg('請輸入聯絡電話')), fax: yup.string().min(8, displayErrorMsg('請輸入最少8位數字')), - brExpiryDate: yup.date().min(new Date().toISOString().split("T")[0], displayErrorMsg('請輸入商業登記證有效日期')).max("2099-12-31", displayErrorMsg('請輸入商業登記證有效日期')).required(displayErrorMsg('請輸入商業登記證有效日期')), - brNo: yup.string().max(8).required(displayErrorMsg('請輸入商業登記證號碼')).test('checkBrNoFormat', displayErrorMsg(`請輸入有效商業登記證號碼 (e.g. 12341234)`), function (value) { + brExpiryDate: yup.date().min(new Date().toISOString().split("T")[0], displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertValidityDate'}))) + .max("2099-12-31", displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertValidityDate'}))). + required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertValidityDate'}))), + brNo: yup.string().max(8).required(displayErrorMsg(intl.formatMessage({id: 'pleaseFillInBusinessRegCertNumber'}))).test('checkBrNoFormat', displayErrorMsg(`${intl.formatMessage({id: 'pleaseFillInValidBusinessRegCertNumber'})} (e.g. 12341234)`), function (value) { // 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 (value !== undefined) { @@ -565,14 +567,20 @@ const BusCustomFormWizard = (props) => { - +
- 註有*的項目必須輸入資料 - 你的登入資料 + + + + + + {/* Already have an account? */} @@ -697,7 +705,7 @@ const BusCustomFormWizard = (props) => { - 確認密碼 + * @@ -731,7 +739,7 @@ const BusCustomFormWizard = (props) => { } - placeholder="確認密碼" + placeholder={intl.formatMessage({id: 'confirmPassword'})} fullWidth error={Boolean(formik.touched.confirmPassword && formik.errors.confirmPassword)} /> @@ -756,7 +764,9 @@ const BusCustomFormWizard = (props) => { - 你的機構/公司資料 + + + {/* Already have an account? */} @@ -765,15 +775,14 @@ const BusCustomFormWizard = (props) => { - •請輸入機構/公司英文名稱或中文名稱
- •Please enter the English/Chinese name of the organisation/company + • - 機構/公司英文名稱 + { value={formik.values.enCompanyName} name="enCompanyName" onChange={formik.handleChange} - placeholder="與商業登記證相同" + placeholder={intl.formatMessage({id: 'sameAsBusinessRegistrationCert'})} fullWidth error={Boolean(formik.touched.enCompanyName && formik.errors.enCompanyName && selectedAddress5 !== "內地")} onBlur={formik.handleBlur} @@ -805,7 +814,7 @@ const BusCustomFormWizard = (props) => { - 機構/公司中文名稱 + { value={formik.values.chCompanyName.trim()} name="chCompanyName" onChange={formik.handleChange} - placeholder="與商業登記證相同" + placeholder={intl.formatMessage({id: 'sameAsBusinessRegistrationCert'})} onBlur={formik.handleBlur} inputProps={{ onKeyDown: (e) => { @@ -837,7 +846,7 @@ const BusCustomFormWizard = (props) => { - 商業登記證號碼 (e.g. 12341234) + (e.g. 12341234) * @@ -850,7 +859,7 @@ const BusCustomFormWizard = (props) => { name="brNo" onChange={formik.handleChange} onBlur={formik.handleBlur} - placeholder="與商業登記證相同" + placeholder={intl.formatMessage({id: 'sameAsBusinessRegistrationCert'})} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -870,7 +879,7 @@ const BusCustomFormWizard = (props) => { - 商業登記證有效日期 + * @@ -883,7 +892,7 @@ const BusCustomFormWizard = (props) => { name="brExpiryDate" onChange={formik.handleChange} onBlur={formik.handleBlur} - placeholder="與商業登記證相同" + placeholder={intl.formatMessage({id: 'sameAsBusinessRegistrationCert'})} inputProps={{ max: "2099-12-31", min: new Date().toISOString().split("T")[0], @@ -905,7 +914,7 @@ const BusCustomFormWizard = (props) => { - 地址 + * @@ -916,7 +925,7 @@ const BusCustomFormWizard = (props) => { value={formik.values.address1} name="address1" onChange={formik.handleChange} - placeholder="第一行" + placeholder={intl.formatMessage({id: 'addressLine1'})} onBlur={formik.handleBlur} inputProps={{ onKeyDown: (e) => { @@ -933,7 +942,7 @@ const BusCustomFormWizard = (props) => { value={formik.values.address2} name="address2" onChange={formik.handleChange} - placeholder="第二行" + placeholder={intl.formatMessage({id: 'addressLine2'})} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -949,7 +958,7 @@ const BusCustomFormWizard = (props) => { value={formik.values.address3} name="address3" onChange={formik.handleChange} - placeholder="第三行" + placeholder={intl.formatMessage({id: 'addressLine3'})} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -968,7 +977,9 @@ const BusCustomFormWizard = (props) => { setSelectedAddress4(newValue); }} sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address4-combo": { padding: "0px 0px 0px 3px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }} - renderInput={(params) => } + renderInput={(params) => } /> { {/* 註有*的項目必須輸入資料 */} - 你的登入資料 + + + {/* Already have an account? */} @@ -1434,7 +1447,9 @@ const BusCustomFormWizard = (props) => { - 你的機構/公司資料 + + + {/* Already have an account? */} @@ -1444,7 +1459,7 @@ const BusCustomFormWizard = (props) => { - 機構/公司英文名稱: + : {formik.values.enCompanyName} @@ -1454,7 +1469,7 @@ const BusCustomFormWizard = (props) => { - 機構/公司中文名稱: + : {formik.values.chCompanyName} @@ -1473,7 +1488,7 @@ const BusCustomFormWizard = (props) => { - 商業登記證號碼: + : {formik.values.brNo} @@ -1483,7 +1498,7 @@ const BusCustomFormWizard = (props) => { - 商業登記證有效日期: + : {formik.values.brExpiryDate} @@ -1494,7 +1509,7 @@ const BusCustomFormWizard = (props) => { - 地址: + : @@ -1513,7 +1528,7 @@ const BusCustomFormWizard = (props) => { {selectedAddress5 === "香港" ? - 區域 (只適用於香港): + : {selectedAddress4} diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js index 441121c..70fa476 100644 --- a/src/pages/authentication/auth-forms/CustomFormWizard.js +++ b/src/pages/authentication/auth-forms/CustomFormWizard.js @@ -563,7 +563,7 @@ const CustomFormWizard = (props) => { .matches(/^(?=.*[A-Z])/, { message: displayErrorMsg('請包括最少1個大寫字母') }) .matches(/^(?=.*[0-9])/, { message: displayErrorMsg('請包括最少1個數字') }) .matches(/^(?=.*[!@#%&])/, { message: displayErrorMsg('請包括最少1個特殊字符') }), - confirmPassword: yup.string().min(8, displayErrorMsg('請最少輸入8位密碼')).required(displayErrorMsg('請確認密碼')).oneOf([yup.ref('password'), null], displayErrorMsg('請輸入相同密碼')), + confirmPassword: yup.string().min(8, displayErrorMsg('請最少輸入8位密碼')).required(displayErrorMsg(intl.formatMessage({id: 'pleaseConfirmPassword'}))).oneOf([yup.ref('password'), null], displayErrorMsg('請輸入相同密碼')), enName: yup.string().max(255).required(displayErrorMsg('請輸入英文姓名')), chName: yup.string().max(6).required(displayErrorMsg('請輸入中文姓名')), address1: yup.string().max(255).required(displayErrorMsg('請輸入第一行地址')), @@ -662,14 +662,22 @@ const CustomFormWizard = (props) => { - +
- 註有*的項目必須輸入資料 - 你的登入資料 + + + + + + @@ -791,7 +799,7 @@ const CustomFormWizard = (props) => { - 確認密碼 + * @@ -825,7 +833,7 @@ const CustomFormWizard = (props) => { } - placeholder="確認密碼" + placeholder={intl.formatMessage({id: 'confirmPassword'})} fullWidth error={Boolean(formik.touched.confirmPassword && formik.errors.confirmPassword)} /> @@ -850,7 +858,9 @@ const CustomFormWizard = (props) => { - 你的個人資料 + + + {/* Already have an account? */} @@ -1109,7 +1119,7 @@ const CustomFormWizard = (props) => { - 地址 + * @@ -1120,7 +1130,7 @@ const CustomFormWizard = (props) => { value={formik.values.address1} name="address1" onChange={formik.handleChange} - placeholder="第一行" + placeholder={intl.formatMessage({id: 'addressLine1'})} onBlur={formik.handleBlur} inputProps={{ onKeyDown: (e) => { @@ -1137,7 +1147,7 @@ const CustomFormWizard = (props) => { value={formik.values.address2} name="address2" onChange={formik.handleChange} - placeholder="第二行" + placeholder={intl.formatMessage({id: 'addressLine2'})} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -1153,7 +1163,7 @@ const CustomFormWizard = (props) => { value={formik.values.address3} name="address3" onChange={formik.handleChange} - placeholder="第三行" + placeholder={intl.formatMessage({id: 'addressLine3'})} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -1172,7 +1182,8 @@ const CustomFormWizard = (props) => { setSelectedAddress4(newValue); }} sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address4-combo": { padding: "0px 0px 0px 3px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }} - renderInput={(params) => } + renderInput={(params) => } /> { {/* 註有*的項目必須輸入資料 */} - 你的登入資料 + + + {/* Already have an account? */} @@ -1604,7 +1617,9 @@ const CustomFormWizard = (props) => { - 你的個人資料 + + + {/* Already have an account? */} @@ -1662,7 +1677,7 @@ const CustomFormWizard = (props) => { - 地址: + : @@ -1681,7 +1696,7 @@ const CustomFormWizard = (props) => { {selectedAddress5 == ("香港") ? - 區域 (只適用於香港): + : {selectedAddress4} diff --git a/src/pages/authentication/auth-forms/IAmSmartFormWizard.js b/src/pages/authentication/auth-forms/IAmSmartFormWizard.js index 3736e48..b2e0f1b 100644 --- a/src/pages/authentication/auth-forms/IAmSmartFormWizard.js +++ b/src/pages/authentication/auth-forms/IAmSmartFormWizard.js @@ -397,7 +397,9 @@ const CustomFormWizard = (props) => { iAM Smart - 註有*的項目必須輸入資料。 + + 。 + iAM Smart: 表示該項由「智方便」提供。 @@ -406,7 +408,9 @@ const CustomFormWizard = (props) => { - 你的個人資料 + + + @@ -443,7 +447,7 @@ const CustomFormWizard = (props) => { - 地址 + * {iAmSmartData.address1?iAM Smart:null} @@ -455,7 +459,7 @@ const CustomFormWizard = (props) => { value={formik.values.address1} name="address1" onChange={formik.handleChange} - placeholder="第一行" + placeholder={intl.formatMessage({id: 'addressLine1'})} onBlur={formik.handleBlur} inputProps={{ onKeyDown: (e) => { @@ -472,7 +476,7 @@ const CustomFormWizard = (props) => { value={formik.values.address2} name="address2" onChange={formik.handleChange} - placeholder="第二行" + placeholder={intl.formatMessage({id: 'addressLine2'})} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -488,7 +492,7 @@ const CustomFormWizard = (props) => { value={formik.values.address3} name="address3" onChange={formik.handleChange} - placeholder="第三行" + placeholder={intl.formatMessage({id: 'addressLine3'})} inputProps={{ onKeyDown: (e) => { if (e.key === 'Enter') { @@ -507,7 +511,8 @@ const CustomFormWizard = (props) => { setSelectedAddress4(newValue); }} sx={{ "& .MuiInputBase-root": { height: "41px" }, "#address4-combo": { padding: "0px 0px 0px 0px" }, "& .MuiAutocomplete-endAdornment": { top: "auto" }, }} - renderInput={(params) => } + renderInput={(params) => } /> { - 你的個人資料 + + + {/* Already have an account? */} @@ -930,7 +937,7 @@ const CustomFormWizard = (props) => { - 地址: + : @@ -949,7 +956,7 @@ const CustomFormWizard = (props) => { {selectedAddress5 == ("香港") ? - 區域 (只適用於香港): + : {selectedAddress4} diff --git a/src/translations/en.json b/src/translations/en.json index ebe0c83..db208e0 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -48,6 +48,31 @@ "userPhoneNumber": "Mobile Phone Number", "userAddress": "Residential Address", + "personalInformation": "Personal Information", + "yourPersonalInformation": "Your Personal Information", + "yourLoginInformation": "Your Login Information", + "yourBusinessInformation": "Your Organization/Company Information", + "businessEngName": "English name of Organization/Company", + "businessChName": "Chinese name of Organization/Company", + "preview": "Preview", + "finishSubmission": "Finish Submission", + "reset": "reset", + "requireString": "Items marked with * must be filled in", + "confirmPassword": "Confirm password", + "pleaseConfirmPassword": "Please confirm password", + "pleaseEnterOrgOrCompName": "Please enter the English/Chinese name of the organisation/company", + "sameAsBusinessRegistrationCert": "Same as Business Registration Certificate", + "businessRegCertNumber": "Business Reg Cert Number", + "pleaseFillInBusinessRegCertNumber": "Please fill in Business Registration Certificate Number", + "pleaseFillInValidBusinessRegCertNumber": "Please fill in valid Business Registration Certificate Number", + "businessRegCertValidityDate": "Business Reg Cert validity date", + "pleaseFillInBusinessRegCertValidityDate": "Please fill in Business Reg Cert validity date", + "formAddress": "Address", + "addressLine1": "First line", + "addressLine2": "Second line", + "addressLine3": "Third line", + "region": "Region (only applicable to Hong Kong)", + "Dashboard": "Dashboard", "event": "Event" } \ No newline at end of file diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 3bb83a5..ae4fb66 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -48,6 +48,31 @@ "userPhoneNumber": "手机号码", "userAddress": "住宅地址", + "personalInformation": "个人资料", + "yourPersonalInformation": "你的个人资料", + "yourLoginInformation": "你的登入资料", + "yourBusinessInformation": "你的机构/公司资料", + "businessEngName": "机构/公司英文名称", + "businessChName": "机构/公司中文名称", + "preview": "预览", + "finishSubmission": "完成提交", + "reset": "重置", + "requireString": "注有*的项目必须输入资料", + "confirmPassword": "确认密码", + "pleaseConfirmPassword": "请确认密码", + "pleaseEnterOrgOrCompName": "请输入机构/公司英文名称或中文名称", + "sameAsBusinessRegistrationCert": "与商业登记证相同", + "businessRegCertNumber": "商业登记证号码", + "pleaseFillInBusinessRegCertNumber": "请输入商业登记证号码", + "pleaseFillInValidBusinessRegCertNumber": "请输入有效商业登记证号码", + "businessRegCertValidityDate": "商业登记证有效日期", + "pleaseFillInBusinessRegCertValidityDate": "请输入商业登记证有效日期", + "formAddress": "地址", + "addressLine1": "第一行", + "addressLine2": "第二行", + "addressLine3": "第三行", + "region": "区域 (只适用于香港)", + "Dashboard": "仪表板", "event": "活动" } \ No newline at end of file diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index cc24fe0..e6164c0 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -48,6 +48,31 @@ "userPhoneNumber": "手機號碼", "userAddress": "住宅地址", + "personalInformation": "個人資料", + "yourPersonalInformation": "你的個人資料", + "yourLoginInformation": "你的登入資料", + "yourBusinessInformation": "你的機構/公司資料", + "businessEngName": "機構/公司英文名稱", + "businessChName": "機構/公司中文名稱", + "preview": "預覽", + "finishSubmission": "完成提交", + "reset": "重置", + "requireString": "註有*的項目必須輸入資料", + "confirmPassword": "確認密碼", + "pleaseConfirmPassword": "請確認密碼", + "pleaseEnterOrgOrCompName": "請輸入機構/公司英文名稱或中文名稱", + "sameAsBusinessRegistrationCert": "與商業登記證相同", + "businessRegCertNumber": "商業登記證號碼", + "pleaseFillInBusinessRegCertNumber": "請輸入商業登記證號碼", + "pleaseFillInValidBusinessRegCertNumber": "請輸入有效商業登記證號碼", + "businessRegCertValidityDate": "商業登記證有效日期", + "pleaseFillInBusinessRegCertValidityDate": "請輸入商業登記證有效日期", + "formAddress": "地址", + "addressLine1": "第一行", + "addressLine2": "第二行", + "addressLine3": "第三行", + "region": "區域 (只適用於香港)", + "Dashboard": "儀表板", "event": "活動" } \ No newline at end of file