Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Updated email copy

Browse source
This commit is contained in:
Peter Zimon 2019-11-26 12:10:51 +01:00
parent b06484553f
commit 727a38d5d1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ghost/admin/app/components/gh-post-settings-menu/email.js
View file

@ -75,7 +75,7 @@ export default Component.extend({
return false; return false;
} }
if (!this.settings.get('bulkEmailSettings.isEnabled')) { if (!this.settings.get('bulkEmailSettings.isEnabled')) {
this.set('sendTestEmailError', 'Please configure Mailgun in Labs → Members'); this.set('sendTestEmailError', 'Please check your Mailgun configuration');
return false; return false;
} }
this.set('sendTestEmailError', ''); this.set('sendTestEmailError', '');
@ -88,7 +88,7 @@ export default Component.extend({
return yield this.ajax.post(url, options); return yield this.ajax.post(url, options);
} catch (error) { } catch (error) {
if (error) { if (error) {
this.set('sendTestEmailError', 'Error sending mail, please check your Mailgun config in Labs → Members'); this.set('sendTestEmailError', 'Error sending mail, please check your Mailgun configuration');
} }
} }
}).drop(), }).drop(),

2
ghost/admin/app/templates/components/gh-post-settings-menu/email.hbs
View file

@ -50,7 +50,7 @@
</div> </div>
<div class="pa5 pt3 pb3 f7 bb b--whitegrey"> <div class="pa5 pt3 pb3 f7 bb b--whitegrey">
<p class="mb2 lh-copy"> <p class="mb2 lh-copy">
Email failed to send when publishing this post. Please check your <LinkTo @route="settings.labs">Mailgun configuration</LinkTo> under Labs → Members if the error persists. Email failed to send when publishing this post. Please <LinkTo @route="settings.labs">check your Mailgun configuration</LinkTo> if the error persists.
</p> </p>
<p class="ma0 pa0"> <p class="ma0 pa0">
<table class="ma0" style="table-layout: fixed"> <table class="ma0" style="table-layout: fixed">

2
ghost/admin/app/templates/components/modal-confirm-email-send.hbs
View file

@ -32,7 +32,7 @@
<button class="close" title="Close" {{on "click" this.closeModal}}>{{svg-jar "close"}}<span class="hidden">Close</span></button> <button class="close" title="Close" {{on "click" this.closeModal}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
<div class="modal-body"> <div class="modal-body">
<p>Your post has been published but the email failed to send. Please check your <LinkTo @route="settings.labs">Mailgun configuration</LinkTo> under Labs → Members if the error persists.</p> <p>Your post has been published but the email failed to send. Please <LinkTo @route="settings.labs">check your Mailgun configuration</LinkTo> if the error persists.</p>
<p class="mb0"> <p class="mb0">
<button type="button" class="gh-btn gh-btn-text regular" {{action (toggle "errorDetailsOpen" this)}} <button type="button" class="gh-btn gh-btn-text regular" {{action (toggle "errorDetailsOpen" this)}}
data-test-toggle-error> data-test-toggle-error>