From 2dac018e57df80d9e31403c12dbde17b683c8a8e Mon Sep 17 00:00:00 2001 From: Stephanie Hobson Date: Fri, 24 Jul 2026 15:26:05 -0700 Subject: [PATCH] Make mozilla-foundation newsletter migration permanent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Route newsletter signups to `mozilla-foundation`, excluding ones specifically Firefox branded. - The `foundation-separate-newsletter` switch is retired and mozilla-foundation now unconditionally routes to FOUNDATION_SUBSCRIBE_URL. - Mozilla pages non-English fallback to Firefox now list the mozilla-foundation with available language options. - Default form titles and the new homepage hero copy are updated to use existing Mozilla-worded FTL strings. Issue / Bugzilla link n/a Testing - Verify form action equals FOUNDATION_SUBSCRIBE_URL on Mozilla pages in English and a non-English locale (home, /about/, /about/mission/, foundation pages, footer, /newsletter/) - Verify newsletter/family.html action equals BASKET_SUBSCRIBE_URL - Verify Foundation manage/unsubscribe links appear unconditionally on /newsletter/existing/ - Verify a Firefox page (e.g. newsletter/firefox.html) still uses mozilla-and-you → BASKET_SUBSCRIBE_URL with Firefox-worded copy - Follow the unsubcribe path for a Firefox newsletter --- .../protocol/footer/footer-newsletter.html | 2 +- .../foundation/annualreport/2009/base.html | 2 +- .../foundation/annualreport/2010/base.html | 2 +- .../foundation/templates/foundation/base.html | 2 +- bedrock/legal/templates/legal/index.html | 3 +- .../mozorg/templates/mozorg/about-base.html | 2 +- .../mozorg/templates/mozorg/about/index.html | 3 +- bedrock/mozorg/templates/mozorg/base.html | 6 +- .../templates/mozorg/home/home-new.html | 6 +- .../templates/mozorg/home/home-old.html | 3 +- bedrock/mozorg/templates/mozorg/mission.html | 4 +- .../templates/newsletter/family.html | 2 +- .../templates/newsletter/includes/form.html | 2 +- .../templates/newsletter/index.html | 2 +- .../templates/newsletter/management.html | 8 +-- .../templates/newsletter/mozilla.html | 8 --- bedrock/newsletter/templatetags/helpers.py | 5 +- bedrock/newsletter/tests/test_footer_form.py | 61 +++++++++---------- bedrock/newsletter/views.py | 3 +- bedrock/settings/base.py | 4 +- uv.lock | 2 +- 21 files changed, 59 insertions(+), 73 deletions(-) diff --git a/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html b/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html index ff8ff2eac67..05fdebde2d8 100644 --- a/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html +++ b/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html @@ -13,7 +13,7 @@
{{ email_newsletter_form( - newsletters='mozilla-foundation' if switch('foundation-separate-newsletter') else 'mozilla-foundation, mozilla-and-you', + newsletters='mozilla-foundation', title=None )}}
diff --git a/bedrock/foundation/templates/foundation/annualreport/2009/base.html b/bedrock/foundation/templates/foundation/annualreport/2009/base.html index 2545ffb7a9d..2f71ae5ccdc 100644 --- a/bedrock/foundation/templates/foundation/annualreport/2009/base.html +++ b/bedrock/foundation/templates/foundation/annualreport/2009/base.html @@ -45,7 +45,7 @@

{{ self.article_title() }}

