From 85a77388e2b301c2a478c8fa8ff2f71bbc976490 Mon Sep 17 00:00:00 2001
From: Rish <zrishabhgarg@gmail.com>
Date: Tue, 30 Jun 2020 11:57:18 +0530
Subject: [PATCH] Refined email newsletter error messages

refs https://github.com/TryGhost/Ghost/issues/11971

- Updates error messages incorrectly pointing to invalid mailgun config to show more generic error
- Needs to be updated to point to correct error message in future
---
 ghost/admin/app/components/gh-post-settings-menu/email.hbs | 4 ++--
 ghost/admin/app/components/gh-post-settings-menu/email.js  | 4 ++--
 ghost/admin/app/components/modal-confirm-email-send.hbs    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ghost/admin/app/components/gh-post-settings-menu/email.hbs b/ghost/admin/app/components/gh-post-settings-menu/email.hbs
index b26e0af596..ffca058f17 100644
--- a/ghost/admin/app/components/gh-post-settings-menu/email.hbs
+++ b/ghost/admin/app/components/gh-post-settings-menu/email.hbs
@@ -51,9 +51,9 @@
             <div class="pa5 pt3 pb3 f7 bb b--whitegrey">
                 <p class="mb2 lh-copy">
                     {{#if this.session.user.isOwner}}
-                        Email failed to send when publishing this post. Please <LinkTo @route="settings.labs">check your Mailgun configuration</LinkTo> if the error persists.
+                        Email failed to send when publishing this post. Please verify your email settings if the error persists.
                     {{else}}
-                        Email failed to send when publishing this post. Please check your Mailgun configuration if the error persists.
+                        Email failed to send when publishing this post. Please verify your email settings if the error persists.
                     {{/if}}
                 </p>
                 <p class="ma0 pa0">
diff --git a/ghost/admin/app/components/gh-post-settings-menu/email.js b/ghost/admin/app/components/gh-post-settings-menu/email.js
index c029f7f163..9b3e9a55fe 100644
--- a/ghost/admin/app/components/gh-post-settings-menu/email.js
+++ b/ghost/admin/app/components/gh-post-settings-menu/email.js
@@ -75,7 +75,7 @@ export default Component.extend({
                 return false;
             }
             if (!this.settings.get('bulkEmailSettings.isEnabled')) {
-                this.set('sendTestEmailError', 'Please check your Mailgun configuration');
+                this.set('sendTestEmailError', 'Please verify your email settings');
                 return false;
             }
             this.set('sendTestEmailError', '');
@@ -88,7 +88,7 @@ export default Component.extend({
             return yield this.ajax.post(url, options);
         } catch (error) {
             if (error) {
-                this.set('sendTestEmailError', 'Error sending mail, please check your Mailgun configuration');
+                this.set('sendTestEmailError', 'Email could not be sent, verify mail settings');
             }
         }
     }).drop(),
diff --git a/ghost/admin/app/components/modal-confirm-email-send.hbs b/ghost/admin/app/components/modal-confirm-email-send.hbs
index e346132e3d..3e45c44aee 100644
--- a/ghost/admin/app/components/modal-confirm-email-send.hbs
+++ b/ghost/admin/app/components/modal-confirm-email-send.hbs
@@ -33,9 +33,9 @@
 
     <div class="modal-body">
         {{#if this.session.user.isOwner}}
-            <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>Your post has been published but the email failed to send. Please verify your email settings if the error persists.</p>
         {{else}}
-            <p>Your post has been published but the email failed to send. Please check your Mailgun configuration if the error persists.</p>
+            <p>Your post has been published but the email failed to send. Please verify your email settings if the error persists.</p>
         {{/if}}
         <p class="mb0">
             <button type="button" class="gh-btn gh-btn-text regular" {{action (toggle "errorDetailsOpen" this)}} data-test-toggle-error>