Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

Improved failed email error messages

Browse source 
refs https://ghost.slack.com/archives/C02G9E68C/p1673570945616369?thread_ts=1672700158.659209&cid=C02G9E68C

Fixed a typo in the error messages and made the errors more clear. Also hide the email configuration part when there is no email configuration.
This commit is contained in:
Simon Backx 2023-01-20 18:36:33 +01:00
parent 56b0e65583
commit 693216c29e
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.hbs
View file

@ -11,8 +11,10 @@
<p class="gh-publish-confirmation">
{{this.emailErrorMessage}}
{{#unless this.config.mailgunIsConfigured}}
<br><br>
Please verify your email settings if the error persists.
If the error persists, please verify your email settings.
{{/unless}}
</p>
{{#if this.retryErrorMessage}}

2
ghost/admin/app/components/editor/modals/publish-flow/complete-with-email-error.js
View file

@ -2,6 +2,7 @@ import Component from '@glimmer/component';
import EmailFailedError from 'ghost-admin/errors/email-failed-error';
import {CONFIRM_EMAIL_MAX_POLL_LENGTH, CONFIRM_EMAIL_POLL_LENGTH} from '../../publish-management';
import {htmlSafe} from '@ember/template';
import {inject} from 'ghost-admin/decorators/inject';
import {isServerUnreachableError} from 'ghost-admin/services/ajax';
import {task, timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
@ -13,6 +14,7 @@ function isString(str) {
export default class PublishFlowCompleteWithEmailError extends Component {
@tracked newEmailErrorMessage;
@tracked retryErrorMessage;
@inject config;
get emailErrorMessage() {
return this.newEmailErrorMessage || this.args.emailErrorMessage;

4
ghost/email-service/lib/batch-sending-service.js
View file

@ -4,8 +4,8 @@ const errors = require('@tryghost/errors');
const tpl = require('@tryghost/tpl');
const messages = {
emailErrorPartialFailure: 'The email was only partially send',
emailError: 'Email failed to send'
emailErrorPartialFailure: 'An error occurred, and your newsletter was only partially sent. Please retry sending the remaining emails.',
emailError: 'An unexpected error occurred, please retry sending your newsletter.'
};
/**