From c70e8f16ce2435b503eedcb8a144cc0f513bbb4c Mon Sep 17 00:00:00 2001 From: Darcy Ye Date: Fri, 14 Oct 2022 10:33:14 +0800 Subject: [PATCH] chore: update error messages (#2148) --- packages/phrases/src/locales/en/errors.ts | 12 ++++-------- packages/phrases/src/locales/fr/errors.ts | 12 ++++-------- packages/phrases/src/locales/ko-kr/errors.ts | 12 ++++-------- packages/phrases/src/locales/pt-pt/errors.ts | 12 ++++-------- packages/phrases/src/locales/tr-tr/errors.ts | 12 ++++-------- packages/phrases/src/locales/zh-cn/errors.ts | 7 ++----- packages/ui/src/containers/ResetPassword/index.tsx | 4 ++-- 7 files changed, 24 insertions(+), 47 deletions(-) diff --git a/packages/phrases/src/locales/en/errors.ts b/packages/phrases/src/locales/en/errors.ts index 80263ffb4..36f48f681 100644 --- a/packages/phrases/src/locales/en/errors.ts +++ b/packages/phrases/src/locales/en/errors.ts @@ -42,7 +42,7 @@ const errors = { identity_exists: 'The social account has been registered.', invalid_role_names: 'role names ({{roleNames}}) are not valid', cannot_delete_self: 'You cannot delete yourself.', - same_password: 'Your new password can not be the same as current password.', + same_password: 'Your new password can’t be the same as your current password.', }, password: { unsupported_encryption_method: 'The encryption method {{name}} is not supported.', @@ -56,14 +56,10 @@ const errors = { insufficient_info: 'Insufficient sign-in info.', connector_id_mismatch: 'The connectorId is mismatched with session record.', connector_session_not_found: 'Connector session not found. Please go back and sign in again.', - forgot_password_session_not_found: - 'Forgot password session not found. Please go back and verify.', - forgot_password_verification_expired: - 'Forgot password verification has expired. Please go back and verify again.', verification_session_not_found: - 'Passwordless verification session not found. Please go back and retry.', - verification_expired: 'Passwordless verification has expired. Please go back and verify again.', - invalid_verification: 'Can not store invalid passwordless verification.', + 'The verification was not successful. Restart the verification flow and try again.', + verification_expired: + 'The connection has timed out. Verify again to ensure your account safety.', unauthorized: 'Please sign in first.', unsupported_prompt_name: 'Unsupported prompt name.', }, diff --git a/packages/phrases/src/locales/fr/errors.ts b/packages/phrases/src/locales/fr/errors.ts index fc70d3109..ae60100cf 100644 --- a/packages/phrases/src/locales/fr/errors.ts +++ b/packages/phrases/src/locales/fr/errors.ts @@ -43,7 +43,7 @@ const errors = { identity_exists: 'Le compte social a été enregistré.', invalid_role_names: 'les noms de rôles ({{roleNames}}) ne sont pas valides', cannot_delete_self: 'You cannot delete yourself.', // UNTRANSLATED - same_password: 'Your new password can not be the same as current password.', // UNTRANSLATED + same_password: 'Your new password can’t be the same as your current password.', // UNTRANSLATED }, password: { unsupported_encryption_method: "La méthode de cryptage {{name}} n'est pas prise en charge.", @@ -61,14 +61,10 @@ const errors = { connector_id_mismatch: "Le connectorId ne correspond pas à l'enregistrement de la session.", connector_session_not_found: "La session du connecteur n'a pas été trouvée. Veuillez revenir en arrière et vous connecter à nouveau.", - forgot_password_session_not_found: - 'Forgot password session not found. Please go back and verify.', // UNTRANSLATED - forgot_password_verification_expired: - 'Forgot password verification has expired. Please go back and verify again.', // UNTRANSLATED verification_session_not_found: - 'Passwordless verification session not found. Please go back and retry.', // UNTRANSLATED - verification_expired: 'Passwordless verification has expired. Please go back and verify again.', // UNTRANSLATED - invalid_verification: 'Can not store invalid passwordless verification.', // UNTRANSLATED + 'The verification was not successful. Restart the verification flow and try again.', // UNTRANSLATED + verification_expired: + 'The connection has timed out. Verify again to ensure your account safety.', // UNTRANSLATED unauthorized: "Veuillez vous enregistrer d'abord.", unsupported_prompt_name: "Nom d'invite non supporté.", }, diff --git a/packages/phrases/src/locales/ko-kr/errors.ts b/packages/phrases/src/locales/ko-kr/errors.ts index 442784256..eb752f5c4 100644 --- a/packages/phrases/src/locales/ko-kr/errors.ts +++ b/packages/phrases/src/locales/ko-kr/errors.ts @@ -41,7 +41,7 @@ const errors = { identity_exists: '소셜 계정이 이미 등록되있어요.', invalid_role_names: '직책 명({{roleNames}})이 유효하지 않아요.', cannot_delete_self: 'You cannot delete yourself.', // UNTRANSLATED - same_password: 'Your new password can not be the same as current password.', // UNTRANSLATED + same_password: 'Your new password can’t be the same as your current password.', // UNTRANSLATED }, password: { unsupported_encryption_method: '{{name}} 암호화 방법을 지원하지 않아요.', @@ -55,14 +55,10 @@ const errors = { insufficient_info: '로그인 정보가 충분하지 않아요.', connector_id_mismatch: '연동 ID가 세션 정보와 일치하지 않아요.', connector_session_not_found: '연동 세션을 찾을 수 없어요. 다시 로그인해주세요.', - forgot_password_session_not_found: - 'Forgot password session not found. Please go back and verify.', // UNTRANSLATED - forgot_password_verification_expired: - 'Forgot password verification has expired. Please go back and verify again.', // UNTRANSLATED verification_session_not_found: - 'Passwordless verification session not found. Please go back and retry.', // UNTRANSLATED - verification_expired: 'Passwordless verification has expired. Please go back and verify again.', // UNTRANSLATED - invalid_verification: 'Can not store invalid passwordless verification.', // UNTRANSLATED + 'The verification was not successful. Restart the verification flow and try again.', // UNTRANSLATED + verification_expired: + 'The connection has timed out. Verify again to ensure your account safety.', // UNTRANSLATED unauthorized: '로그인을 먼저 해주세요.', unsupported_prompt_name: '지원하지 않는 Prompt 이름이예요.', }, diff --git a/packages/phrases/src/locales/pt-pt/errors.ts b/packages/phrases/src/locales/pt-pt/errors.ts index b0895d95a..13576aaf1 100644 --- a/packages/phrases/src/locales/pt-pt/errors.ts +++ b/packages/phrases/src/locales/pt-pt/errors.ts @@ -41,7 +41,7 @@ const errors = { identity_exists: 'A conta social foi registada.', invalid_role_names: '({{roleNames}}) não são válidos', cannot_delete_self: 'Não se pode remover a si mesmo.', - same_password: 'Your new password can not be the same as current password.', // UNTRANSLATED + same_password: 'Your new password can’t be the same as your current password.', // UNTRANSLATED }, password: { unsupported_encryption_method: 'O método de enncriptação {{name}} não é suportado.', @@ -57,14 +57,10 @@ const errors = { connector_id_mismatch: 'O connectorId não corresponde ao registado na sessão.', connector_session_not_found: 'Sessão do conector não encontrada. Por favor, volte e faça login novamente.', - forgot_password_session_not_found: - 'Forgot password session not found. Please go back and verify.', // UNTRANSLATED - forgot_password_verification_expired: - 'Forgot password verification has expired. Please go back and verify again.', // UNTRANSLATED verification_session_not_found: - 'Passwordless verification session not found. Please go back and retry.', // UNTRANSLATED - verification_expired: 'Passwordless verification has expired. Please go back and verify again.', // UNTRANSLATED - invalid_verification: 'Can not store invalid passwordless verification.', // UNTRANSLATED + 'The verification was not successful. Restart the verification flow and try again.', // UNTRANSLATED + verification_expired: + 'The connection has timed out. Verify again to ensure your account safety.', // UNTRANSLATED unauthorized: 'Faça login primeiro.', unsupported_prompt_name: 'Nome de prompt não suportado.', }, diff --git a/packages/phrases/src/locales/tr-tr/errors.ts b/packages/phrases/src/locales/tr-tr/errors.ts index 0531e6eb0..0b5a530b3 100644 --- a/packages/phrases/src/locales/tr-tr/errors.ts +++ b/packages/phrases/src/locales/tr-tr/errors.ts @@ -42,7 +42,7 @@ const errors = { identity_exists: 'Sosyal platform hesabı kaydedildi.', invalid_role_names: '({{roleNames}}) rol adları geçerli değil.', cannot_delete_self: 'You cannot delete yourself.', // UNTRANSLATED - same_password: 'Your new password can not be the same as current password.', // UNTRANSLATED + same_password: 'Your new password can’t be the same as your current password.', // UNTRANSLATED }, password: { unsupported_encryption_method: '{{name}} şifreleme metodu desteklenmiyor.', @@ -57,14 +57,10 @@ const errors = { connector_id_mismatch: 'connectorId, oturum kaydı ile eşleşmiyor.', connector_session_not_found: 'Bağlayıcı oturum bulunamadı. Lütfen geri dönüp tekrardan giriş yapınız.', - forgot_password_session_not_found: - 'Forgot password session not found. Please go back and verify.', // UNTRANSLATED - forgot_password_verification_expired: - 'Forgot password verification has expired. Please go back and verify again.', // UNTRANSLATED verification_session_not_found: - 'Passwordless verification session not found. Please go back and retry.', // UNTRANSLATED - verification_expired: 'Passwordless verification has expired. Please go back and verify again.', // UNTRANSLATED - invalid_verification: 'Can not store invalid passwordless verification.', // UNTRANSLATED + 'The verification was not successful. Restart the verification flow and try again.', // UNTRANSLATED + verification_expired: + 'The connection has timed out. Verify again to ensure your account safety.', // UNTRANSLATED unauthorized: 'Lütfen önce oturum açın.', unsupported_prompt_name: 'Desteklenmeyen prompt adı.', }, diff --git a/packages/phrases/src/locales/zh-cn/errors.ts b/packages/phrases/src/locales/zh-cn/errors.ts index 188eb629f..a9ab40cd2 100644 --- a/packages/phrases/src/locales/zh-cn/errors.ts +++ b/packages/phrases/src/locales/zh-cn/errors.ts @@ -41,7 +41,7 @@ const errors = { identity_exists: '该社交帐号已被注册', invalid_role_names: '角色名称（{{roleNames}}）无效', cannot_delete_self: '你无法删除自己', - same_password: '新设置的密码不可与当前密码相同', + same_password: '为确保你的账户安全，新密码不能与旧密码一致', }, password: { unsupported_encryption_method: '不支持的加密方法 {{name}}', @@ -55,11 +55,8 @@ const errors = { insufficient_info: '登录信息缺失，请检查你的输入。', connector_id_mismatch: '传入的连接器 ID 与 session 中保存的记录不一致', connector_session_not_found: '无法找到连接器登录信息，请尝试重新登录。', - forgot_password_session_not_found: '无法找到忘记密码验证信息，请尝试重新验证。', - forgot_password_verification_expired: '忘记密码验证已过期，请尝试重新验证。', - verification_session_not_found: '无法找到无密码流程验证信息，请尝试重新验证。', + verification_session_not_found: '验证失败，请重新验证。', verification_expired: '无密码验证已过期。请返回重新验证。', - invalid_verification: '不要保存无效的无密码验证信息。', unauthorized: '请先登录', unsupported_prompt_name: '不支持的 prompt name', }, diff --git a/packages/ui/src/containers/ResetPassword/index.tsx b/packages/ui/src/containers/ResetPassword/index.tsx index 72ef45991..44586346d 100644 --- a/packages/ui/src/containers/ResetPassword/index.tsx +++ b/packages/ui/src/containers/ResetPassword/index.tsx @@ -47,11 +47,11 @@ const ResetPassword = ({ className, autoFocus }: Props) => { const resetPasswordErrorHandlers: ErrorHandlers = useMemo( () => ({ - 'session.forgot_password_session_not_found': async (error) => { + 'session.verification_session_not_found': async (error) => { await show({ type: 'alert', ModalContent: error.message, cancelText: 'action.got_it' }); navigate(-1); }, - 'session.forgot_password_verification_expired': async (error) => { + 'session.verification_expired': async (error) => { await show({ type: 'alert', ModalContent: error.message, cancelText: 'action.got_it' }); navigate(-1); },