From e75caf8d7f0e863abd2f61f2848a5a5ac9801c2c Mon Sep 17 00:00:00 2001
From: Craig Cook <craigcook@users.noreply.github.com>
Date: Wed, 27 Jul 2016 10:20:56 -0700
Subject: [PATCH] [fix bug 1278380] Update newsletter thank you message

---
 .../templates/mozorg/contribute/friends.html   |  7 ++++---
 .../templates/newsletter/includes/macros.html  | 11 ++++++-----
 .../templates/newsletter/mozilla-and-you.html  |  4 ++--
 .../newsletter/one_newsletter_signup.html      | 18 ++++++++++++------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/bedrock/mozorg/templates/mozorg/contribute/friends.html b/bedrock/mozorg/templates/mozorg/contribute/friends.html
index e6f0d1e7802..afe6961b795 100644
--- a/bedrock/mozorg/templates/mozorg/contribute/friends.html
+++ b/bedrock/mozorg/templates/mozorg/contribute/friends.html
@@ -94,13 +94,14 @@ <h2>{{ _('Feedback') }}</h2>
   </div>{# /-- .ff-signup-wrapper #}
 
   <div id="newsletter-form-thankyou" class="thank newsletter-form newsletter-form-extra">
-    <h3>{{ _('Thanks! Please check your inbox to confirm your subscription to the Firefox Friends newsletter.') }}</h3>
+    <h3>{{ _('Thanks!') }}</h3>
 
     {# below matches text found in newsletter/includes/macros/email_form_thankyou() #}
     <p>
     {% trans %}
-      You'll receive an email from mozilla@e.mozilla.org to confirm your subscription.
-      If you don't see it, check your spam filter. You must confirm your subscription to receive our newsletter.
+      If you haven’t previously confirmed a subscription to a Mozilla-related
+      newsletter you may have to do so. Please check your inbox or your spam filter
+      for an email from us.
     {% endtrans %}
     </p>
   </div>
diff --git a/bedrock/newsletter/templates/newsletter/includes/macros.html b/bedrock/newsletter/templates/newsletter/includes/macros.html
index a0070414d61..a4da71bf716 100644
--- a/bedrock/newsletter/templates/newsletter/includes/macros.html
+++ b/bedrock/newsletter/templates/newsletter/includes/macros.html
@@ -5,11 +5,12 @@
 {% set_lang_files "mozorg/newsletters" %}
 
 {% macro email_form_thankyou() %}
-  <h3>{{ _('Thanks! Please check your inbox to confirm your subscription.') }}</h3>
+  <h3>{{ _('Thanks!') }}</h3>
   <p>
-    {% trans %}
-      You'll receive an email from mozilla@e.mozilla.org to confirm your subscription.
-      If you don't see it, check your spam filter. You must confirm your subscription to receive our newsletter.
-    {% endtrans %}
+  {% trans %}
+    If you haven’t previously confirmed a subscription to a Mozilla-related
+    newsletter you may have to do so. Please check your inbox or your spam filter
+    for an email from us.
+  {% endtrans %}
   </p>
 {% endmacro %}
diff --git a/bedrock/newsletter/templates/newsletter/mozilla-and-you.html b/bedrock/newsletter/templates/newsletter/mozilla-and-you.html
index 0eac00ca1d1..1c8ab0fafef 100644
--- a/bedrock/newsletter/templates/newsletter/mozilla-and-you.html
+++ b/bedrock/newsletter/templates/newsletter/mozilla-and-you.html
@@ -18,6 +18,6 @@ <h1 class="large">{{ _('Read all about it in our <span>newsletter</span>') }}</h
 {% endblock %}
 
 {% block success_confirm %}
-  <p>{% trans %}Thanks! Please check your inbox to confirm your subscription.{% endtrans %}</p>
-  <p>{% trans %}You'll receive an email from mozilla@e.mozilla.org to confirm your subscription. If you don't see it, check your spam filter. You must confirm your subscription to receive our newsletter.{% endtrans %}</p>
+  <h3>{{ _('Thanks!') }}</h3>
+  {{ super() }}
 {% endblock success_confirm %}
diff --git a/bedrock/newsletter/templates/newsletter/one_newsletter_signup.html b/bedrock/newsletter/templates/newsletter/one_newsletter_signup.html
index 8cb287e9939..8b3f16aa9bc 100644
--- a/bedrock/newsletter/templates/newsletter/one_newsletter_signup.html
+++ b/bedrock/newsletter/templates/newsletter/one_newsletter_signup.html
@@ -34,12 +34,18 @@
     {% else %}
       {# User has been subscribed #}
       <div id="email-form" class="thank billboard">
-        <h3>{{ _('Thanks for Subscribing!') }}</h3>
-        {# user will have to confirm before starting subscription #}
-        {% block success_confirm %}
-          <p>{% trans %}Thanks! Please check your inbox to confirm your subscription.{% endtrans %}</p>
-          <p>{% trans %}You'll receive an email from mozilla@e.mozilla.org to confirm your subscription. If you don't see it, check your spam filter. You must confirm your subscription to receive our newsletter.{% endtrans %}</p>
-        {% endblock success_confirm %}
+        <h3>{{ _('Thanks!') }}</h3>
+
+      {# user may have to confirm before starting subscription #}
+      {% block success_confirm %}
+        <p>
+        {% trans %}
+          If you haven’t previously confirmed a subscription to a Mozilla-related
+          newsletter you may have to do so. Please check your inbox or your spam filter
+          for an email from us.
+        {% endtrans %}
+        </p>
+      {% endblock success_confirm %}
       </div>
     {% endif %}
   </div><!-- doc -->