diff options
| -rw-r--r-- | client/components/settings/settingBody.js | 11 | ||||
| -rw-r--r-- | i18n/en.i18n.json | 4 | ||||
| -rw-r--r-- | models/settings.js | 11 |
3 files changed, 17 insertions, 9 deletions
diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js index e2d0383f..5b015918 100644 --- a/client/components/settings/settingBody.js +++ b/client/components/settings/settingBody.js @@ -128,11 +128,14 @@ BlazeComponent.extendComponent({ sendSMTPTestEmail() { Meteor.call('sendSMTPTestEmail', (err, ret) => { if (!err && ret) { /* eslint-disable no-console */ - console.log('Success:', ret.message, ret.email); - alert('Success'); + const message = `${TAPi18n.__(ret.message)}: ${ret.email}`; + console.log(message); + alert(message); } else { - console.log('Error: Sending test email', err); - alert(err); + const reason = err.reason || ''; + const message = `${TAPi18n.__(err.error)}\n${reason}`; + console.log(message, err); + alert(message); } /* eslint-enable no-console */ }); }, diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 11a9eef6..91a06ed2 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -184,6 +184,7 @@ "email-enrollAccount-subject": "An account created for you on __siteName__", "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.", "email-fail": "Sending email failed", + "email-fail-text": "Error trying to send email", "email-invalid": "Invalid email", "email-invite": "Invite via Email", "email-invite-subject": "__inviter__ sent you an invitation", @@ -239,6 +240,7 @@ "initials": "Initials", "invalid-date": "Invalid date", "invalid-time": "Invalid time", + "invalid-user": "Invalid user", "joined": "joined", "just-invited": "You are just invited to this board", "keyboard-shortcuts": "Keyboard shortcuts", @@ -390,6 +392,8 @@ "invitation-code": "Invitation Code", "email-invite-register-subject": "__inviter__ sent you an invitation", "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to Wekan for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.", + "email-smtp-test-subject": "SMTP Test Email From Wekan", + "email-smtp-test-text": "You have successfully sent an email", "error-invitation-code-not-exist": "Invitation code doesn't exist", "error-notAuthorized": "You are not authorized to view this page.", "outgoing-webhooks": "Outgoing Webhooks", diff --git a/models/settings.js b/models/settings.js index a05f2272..34f693d9 100644 --- a/models/settings.js +++ b/models/settings.js @@ -144,22 +144,23 @@ if (Meteor.isServer) { sendSMTPTestEmail() { if (!Meteor.userId()) { - throw new Meteor.Error('error-invalid-user', 'Invalid user'); + throw new Meteor.Error('invalid-user'); } const user = Meteor.user(); if (!user.emails && !user.emails[0] && user.emails[0].address) { - throw new Meteor.Error('error-invalid-email', 'Invalid email'); + throw new Meteor.Error('email-invalid'); } this.unblock(); + const lang = user.getLanguage(); try { Email.send({ to: user.emails[0].address, from: Accounts.emailTemplates.from, - subject: 'SMTP Test Email From Wekan', - text: 'You have successfully sent an email', + subject: TAPi18n.__('email-smtp-test-subject', {lng: lang}), + text: TAPi18n.__('email-smtp-test-text', {lng: lang}), }); } catch ({message}) { - throw new Meteor.Error('error-email-send-failed', `Error trying to send email: ${ message }`, message); + throw new Meteor.Error('email-fail', `${TAPi18n.__('email-fail-text', {lng: lang})}: ${ message }`, message); } return { message: 'email-sent', |