diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-27 16:41:35 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-07-27 16:41:35 +0200 |
commit | 787d822cd471d1e4bd5a37c687c78cd5f69d8645 (patch) | |
tree | 6b49c10cdb0450f2531fdc52edd49f32dec3d5c2 /server | |
parent | 809fecf2b4683bd0e9890233f8a707c59e25134b (diff) | |
download | PeerTube-787d822cd471d1e4bd5a37c687c78cd5f69d8645.tar.gz PeerTube-787d822cd471d1e4bd5a37c687c78cd5f69d8645.tar.zst PeerTube-787d822cd471d1e4bd5a37c687c78cd5f69d8645.zip |
Rephrase emailer conflict error messages
Diffstat (limited to 'server')
-rw-r--r-- | server/initializers/checker-after-init.ts | 6 | ||||
-rw-r--r-- | server/middlewares/validators/config.ts | 2 | ||||
-rw-r--r-- | server/middlewares/validators/server.ts | 2 |
3 files changed, 5 insertions, 5 deletions
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 () { | |||
139 | function checkEmailConfig () { | 139 | function checkEmailConfig () { |
140 | if (!isEmailEnabled()) { | 140 | if (!isEmailEnabled()) { |
141 | if (CONFIG.SIGNUP.ENABLED && CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION) { | 141 | if (CONFIG.SIGNUP.ENABLED && CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION) { |
142 | throw new Error('Emailer is disabled but you require signup email verification.') | 142 | throw new Error('SMTP is not configured but you require signup email verification.') |
143 | } | 143 | } |
144 | 144 | ||
145 | if (CONFIG.SIGNUP.ENABLED && CONFIG.SIGNUP.REQUIRES_APPROVAL) { | 145 | if (CONFIG.SIGNUP.ENABLED && CONFIG.SIGNUP.REQUIRES_APPROVAL) { |
146 | // eslint-disable-next-line max-len | 146 | // eslint-disable-next-line max-len |
147 | 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') | 147 | 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') |
148 | } | 148 | } |
149 | 149 | ||
150 | if (CONFIG.CONTACT_FORM.ENABLED) { | 150 | if (CONFIG.CONTACT_FORM.ENABLED) { |
151 | logger.warn('Emailer is disabled so the contact form will not work.') | 151 | logger.warn('SMTP is not configured so the contact form will not work.') |
152 | } | 152 | } |
153 | } | 153 | } |
154 | } | 154 | } |
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 | |||
145 | if (isEmailEnabled()) return true | 145 | if (isEmailEnabled()) return true |
146 | 146 | ||
147 | if (customConfig.signup.requiresEmailVerification === true) { | 147 | if (customConfig.signup.requiresEmailVerification === true) { |
148 | res.fail({ message: 'Emailer is disabled but you require signup email verification.' }) | 148 | res.fail({ message: 'SMTP is not configured but you require signup email verification.' }) |
149 | return false | 149 | return false |
150 | } | 150 | } |
151 | 151 | ||
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 = [ | |||
50 | if (isEmailEnabled() === false) { | 50 | if (isEmailEnabled() === false) { |
51 | return res.fail({ | 51 | return res.fail({ |
52 | status: HttpStatusCode.CONFLICT_409, | 52 | status: HttpStatusCode.CONFLICT_409, |
53 | message: 'Emailer is not enabled on this instance.' | 53 | message: 'SMTP is not configured on this instance.' |
54 | }) | 54 | }) |
55 | } | 55 | } |
56 | 56 | ||