From ab8f16f7d7f471cfc2dedb5af8b5ab2aacecdaa6 Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Wed, 17 Jan 2024 17:22:01 +0800 Subject: [PATCH] update i18n --- src/pages/Organization/DetailPage/OrganizationCard.js | 8 ++++---- .../DetailPage_FromUser/OrganizationCard_loadFromUser.js | 4 ++-- .../UserInformationCard_Individual.js | 4 ++-- .../UserInformationCard_Organization.js | 2 +- src/pages/authentication/BusRegister.js | 2 +- src/pages/authentication/IAmSmartRegister.js | 2 +- src/pages/authentication/Register.js | 2 +- src/pages/authentication/auth-forms/CustomFormWizard.js | 2 +- src/translations/en.json | 2 ++ src/translations/zh-CN.json | 2 ++ src/translations/zh-HK.json | 2 ++ 11 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js index 2144338..0383142 100644 --- a/src/pages/Organization/DetailPage/OrganizationCard.js +++ b/src/pages/Organization/DetailPage/OrganizationCard.js @@ -48,11 +48,11 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { enableReinitialize: true, initialValues: currentUserData, validationSchema: yup.object().shape({ - enCompanyName: yup.string().max(255).required(displayErrorMsg('請輸入英文名稱')), - chCompanyName: yup.string().max(255, displayErrorMsg('請輸入中文名稱')).nullable(), + enCompanyName: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'userRequireEnglishName'}))), + chCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'userRequireChineseName'}))).nullable(), addressLine1: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'validateAddressLine1'}))), - addressLine2: yup.string().max(255, displayErrorMsg("length must <= 255")), - addressLine3: yup.string().max(255, displayErrorMsg("length must <= 255")), + addressLine2: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'noMoreThen255Words'}))), + addressLine3: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'noMoreThen255Words'}))), fax_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({id: 'requireDialingCode'}))).nullable(), tel_countryCode: yup.string().min(3, displayErrorMsg(intl.formatMessage({id: 'requireDialingCode'}))), phoneNumber: yup.string().min(8, displayErrorMsg(intl.formatMessage({id: 'requiredValidNumber'}))).required(displayErrorMsg(intl.formatMessage({id: 'requireContactNumber'}))), diff --git a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js index eb66a14..6f669b3 100644 --- a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js +++ b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js @@ -46,8 +46,8 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => { enableReinitialize: true, initialValues: currentUserData, validationSchema: yup.object().shape({ - enCompanyName: yup.string().max(255, displayErrorMsg("請輸入英文名稱")).required(displayErrorMsg('請輸入英文名稱')), - chCompanyName: yup.string().max(255, displayErrorMsg('請輸入中文名稱')).nullable(), + enCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'userRequireEnglishName'}))).required(displayErrorMsg(intl.formatMessage({id: 'userRequireEnglishName'}))), + chCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({id: 'userRequireChineseName'}))).nullable(), addressLine1: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'validateAddressLine1'}))), addressLine2: yup.string().max(255).nullable(), addressLine3: yup.string().max(255).nullable(), diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js index 8618b4a..d362b0b 100644 --- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js +++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js @@ -46,8 +46,8 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => { addressLine2: yup.string().max(255).nullable(), addressLine3: yup.string().max(255).nullable(), emailAddress: yup.string().email(intl.formatMessage({id: 'validEmailFormat'})).max(255).required(intl.formatMessage({id: 'requireEmail'})), - identification: yup.string().min(7, "請輸入證件號碼").required('請輸入證件號碼'), - checkDigit: yup.string().max(1).required('請輸入括號內的數字或字母').nullable(), + identification: yup.string().min(7, intl.formatMessage({id: 'requireIdDocNumber'})).required(intl.formatMessage({id: 'requireIdDocNumber'})), + checkDigit: yup.string().max(1).required(intl.formatMessage({id: 'requiredNumberInQuote'})).nullable(), idDocType: yup.string().max(255).required(intl.formatMessage({id: 'requireIdDocType'})), tel_countryCode: yup.string().min(3, intl.formatMessage({id: 'require3Number'})).required(intl.formatMessage({id: 'requireDialingCode'})), fax_countryCode: yup.string().min(3, intl.formatMessage({id: 'require3Number'})), diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js index 33ad64c..d04b23a 100644 --- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js +++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js @@ -49,7 +49,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => initialValues: currentUserData, validationSchema: yup.object().shape({ contactPerson: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'userRequireName'}))), - enCompanyName: yup.string().max(255).required(displayErrorMsg('請輸入英文名稱')), + enCompanyName: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'userRequireEnglishName'}))), chCompanyName: yup.string().max(255).nullable(), addressLine1: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'validateAddressLine1'}))), addressLine2: yup.string().max(255).nullable(), diff --git a/src/pages/authentication/BusRegister.js b/src/pages/authentication/BusRegister.js index be96edd..0be43a0 100644 --- a/src/pages/authentication/BusRegister.js +++ b/src/pages/authentication/BusRegister.js @@ -112,7 +112,7 @@ const BusRegister = () => { const handleNext = async () => { const captchaTest = await handleCaptcha(); if (!captchaTest) { - notifyActionError("請輸入有效驗證") + notifyActionError(intl.formatMessage({id: 'validVerify'})) return; } diff --git a/src/pages/authentication/IAmSmartRegister.js b/src/pages/authentication/IAmSmartRegister.js index 1cbb7cb..a37e7e1 100644 --- a/src/pages/authentication/IAmSmartRegister.js +++ b/src/pages/authentication/IAmSmartRegister.js @@ -105,7 +105,7 @@ const Register = () => { } const captchaTest = await handleCaptcha(); if (!captchaTest) { - notifyActionError("請輸入有效驗證") + notifyActionError(intl.formatMessage({id: 'validVerify'})) return; } const test = await handleCheckID() diff --git a/src/pages/authentication/Register.js b/src/pages/authentication/Register.js index 81b96ba..9133977 100644 --- a/src/pages/authentication/Register.js +++ b/src/pages/authentication/Register.js @@ -114,7 +114,7 @@ const Register = () => { const captchaTest = await handleCaptcha(); if (!captchaTest) { - notifyActionError("請輸入有效驗證") + notifyActionError(intl.formatMessage({id: 'validVerify'})) return; } diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js index e692802..61916b2 100644 --- a/src/pages/authentication/auth-forms/CustomFormWizard.js +++ b/src/pages/authentication/auth-forms/CustomFormWizard.js @@ -624,7 +624,7 @@ const CustomFormWizard = (props) => { } } }), - checkDigit: yup.string().max(1).required(displayErrorMsg('請輸入括號內的數字或字母')), + checkDigit: yup.string().max(1).required(displayErrorMsg(intl.formatMessage({id: 'requiredNumberInQuote'}))), idDocType: yup.string().max(255).required(displayErrorMsg(intl.formatMessage({id: 'requireIdDocType'}))), phoneCountryCode: yup.string().min(2, displayErrorMsg(intl.formatMessage({id: 'requireAtLeast2Number'}))).required(displayErrorMsg(intl.formatMessage({id: 'requireDialingCode'}))), // faxCountryCode: yup.string().min(3,'請輸入3位數字'), diff --git a/src/translations/en.json b/src/translations/en.json index a8b6a44..0f9c792 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -181,6 +181,8 @@ "idDocType": "Document Category", "requireIdDocType": "Please enter the document type", "idDocNumber": "ID number", + "requireIdDocNumber": "Please enter the document ID", + "requiredNumberInQuote": "Please enter the numbers or letters in brackets", "sameAsYourIdDoc": "Same as your ID document", "pwRemark1": "At least 8 characters, the more characters the better", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index d3fee84..f3d67d6 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -181,6 +181,8 @@ "idDocType": "证件类别", "requireIdDocType": "请输入证件类别", "idDocNumber": "证件号码", + "requireIdDocNumber": "请输入证件号码", + "requiredNumberInQuote": "请输入括号内的数字或字母", "sameAsYourIdDoc": "与你的身份证明文件相同", "pwRemark1": "至少8个字元，字元越多越好", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index f82c33c..2b15764 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -181,6 +181,8 @@ "idDocType": "證件類別", "requireIdDocType": "請輸入證件類別", "idDocNumber": "證件號碼", + "requireIdDocNumber": "請輸入證件號碼", + "requiredNumberInQuote": "請輸入括號內的數字或字母", "sameAsYourIdDoc": "與你的身份證明文件相同", "pwRemark1": "至少8個字元，字元越多越好",