diff --git a/locales/en.js b/locales/en.js index 1bb1adb9..67309100 100644 --- a/locales/en.js +++ b/locales/en.js @@ -160,8 +160,9 @@ Adding this link to your feed reader will keep you up to date.`, remove_account_confirm: 'You are about to permanently delete your account', }, - err: { - register_error: 'Error during registration' + error: { + nick_taken: 'This nickname is already used', + email_taken: 'This email is already used' }, ordinal: { diff --git a/locales/it.js b/locales/it.js index 26870c58..d1c49790 100644 --- a/locales/it.js +++ b/locales/it.js @@ -165,8 +165,9 @@ export default { remove_account_confirm: 'Stai per eliminare definitivamente il tuo account', }, - err: { - register_error: 'Errore nella registrazione' + error: { + nick_taken: 'Questo nick è già presente', + email_taken: 'Questa email è già registrata' }, ordinal: { diff --git a/pages/register.vue b/pages/register.vue index c4ba32b8..c608ed8f 100644 --- a/pages/register.vue +++ b/pages/register.vue @@ -66,10 +66,10 @@ export default { }) this.$router.replace("/") } catch (e) { - const error = get(e, 'e.response.data.errors[0].message', String(e)) + const error = get(e, 'response.data.errors[0].message', String(e)) Message({ showClose: true, - message: this.$t('register.error') + this.$t(error), + message: this.$t(error), type: 'error' }) } diff --git a/server/api/models/user.js b/server/api/models/user.js index 078081b0..25c2c5cd 100644 --- a/server/api/models/user.js +++ b/server/api/models/user.js @@ -9,14 +9,14 @@ module.exports = (sequelize, DataTypes) => { const user = sequelize.define('user', { username: { type: DataTypes.STRING, - unique: true, + unique: { msg: 'error.username_taken' }, index: true, allowNull: false }, display_name: DataTypes.STRING, email: { type: DataTypes.STRING, - unique: true, + unique: { msg: 'error.email_taken' }, index: true, allowNull: false },