diff --git a/apps/storefront/src/locales/en-US/finish.ts b/apps/storefront/src/locales/en-US/finish.ts deleted file mode 100644 index 52d5b0fd..00000000 --- a/apps/storefront/src/locales/en-US/finish.ts +++ /dev/null @@ -1,12 +0,0 @@ -export default { - // complete page - 'intl.completePage.title': 'Complete Registration', - 'intl.completePage.passwordMatchPrompt': 'The passwords are different', - 'intl.completePage.email': 'email', - 'intl.completePage.confirmPassword': 'Confirm Password', - - // finish page - 'intl.finishPage.autoApproved.tip': 'Thank you for creating your account at {storeName}. Your company account application has been approved', - 'intl.finishPage.notAutoApproved.tip': 'Your company account application has been received. Please allow 24 hours for account approval and activation.', - 'intl.finishPage.bcSuccess.tip': 'Thank you for creating your account at {storeName}.', -} diff --git a/apps/storefront/src/locales/en-US/index.ts b/apps/storefront/src/locales/en-US/index.ts index d2477dcc..5943c004 100644 --- a/apps/storefront/src/locales/en-US/index.ts +++ b/apps/storefront/src/locales/en-US/index.ts @@ -1,9 +1,7 @@ import users from './users' import global from './global' -import finish from './finish' export const en = { ...global, ...users, - ...finish, } diff --git a/apps/storefront/src/locales/en-US/users.ts b/apps/storefront/src/locales/en-US/users.ts index bbc3e1b9..c123c4b5 100644 --- a/apps/storefront/src/locales/en-US/users.ts +++ b/apps/storefront/src/locales/en-US/users.ts @@ -24,4 +24,18 @@ export default { 'intl.user.register.label.zipCode': 'Zip Code', 'intl.user.register.tips.registerLogo': 'register Logo', + + // complete page + 'intl.user.register.RegisterComplete.title': 'Complete Registration', + 'intl.user.register.RegisterComplete.passwordMatchPrompt': 'Your passwords do not match.', + 'intl.user.register.RegisterComplete.email': 'email', + 'intl.user.register.RegisterComplete.confirmPassword': 'Confirm Password', + + // finish page + 'intl.user.register.RegisterFinish.autoApproved.tip': 'Thank you for creating your account at {storeName}. Your company account application has been approved.', + 'intl.user.register.RegisterFinish.notAutoApproved.tip': 'Your company account application has been received. Please allow 24 hours for account approval and activation.', + 'intl.user.register.RegisterFinish.bcSuccess.tip': 'Thank you for creating your account at {storeName}.', + + // register components + 'intl.user.register.RegisteredSingleCheckBox.label': 'Email marketing newsletter', } diff --git a/apps/storefront/src/locales/zh-CN/finish.ts b/apps/storefront/src/locales/zh-CN/finish.ts deleted file mode 100644 index cacf7217..00000000 --- a/apps/storefront/src/locales/zh-CN/finish.ts +++ /dev/null @@ -1,12 +0,0 @@ -export default { - // complete page - 'intl.completePage.title': '完成注册', - 'intl.completePage.passwordMatchPrompt': '密码不同', - 'intl.completePage.email': '电子邮件', - 'intl.completePage.confirmPassword': '确认密码', - - // finish page - 'intl.finishPage.autoApproved.tip': '感谢您在 {storeName} 创建帐户。 您的公司帐户申请已获批准', - 'intl.finishPage.notAutoApproved.tip': '您的公司账户申请已收到。 请等待 24 小时来批准和激活帐户。', - 'intl.finishPage.bcSuccess.tip': '感谢您在 {storeName} 创建帐户。', -} diff --git a/apps/storefront/src/locales/zh-CN/index.ts b/apps/storefront/src/locales/zh-CN/index.ts index a5cb03dd..40f2d0cd 100644 --- a/apps/storefront/src/locales/zh-CN/index.ts +++ b/apps/storefront/src/locales/zh-CN/index.ts @@ -1,9 +1,7 @@ import users from './users' import global from './global' -import finish from './finish' export const zh = { ...global, ...users, - ...finish, } diff --git a/apps/storefront/src/locales/zh-CN/users.ts b/apps/storefront/src/locales/zh-CN/users.ts index f9de72ca..25421d52 100644 --- a/apps/storefront/src/locales/zh-CN/users.ts +++ b/apps/storefront/src/locales/zh-CN/users.ts @@ -24,4 +24,18 @@ export default { 'intl.user.register.label.zipCode': '邮编', 'intl.user.register.tips.registerLogo': '注册Logo', + + // complete page + 'intl.user.register.RegisterComplete.title': '完成注册', + 'intl.user.register.RegisterComplete.passwordMatchPrompt': '您的密码不匹配。', + 'intl.user.register.RegisterComplete.email': '电子邮件', + 'intl.user.register.RegisterComplete.confirmPassword': '确认密码', + + // finish page + 'intl.user.register.RegisterFinish.autoApproved.tip': '感谢您在 {storeName} 创建帐户。 您的公司帐户申请已获批准。', + 'intl.user.register.RegisterFinish.notAutoApproved.tip': '您的公司账户申请已收到。 请等待 24 小时来批准和激活帐户。', + 'intl.user.register.RegisterFinish.bcSuccess.tip': '感谢您在 {storeName} 创建帐户。', + + // register components + 'intl.user.register.RegisteredSingleCheckBox.label': '电子邮件营销通讯', } diff --git a/apps/storefront/src/pages/registered/RegisterComplete.tsx b/apps/storefront/src/pages/registered/RegisterComplete.tsx index 8cf9bf56..a66d33ec 100644 --- a/apps/storefront/src/pages/registered/RegisterComplete.tsx +++ b/apps/storefront/src/pages/registered/RegisterComplete.tsx @@ -59,7 +59,7 @@ export default function RegisterComplete(props: RegisterCompleteProps) { if (list && list.length) { const emailFileds = list.find((item: RegisterFileds) => item.name === emailName) || {} emailItem = { ...emailFileds } - emailItem.label = `${b3Lang('intl.completePage.email')}` + emailItem.label = `${b3Lang('intl.user.register.RegisterComplete.email')}` emailItem.name = 'email' emailItem.disabled = true newPasswordInformation.push(emailItem) @@ -69,7 +69,7 @@ export default function RegisterComplete(props: RegisterCompleteProps) { newPasswordInformation.push({ default: '', required: true, - label: b3Lang('intl.completePage.confirmPassword'), + label: b3Lang('intl.user.register.RegisterComplete.confirmPassword'), name: 'ConfirmPassword', id: 'Confirm Password', fieldType: 'password', @@ -252,7 +252,7 @@ export default function RegisterComplete(props: RegisterCompleteProps) { const handleCompleted = (event: MouseEvent) => { handleSubmit(async (completeData: CustomFieldItems) => { if (completeData.password !== completeData.ConfirmPassword) { - setErrorMessage(b3Lang('intl.completePage.passwordMatchPrompt')) + setErrorMessage(b3Lang('intl.user.register.RegisterComplete.passwordMatchPrompt')) return } try { @@ -331,7 +331,7 @@ export default function RegisterComplete(props: RegisterCompleteProps) { ) } - {b3Lang('intl.completePage.title')} + {b3Lang('intl.user.register.RegisterComplete.title')} { personalInfo && ( - {b3Lang('intl.finishPage.autoApproved.tip', { storeName })} + {b3Lang('intl.user.register.RegisterFinish.autoApproved.tip', { storeName })} ) : ( - {b3Lang('intl.finishPage.notAutoApproved.tip')} + {b3Lang('intl.user.register.RegisterFinish.notAutoApproved.tip')} ) ) @@ -39,7 +39,7 @@ export default function RegisteredFinish(props: { activeStep: any; handleFinish: if (accountType === '2') { return ( - {b3Lang('intl.finishPage.bcSuccess.tip', { storeName })} + {b3Lang('intl.user.register.RegisterFinish.bcSuccess.tip', { storeName })} ) } diff --git a/apps/storefront/src/pages/registered/component/RegisteredSigleCheckBox.tsx b/apps/storefront/src/pages/registered/component/RegisteredSigleCheckBox.tsx index 3bb110bd..600d88e5 100644 --- a/apps/storefront/src/pages/registered/component/RegisteredSigleCheckBox.tsx +++ b/apps/storefront/src/pages/registered/component/RegisteredSigleCheckBox.tsx @@ -6,7 +6,10 @@ import { FormGroup, } from '@mui/material' +import { useB3Lang } from '@b3/lang' + const RegisteredSigleCheckBox = memo((props: any) => { + const b3Lang = useB3Lang() const { isChecked, onChange } = props return ( @@ -18,7 +21,7 @@ const RegisteredSigleCheckBox = memo((props: any) => { checked={isChecked} onChange={onChange} control={} - label="Email marketing newsletter" + label={b3Lang('intl.user.register.RegisteredSingleCheckBox.label')} labelPlacement="end" />