diff --git a/app/src/i18n/locales/en.json b/app/src/i18n/locales/en.json index 7a6557a..66965eb 100644 --- a/app/src/i18n/locales/en.json +++ b/app/src/i18n/locales/en.json @@ -55,5 +55,15 @@ "not_registered": "Don't have an account?", "continue_as_guest": "Continue as Guest", "password_rules": "At least 8 characters, including uppercase and lowercase letters and numbers" + }, + "authform_error": { + "too_many_requests": "Too many requests, please try again in 2 minutes", + "unauthorized": "Invalid username or password", + "auth_failed": "Something went wrong", + "invalid_username": "Invalid username", + "invalid_email": "Invalid email", + "invalid_password": "Invalid password", + "username_taken": "Username is already taken", + "email_taken": "Email is already taken" } } diff --git a/app/src/i18n/locales/zh-TW.json b/app/src/i18n/locales/zh-TW.json index a7352ad..701f7f5 100644 --- a/app/src/i18n/locales/zh-TW.json +++ b/app/src/i18n/locales/zh-TW.json @@ -55,5 +55,15 @@ "not_registered": "還沒有帳號嗎?", "continue_as_guest": "以訪客身分繼續", "password_rules": "至少 8 個字元,包含數字及大小寫字母" + }, + "authform_error": { + "too_many_requests": "太多請求,兩分鐘後再試一次", + "unauthorized": "無效的帳號名稱或密碼", + "auth_failed": "出了點問題", + "invalid_username": "無效的帳號名稱", + "invalid_email": "無效的電子郵件", + "invalid_password": "無效的密碼", + "username_taken": "帳號名稱已被使用", + "email_taken": "電子郵件已被使用" } } diff --git a/app/src/utils/auth.ts b/app/src/utils/auth.ts index 4b7e058..c79be1c 100644 --- a/app/src/utils/auth.ts +++ b/app/src/utils/auth.ts @@ -1,4 +1,5 @@ import api from './api' +import { i18n } from '../i18n' import { TooManyRequestsError, @@ -32,11 +33,15 @@ function handleRequestError(err: { const { path, msg } = errors[0] switch (path) { case 'username': - throw new ValidationError('Username is already taken') + throw new ValidationError( + i18n.global.t('authform_error.username_taken') + ) case 'email': - throw new ValidationError('Email is already taken') + throw new ValidationError(i18n.global.t('authform_error.email_taken')) case 'password': - throw new ValidationError('Password is too weak') + throw new ValidationError( + i18n.global.t('authform_error.invalid_password') + ) default: throw new ValidationError(msg) } diff --git a/app/src/views/LoginPage.vue b/app/src/views/LoginPage.vue index 97f5a3e..0c22fea 100644 --- a/app/src/views/LoginPage.vue +++ b/app/src/views/LoginPage.vue @@ -1,4 +1,5 @@ diff --git a/app/src/views/RegisterPage.vue b/app/src/views/RegisterPage.vue index 3f72db5..db5ae9f 100644 --- a/app/src/views/RegisterPage.vue +++ b/app/src/views/RegisterPage.vue @@ -1,4 +1,5 @@