diff --git a/locales/en/l10n-logIn.js b/locales/en/l10n-logIn.js index 0aab0ff9e5e..265bc221d6b 100644 --- a/locales/en/l10n-logIn.js +++ b/locales/en/l10n-logIn.js @@ -5,7 +5,8 @@ module.exports = { // Log in page - INPUT_USERNAME_OR_EMAIL_TIP: 'Please enter your username or email.', + INPUT_USERNAME_OR_EMAIL_TIP: 'Please enter your username or email', + INPUT_EMAIL_TIP: 'Please enter your email', LOG_IN: 'Log In', LOG_IN_WITH_TITLE: 'Log in with {title}', LOG_OUT: 'Log Out', diff --git a/locales/es/l10n-logIn.js b/locales/es/l10n-logIn.js index 939b8ea3ce3..f456b962aa5 100644 --- a/locales/es/l10n-logIn.js +++ b/locales/es/l10n-logIn.js @@ -6,6 +6,7 @@ module.exports = { // Log in page INPUT_USERNAME_OR_EMAIL_TIP: 'Please input username or email', + INPUT_EMAIL_TIP: 'Please enter your email', LOG_IN: 'Log In', LOG_IN_WITH_TITLE: 'Log in with {title}', LOG_OUT: 'Log Out', diff --git a/locales/tc/l10n-logIn.js b/locales/tc/l10n-logIn.js index f3315b06500..15f4072e5d6 100644 --- a/locales/tc/l10n-logIn.js +++ b/locales/tc/l10n-logIn.js @@ -6,6 +6,7 @@ module.exports = { // Log in page INPUT_USERNAME_OR_EMAIL_TIP: '請輸入用戶名或信箱', + INPUT_EMAIL_TIP: '請輸入信箱', LOG_IN: 'Log In', LOG_IN_WITH_TITLE: '通過 {title} 登入', LOG_OUT: 'Log Out', diff --git a/locales/zh/l10n-logIn.js b/locales/zh/l10n-logIn.js index bf57c02fd27..2fda3337321 100644 --- a/locales/zh/l10n-logIn.js +++ b/locales/zh/l10n-logIn.js @@ -5,7 +5,8 @@ module.exports = { // Log in page - INPUT_USERNAME_OR_EMAIL_TIP: '请输入用户名或邮箱。', + INPUT_USERNAME_OR_EMAIL_TIP: '请输入用户名或邮箱', + INPUT_EMAIL_TIP: '请输入邮箱', LOG_IN: '登录', LOG_IN_WITH_TITLE: '通过 {title} 登录', LOG_OUT: '登出', diff --git a/packages/console/src/pages/access/containers/Accounts/components/UserCreateModal/index.tsx b/packages/console/src/pages/access/containers/Accounts/components/UserCreateModal/index.tsx index b7b41beb75d..319033044eb 100644 --- a/packages/console/src/pages/access/containers/Accounts/components/UserCreateModal/index.tsx +++ b/packages/console/src/pages/access/containers/Accounts/components/UserCreateModal/index.tsx @@ -43,7 +43,7 @@ export default function UserCreateModal({ visible, onSuccess, onCancel }: UserCr }, 'spec.email': { rules: [ - { required: true, message: t('INPUT_USERNAME_OR_EMAIL_TIP') }, + { required: true, message: t('INPUT_EMAIL_TIP') }, { type: 'email', message: t('INVALID_EMAIL') }, { validator: validator.emailValidator }, ], diff --git a/packages/console/src/pages/access/containers/Accounts/components/UserEditModal/index.tsx b/packages/console/src/pages/access/containers/Accounts/components/UserEditModal/index.tsx index 63eacc4db65..120381e5e7c 100644 --- a/packages/console/src/pages/access/containers/Accounts/components/UserEditModal/index.tsx +++ b/packages/console/src/pages/access/containers/Accounts/components/UserEditModal/index.tsx @@ -35,10 +35,8 @@ export default function UserEditModal({ }, 'spec.email': { rules: [ - { - required: true, - message: t('INPUT_USERNAME_OR_EMAIL_TIP'), - }, + { required: true, message: t('INPUT_EMAIL_TIP') }, + { type: 'email', message: t('INVALID_EMAIL') }, ], }, 'spec.password': { diff --git a/packages/core/src/components/Layouts/Header/UserSetting/BasicInfo/index.tsx b/packages/core/src/components/Layouts/Header/UserSetting/BasicInfo/index.tsx index 0eab0ddd44e..abef2473a3b 100644 --- a/packages/core/src/components/Layouts/Header/UserSetting/BasicInfo/index.tsx +++ b/packages/core/src/components/Layouts/Header/UserSetting/BasicInfo/index.tsx @@ -55,9 +55,17 @@ const BasicInfo = ({ visible, formData, form }: BasicInfoProps) => { key={formData?.metadata?.name} > - + - + {globals.config.supportLangs && (