diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js index 76f43e6..ecbc28b 100644 --- a/src/pages/Proof/Payment/Pay.js +++ b/src/pages/Proof/Payment/Pay.js @@ -123,7 +123,7 @@ const Index = () => { - 或 + + + + + @@ -103,9 +115,13 @@ const RegisterCustom = () => { - + + + - + 需上載身份證明文件數碼檔案以進行網上申請。 @@ -113,8 +129,12 @@ const RegisterCustom = () => { - 機構/公司用戶 - + + + + 需上載以下任何一份證明文件以進行網上申請。
如:商業登記證;專業執業證書 @@ -125,45 +145,57 @@ const RegisterCustom = () => { - setIsPopUp(false)} > + setIsPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > - 授權「智方便」提供個人資料 + - 為完成開戶並建立與「智方便」的連接,請授權「智方便」提供以下個人資料: + - - 中文姓名 + {"- " + intl.formatMessage({id: 'userChineseName'})} - - 英文姓名 + {"- " + intl.formatMessage({id: 'userEnglishName'})} - - 身份證號碼 + {"- " + intl.formatMessage({id: 'userIDNo'})} - - 電郵地址 + {"- " + intl.formatMessage({id: 'userEmailAddress'})} - - 手機號碼 + {"- " + intl.formatMessage({id: 'userPhoneNumber'})} - - 住宅地址 + {"- " + intl.formatMessage({id: 'userAddress'})} - -
+ +
diff --git a/src/pages/authentication/auth-forms/BusCustomFormWizard.js b/src/pages/authentication/auth-forms/BusCustomFormWizard.js index 27995b5..299ace5 100644 --- a/src/pages/authentication/auth-forms/BusCustomFormWizard.js +++ b/src/pages/authentication/auth-forms/BusCustomFormWizard.js @@ -567,7 +567,9 @@ const BusCustomFormWizard = (props) => {
- 成為新的機構/公司用戶 + + +
註有*的項目必須輸入資料 你的登入資料 @@ -1407,7 +1409,9 @@ const BusCustomFormWizard = (props) => {
- 成為新的機構/公司用戶 + + +
{/* 註有*的項目必須輸入資料 */} 你的登入資料 diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js index 37c1ca1..441121c 100644 --- a/src/pages/authentication/auth-forms/CustomFormWizard.js +++ b/src/pages/authentication/auth-forms/CustomFormWizard.js @@ -664,7 +664,9 @@ const CustomFormWizard = (props) => {
- 成為新的個人用戶 + + +
註有*的項目必須輸入資料 你的登入資料 @@ -1040,7 +1042,7 @@ const CustomFormWizard = (props) => { - 英文姓名 + {selectedIdDocType.type === "CNID" ? "" : *} @@ -1073,7 +1075,7 @@ const CustomFormWizard = (props) => { - 中文姓名 + * @@ -1577,7 +1579,9 @@ const CustomFormWizard = (props) => {
- 成為新的個人用戶 + + +
{/* 註有*的項目必須輸入資料 */} 你的登入資料 @@ -1638,7 +1642,7 @@ const CustomFormWizard = (props) => { - 英文姓名: + : {formik.values.enName} @@ -1648,7 +1652,7 @@ const CustomFormWizard = (props) => { - 中文姓名: + : {formik.values.chName} diff --git a/src/pages/authentication/auth-forms/IAmSmartFormWizard.js b/src/pages/authentication/auth-forms/IAmSmartFormWizard.js index df10f15..3736e48 100644 --- a/src/pages/authentication/auth-forms/IAmSmartFormWizard.js +++ b/src/pages/authentication/auth-forms/IAmSmartFormWizard.js @@ -38,12 +38,14 @@ import * as HttpUtils from "../../../utils/HttpUtils"; import LoopIcon from '@mui/icons-material/Loop'; import { useTheme } from '@mui/material/styles'; import { useLocation } from "react-router-dom"; +import {FormattedMessage, useIntl} from "react-intl"; // ============================|| FIREBASE - REGISTER ||============================ // const CustomFormWizard = (props) => { const location = useLocation(); const theme = useTheme(); + const intl = useIntl(); const [iAmSmartData, setIAmSmartData] = useState({}); @@ -390,7 +392,9 @@ const CustomFormWizard = (props) => {
- 成為新的個人用戶iAM Smart + + + iAM Smart
註有*的項目必須輸入資料。 @@ -420,7 +424,7 @@ const CustomFormWizard = (props) => { - 英文姓名: {iAmSmartData.enName} + : {iAmSmartData.enName} @@ -430,7 +434,7 @@ const CustomFormWizard = (props) => { - 中文姓名: {iAmSmartData.chName} + {intl.formatMessage({id: 'userChineseName'})}: {iAmSmartData.chName} @@ -876,7 +880,9 @@ const CustomFormWizard = (props) => {
- 成為新的個人用戶 + + +
@@ -904,7 +910,7 @@ const CustomFormWizard = (props) => { - 英文姓名: + : {formik.values.enName} @@ -914,7 +920,7 @@ const CustomFormWizard = (props) => { - 中文姓名: + : {formik.values.chName} diff --git a/src/translations/en.json b/src/translations/en.json index 4c909cd..ebe0c83 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -7,6 +7,12 @@ "HKSARGOV": "HKSAR Government", "Gazette": "Gazette", + "registerTitle1": "Become", + "registerTitle2": "Gazette Notice", + "registerTitle3": "Publisher now", + "registerSubTitle": "Only takes 4-5 minutes", + "or": "or", + "mainPage": "Main Page", "myPublicNotice": "My Public Notice", "proofRecord": "Proof Record", @@ -16,13 +22,32 @@ "login": "Login", "iAmSmartLogin": "iAmSmart Login", + "continueWithIAmSmart": "Continue with iAmSmart", + "authorizeIAmSmartForInfo": "Authorize iAmSmart to provide personal information", + "iAmSmartSubTitle": "In order to complete the account opening and establish a connection with \"iAmStart\", please authorize \"iAmSmart\" to provide the following personal information:", + "iAmSmartAutoFillIn": "Use \"iAmSmart\" to automatically fill in", "register": "Register", "userLoginName": "Username", "userPassword": "Password", "forgotUserPassword": "Forgot Password", - "learnMore": "Lean More", + "learnMore": "Learn More", "createOrReActivate": "Create/reactivate account", + "user": "User", + "personalUser": "Personal user", + "becomeNewPersonalUser": "Become New Personal User", + "registerNewPersonalUser": "Apply for personal user", + "businessUser": "Organization/Company User", + "registerNewBusinessUser": "Applying Organization/Company user", + "becomeNewBusinessUser": "Become New Organization/Company user", + "userName": "Username", + "userChineseName": "Chinese Name", + "userEnglishName": "English Name", + "userIDNo": "ID Card Number", + "userEmailAddress": "Email Address", + "userPhoneNumber": "Mobile Phone Number", + "userAddress": "Residential Address", + "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 2db22c0..3bb83a5 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -7,6 +7,12 @@ "HKSARGOV": "香港特别行政区政府", "Gazette": "宪报", + "registerTitle1": "立即成为", + "registerTitle2": "宪报刊登公告", + "registerTitle3": "用户", + "registerSubTitle": "只需4-5分钟", + "or": "或", + "mainPage": "主页", "myPublicNotice": "我的公共启事", "proofRecord": "校对记录", @@ -16,6 +22,10 @@ "login": "登录", "iAmSmartLogin": "智方便登录", + "continueWithIAmSmart": "以「智方便」继续", + "authorizeIAmSmartForInfo": "授权「智方便」提供个人资料", + "iAmSmartSubTitle": "为完成开户并建立与「智方便」的连接,请授权「智方便」提供以下个人资料:", + "iAmSmartAutoFillIn": "使用「智方便」自动填表", "register": "申请", "userLoginName": "用户登入名称", "userPassword": "密码", @@ -23,6 +33,21 @@ "learnMore": "了解更多", "createOrReActivate": "建立/重新启动帐户", + "user": "用戶", + "personalUser": "個人用戶", + "becomeNewPersonalUser": "成为新的个人用户", + "registerNewPersonalUser": "申请个人用户", + "businessUser": "机构/公司用户", + "registerNewBusinessUser": "申请机构/公司用户", + "becomeNewBusinessUser": "成为新的机构/公司用户", + "userName": "用户名称", + "userChineseName": "中文姓名", + "userEnglishName": "英文姓名", + "userIDNo": "身份证号码", + "userEmailAddress": "电邮地址", + "userPhoneNumber": "手机号码", + "userAddress": "住宅地址", + "Dashboard": "仪表板", "event": "活动" } \ No newline at end of file diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index d64ae3a..cc24fe0 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -7,6 +7,12 @@ "HKSARGOV": "香港特別行政區政府", "Gazette": "憲報", + "registerTitle1": "立即成為", + "registerTitle2": "憲報刊登公告", + "registerTitle3": "用戶", + "registerSubTitle": "只需4-5分鐘", + "or": "或", + "mainPage": "主頁", "myPublicNotice": "我的公共啟事", "proofRecord": "校對記錄", @@ -16,6 +22,10 @@ "login": "登入", "iAmSmartLogin": "智方便登入", + "continueWithIAmSmart": "以「智方便」繼續", + "authorizeIAmSmartForInfo": "授權「智方便」提供個人資料", + "iAmSmartSubTitle": "為完成開戶並建立與「智方便」的連接,請授權「智方便」提供以下個人資料:", + "iAmSmartAutoFillIn": "使用「智方便」自動填表", "register": "申請", "userLoginName": "用戶登入名稱", "userPassword": "密碼", @@ -23,6 +33,21 @@ "learnMore": "了解更多", "createOrReActivate": "建立/重新啟動帳戶", + "user": "用戶", + "personalUser": "個人用戶", + "becomeNewPersonalUser": "成為新的個人用戶", + "registerNewPersonalUser": "申請個人用戶", + "businessUser": "機構/公司用戶", + "registerNewBusinessUser": "申請機構/公司用戶", + "becomeNewBusinessUser": "成為新的機構/公司用戶", + "userName": "用戶名稱", + "userChineseName": "中文姓名", + "userEnglishName": "英文姓名", + "userIDNo": "身份證號碼", + "userEmailAddress": "電郵地址", + "userPhoneNumber": "手機號碼", + "userAddress": "住宅地址", + "Dashboard": "儀表板", "event": "活動" } \ No newline at end of file