{% if LANG.startswith('en-') %} {{ email_newsletter_form(newsletters='mozilla-foundation', title='Sign up. Read up.
Make a difference.'|safe, desc='Get the Mozilla newsletter and help us keep the Web free and open.', button_class='button-red') }} {% else %} - {{ email_newsletter_form(button_class='button-red') }} + {{ email_newsletter_form(newsletters='mozilla-foundation', button_class='button-red') }} {% endif %} diff --git a/bedrock/foundation/templates/foundation/annualreport/2010/base.html b/bedrock/foundation/templates/foundation/annualreport/2010/base.html index 4bb436ca453..c476489388c 100644 --- a/bedrock/foundation/templates/foundation/annualreport/2010/base.html +++ b/bedrock/foundation/templates/foundation/annualreport/2010/base.html @@ -45,7 +45,7 @@

{{ self.article_title() }}

{% if LANG.startswith('en-') %} {{ email_newsletter_form(newsletters='mozilla-foundation', title='Sign up. Read up.
Make a difference.'|safe, desc='Get the Mozilla newsletter and help us keep the Web free and open.', button_class='button-red') }} {% else %} - {{ email_newsletter_form(button_class='button-red') }} + {{ email_newsletter_form(newsletters='mozilla-foundation', button_class='button-red') }} {% endif %} diff --git a/bedrock/foundation/templates/foundation/base.html b/bedrock/foundation/templates/foundation/base.html index 437baf5f660..510ff3d5cec 100644 --- a/bedrock/foundation/templates/foundation/base.html +++ b/bedrock/foundation/templates/foundation/base.html @@ -49,7 +49,7 @@

{{ self.article_title() }}

{% if LANG.startswith('en-') %} {{ email_newsletter_form(newsletters='mozilla-foundation', title='Sign up. Read up.
Make a difference.'|safe, desc='Get the Mozilla newsletter and help us keep the Web free and open.', button_class='button-red') }} {% else %} - {{ email_newsletter_form(button_class='button-red') }} + {{ email_newsletter_form(newsletters='mozilla-foundation', button_class='button-red') }} {% endif %} diff --git a/bedrock/legal/templates/legal/index.html b/bedrock/legal/templates/legal/index.html index ea48a450e18..d127e91e46c 100644 --- a/bedrock/legal/templates/legal/index.html +++ b/bedrock/legal/templates/legal/index.html @@ -108,10 +108,11 @@

{{ ftl('legal-downloadable-software-notices') }}

{% if LANG.startswith('en-') %} {{ email_newsletter_form( + newsletters='mozilla-foundation', title='Love the Web?', desc='Get the Mozilla newsletter and help us keep it open and free.') }} {% else %} - {{ email_newsletter_form() }} + {{ email_newsletter_form(newsletters='mozilla-foundation') }} {% endif %}
diff --git a/bedrock/mozorg/templates/mozorg/about-base.html b/bedrock/mozorg/templates/mozorg/about-base.html index 0ca3aae0620..9617d7f7c0f 100644 --- a/bedrock/mozorg/templates/mozorg/about-base.html +++ b/bedrock/mozorg/templates/mozorg/about-base.html @@ -56,7 +56,7 @@

{{ ftl('vision-for-the-web') }}

{% if LANG.startswith('en-') %} {{ email_newsletter_form(newsletters='mozilla-foundation', title='Love the Web?', desc='Get the Mozilla newsletter and help us keep it open and free.', button_class='button-hollow button-light', spinner_color='#fff') }} {% else %} - {{ email_newsletter_form(button_class='button-hollow button-light', spinner_color='#fff') }} + {{ email_newsletter_form(newsletters='mozilla-foundation', button_class='button-hollow button-light', spinner_color='#fff') }} {% endif %} diff --git a/bedrock/mozorg/templates/mozorg/about/index.html b/bedrock/mozorg/templates/mozorg/about/index.html index 5bdbfb46b7f..1c861f00577 100644 --- a/bedrock/mozorg/templates/mozorg/about/index.html +++ b/bedrock/mozorg/templates/mozorg/about/index.html @@ -177,9 +177,8 @@

{{ ftl('about-toronto') }}

- {% set newsletter_id = 'mozilla-foundation' if LANG.startswith('en-') else 'mozilla-and-you' %} {{ email_newsletter_form( - newsletters=newsletter_id, + newsletters='mozilla-foundation', title=ftl('about-get-the-mozilla-newsletter'), desc=ftl('about-stay-informed-about-the-issues'), button_class='button-dark', diff --git a/bedrock/mozorg/templates/mozorg/base.html b/bedrock/mozorg/templates/mozorg/base.html index 4143b1028dd..368d63760a1 100644 --- a/bedrock/mozorg/templates/mozorg/base.html +++ b/bedrock/mozorg/templates/mozorg/base.html @@ -16,11 +16,7 @@
- {% if LANG.startswith('en-') %} - {{ email_newsletter_form(newsletters='mozilla-foundation', title=ftl('newsletter-form-get-mozilla-updates')) }} - {% else %} - {{ email_newsletter_form() }} - {% endif %} + {{ email_newsletter_form(newsletters='mozilla-foundation') }}
diff --git a/bedrock/mozorg/templates/mozorg/home/home-new.html b/bedrock/mozorg/templates/mozorg/home/home-new.html index edca0339d67..f6bdeb43be5 100644 --- a/bedrock/mozorg/templates/mozorg/home/home-new.html +++ b/bedrock/mozorg/templates/mozorg/home/home-new.html @@ -262,13 +262,13 @@

{{ ftl('home-that-one-time') }}

diff --git a/bedrock/newsletter/templates/newsletter/family.html b/bedrock/newsletter/templates/newsletter/family.html index 51e1bf9481e..1d7bb03cb30 100644 --- a/bedrock/newsletter/templates/newsletter/family.html +++ b/bedrock/newsletter/templates/newsletter/family.html @@ -37,7 +37,7 @@ {{ email_newsletter_form( title=newsletter_title|safe, desc='Firefox is made in part by lots of real-life, tired yet strangely optimistic parents, and we’re backed by an awesome non-profit too.', - newsletters='mozilla-and-you' if switch('foundation-separate-newsletter') else 'mozilla-foundation, mozilla-and-you', + newsletters='mozilla-and-you', button_class='mzp-t-dark', include_title=True, include_country=False, diff --git a/bedrock/newsletter/templates/newsletter/includes/form.html b/bedrock/newsletter/templates/newsletter/includes/form.html index 806e8574594..5ed7874bf88 100644 --- a/bedrock/newsletter/templates/newsletter/includes/form.html +++ b/bedrock/newsletter/templates/newsletter/includes/form.html @@ -22,7 +22,7 @@