{{ email_newsletter_form(
- newsletters='mozilla-and-you',
+ newsletters='mozilla-foundation',
title=None,
button_class='button-dark',
)}}
diff --git a/bedrock/mozorg/templates/mozorg/home/home-old.html b/bedrock/mozorg/templates/mozorg/home/home-old.html
index 93a25b5fba3..3d64ec05868 100644
--- a/bedrock/mozorg/templates/mozorg/home/home-old.html
+++ b/bedrock/mozorg/templates/mozorg/home/home-old.html
@@ -184,11 +184,12 @@
{{ ftl('home-need-help') }}
{% if ftl_has_messages('multi-newsletter-form-title', 'multi-newsletter-form-desc', 'multi-newsletter-form-checkboxes-legend') %}
{{ email_newsletter_form(
- newsletters='mozilla-foundation' if switch('foundation-separate-newsletter') else 'mozilla-foundation, mozilla-and-you',
+ newsletters='mozilla-foundation',
button_class='button-dark'
)}}
{% else %}
{{ email_newsletter_form(
+ newsletters='mozilla-foundation',
button_class='button-dark',
submit_text=ftl('newsletter-form-sign-up-now')
)}}
diff --git a/bedrock/mozorg/templates/mozorg/mission.html b/bedrock/mozorg/templates/mozorg/mission.html
index 38f29dfd6e7..5ce8d373153 100644
--- a/bedrock/mozorg/templates/mozorg/mission.html
+++ b/bedrock/mozorg/templates/mozorg/mission.html
@@ -65,13 +65,13 @@
diff --git a/bedrock/newsletter/templates/newsletter/mozilla.html b/bedrock/newsletter/templates/newsletter/mozilla.html
index 54773942aaa..a07bf719bfb 100644
--- a/bedrock/newsletter/templates/newsletter/mozilla.html
+++ b/bedrock/newsletter/templates/newsletter/mozilla.html
@@ -32,15 +32,7 @@
{{ self.page_title() }}
{{ self.page_desc() }}
- {% if ftl_has_messages('multi-newsletter-form-title', 'multi-newsletter-form-desc', 'multi-newsletter-form-checkboxes-legend') %}
- {{ email_newsletter_form(
- newsletters='mozilla-foundation' if switch('foundation-separate-newsletter') else 'mozilla-foundation, mozilla-and-you',
- include_title=False,
- button_class='button-dark'
- )}}
- {% else %}
{{ email_newsletter_form(newsletters='mozilla-foundation', include_title=False, spinner_color='#c13832') }}
- {% endif %}
diff --git a/bedrock/newsletter/templatetags/helpers.py b/bedrock/newsletter/templatetags/helpers.py
index 4489c2959d9..48f96d3cd87 100644
--- a/bedrock/newsletter/templatetags/helpers.py
+++ b/bedrock/newsletter/templatetags/helpers.py
@@ -11,7 +11,6 @@
from django_jinja import library
from markupsafe import Markup
-from bedrock.base.waffle import switch
from bedrock.newsletter.forms import NewsletterFooterForm
from lib.l10n_utils import get_locale
@@ -46,9 +45,9 @@ def email_newsletter_form(
context = ctx.get_all()
languages_override = None
- if switch("foundation-separate-newsletter") and newsletters == "mozilla-foundation":
+ if newsletters == "mozilla-foundation":
action = settings.FOUNDATION_SUBSCRIBE_URL
- languages_override = settings.FOUNDATION_SUBSCRIBE_AVAILABLE_LANGUAGUES
+ languages_override = settings.FOUNDATION_SUBSCRIBE_AVAILABLE_LANGUAGES
else:
action = settings.BASKET_SUBSCRIBE_URL
diff --git a/bedrock/newsletter/tests/test_footer_form.py b/bedrock/newsletter/tests/test_footer_form.py
index 54ba5e11509..d118912aab9 100644
--- a/bedrock/newsletter/tests/test_footer_form.py
+++ b/bedrock/newsletter/tests/test_footer_form.py
@@ -8,7 +8,6 @@
from django.test.utils import override_settings
from pyquery import PyQuery as pq
-from waffle.testutils import override_switch
from bedrock.base.urlresolvers import reverse
from bedrock.mozorg.tests import TestCase
@@ -47,43 +46,43 @@ def test_language_selected(self):
The correct language for the locale should be initially selected or
'en' if it's not an option.
"""
- for foundation_separate_newsletter_enabled in (True, False):
- with self.subTest(foundation_separate_newsletter_enabled=foundation_separate_newsletter_enabled):
- with override_switch("FOUNDATION_SEPARATE_NEWSLETTER", active=foundation_separate_newsletter_enabled):
- with self.activate_locale("fr"):
- resp = self.client.get(reverse(self.view_name))
- doc = pq(resp.content)
- assert doc('#id_lang option[selected="selected"]').val() == "fr"
-
- # with hyphenated regional locale, should have only lang
- with self.activate_locale("pt-BR"):
- resp = self.client.get(reverse(self.view_name))
- doc = pq(resp.content)
- assert doc('#id_lang option[selected="selected"]').val() == "pt"
-
- # not supported. should default to ''
- with self.activate_locale("af"):
- resp = self.client.get(reverse(self.view_name))
- doc = pq(resp.content)
- assert doc('#id_lang option[selected="selected"]').val() == ""
+ with self.activate_locale("fr"):
+ resp = self.client.get(reverse(self.view_name))
+ doc = pq(resp.content)
+ assert doc('#id_lang option[selected="selected"]').val() == "fr"
+
+ # with hyphenated regional locale, should have only lang
+ with self.activate_locale("pt-BR"):
+ resp = self.client.get(reverse(self.view_name))
+ doc = pq(resp.content)
+ assert doc('#id_lang option[selected="selected"]').val() == "pt"
+
+ # not supported. should default to ''
+ with self.activate_locale("af"):
+ resp = self.client.get(reverse(self.view_name))
+ doc = pq(resp.content)
+ assert doc('#id_lang option[selected="selected"]').val() == ""
@override_settings(DEV=True)
def test_newsletter_action(self):
"""
Newsletter points to correct POST URL.
+ The /newsletter/ page uses mozilla-foundation, which always posts to FOUNDATION_SUBSCRIBE_URL.
"""
+ with self.activate_locale("en-US"):
+ resp = self.client.get(reverse(self.view_name))
+ doc = pq(resp.content)
+ assert doc("#newsletter-form").attr("action") == settings.FOUNDATION_SUBSCRIBE_URL
- with override_switch("FOUNDATION_SEPARATE_NEWSLETTER", active=True):
- with self.activate_locale("en-US"):
- resp = self.client.get(reverse(self.view_name))
- doc = pq(resp.content)
- assert doc("#newsletter-form").attr("action") == settings.FOUNDATION_SUBSCRIBE_URL
-
- with override_switch("FOUNDATION_SEPARATE_NEWSLETTER", active=False):
- with self.activate_locale("en-US"):
- resp = self.client.get(reverse(self.view_name))
- doc = pq(resp.content)
- assert doc("#newsletter-form").attr("action") == settings.BASKET_SUBSCRIBE_URL
+ @override_settings(DEV=True)
+ def test_non_foundation_newsletter_routes_to_basket(self):
+ """
+ Non-Foundation newsletters post to BASKET_SUBSCRIBE_URL.
+ """
+ with self.activate_locale("en-US"):
+ resp = self.client.get(reverse("newsletter.family"))
+ doc = pq(resp.content)
+ assert doc("#newsletter-form").attr("action") == settings.BASKET_SUBSCRIBE_URL
@patch(
diff --git a/bedrock/newsletter/views.py b/bedrock/newsletter/views.py
index ecee8ff0253..94ae3208838 100644
--- a/bedrock/newsletter/views.py
+++ b/bedrock/newsletter/views.py
@@ -217,7 +217,8 @@ def recovery(request):
def newsletter_subscribe(request):
if request.method == "POST":
newsletters = request.POST.getlist("newsletters")
- form = NewsletterFooterForm(newsletters, l10n_utils.get_locale(request), request.POST)
+ languages_override = settings.FOUNDATION_SUBSCRIBE_AVAILABLE_LANGUAGES if newsletters == ["mozilla-foundation"] else None
+ form = NewsletterFooterForm(newsletters, l10n_utils.get_locale(request), request.POST, languages_override=languages_override)
errors = []
if form.is_valid():
data = form.cleaned_data
diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py
index aeea9f9dee2..11390beb953 100644
--- a/bedrock/settings/base.py
+++ b/bedrock/settings/base.py
@@ -927,8 +927,8 @@ def _is_bedrock_custom_app(app_name):
# Custom languages for the Foundation signup form; need specifying directly
# because the form config is not provided by Basket
-FOUNDATION_SUBSCRIBE_AVAILABLE_LANGUAGUES = config(
- "FOUNDATION_SUBSCRIBE_AVAILABLE_LANGUAGUES",
+FOUNDATION_SUBSCRIBE_AVAILABLE_LANGUAGES = config(
+ "FOUNDATION_SUBSCRIBE_AVAILABLE_LANGUAGES",
default="en,de,fr,es,pl,pt",
parser=ListOf(str),
)
diff --git a/uv.lock b/uv.lock
index 9431a635b11..bda0207302b 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1,3 +1,3 @@
version = 1
revision = 3
-requires-python = ">=3.11"
+requires-python = ">=3.13"