From 787d822cd471d1e4bd5a37c687c78cd5f69d8645 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 27 Jul 2023 16:41:35 +0200 Subject: Rephrase emailer conflict error messages --- server/initializers/checker-after-init.ts | 6 +++--- server/middlewares/validators/config.ts | 2 +- server/middlewares/validators/server.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'server') diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts index 5ef72058b..4281e2bb5 100644 --- a/server/initializers/checker-after-init.ts +++ b/server/initializers/checker-after-init.ts @@ -139,16 +139,16 @@ function checkSecretsConfig () { function checkEmailConfig () { if (!isEmailEnabled()) { if (CONFIG.SIGNUP.ENABLED && CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION) { - throw new Error('Emailer is disabled but you require signup email verification.') + throw new Error('SMTP is not configured but you require signup email verification.') } if (CONFIG.SIGNUP.ENABLED && CONFIG.SIGNUP.REQUIRES_APPROVAL) { // eslint-disable-next-line max-len - logger.warn('Emailer is disabled but signup approval is enabled: PeerTube will not be able to send an email to the user upon acceptance/rejection of the registration request') + logger.warn('SMTP is not configured but signup approval is enabled: PeerTube will not be able to send an email to the user upon acceptance/rejection of the registration request') } if (CONFIG.CONTACT_FORM.ENABLED) { - logger.warn('Emailer is disabled so the contact form will not work.') + logger.warn('SMTP is not configured so the contact form will not work.') } } } diff --git a/server/middlewares/validators/config.ts b/server/middlewares/validators/config.ts index 4c1aa26c1..7790025e4 100644 --- a/server/middlewares/validators/config.ts +++ b/server/middlewares/validators/config.ts @@ -145,7 +145,7 @@ function checkInvalidConfigIfEmailDisabled (customConfig: CustomConfig, res: exp if (isEmailEnabled()) return true if (customConfig.signup.requiresEmailVerification === true) { - res.fail({ message: 'Emailer is disabled but you require signup email verification.' }) + res.fail({ message: 'SMTP is not configured but you require signup email verification.' }) return false } diff --git a/server/middlewares/validators/server.ts b/server/middlewares/validators/server.ts index d040e8a1f..7d37ae229 100644 --- a/server/middlewares/validators/server.ts +++ b/server/middlewares/validators/server.ts @@ -50,7 +50,7 @@ const contactAdministratorValidator = [ if (isEmailEnabled() === false) { return res.fail({ status: HttpStatusCode.CONFLICT_409, - message: 'Emailer is not enabled on this instance.' + message: 'SMTP is not configured on this instance.' }) } -- cgit v1.2.3