Review fixes

bedrock/firefox/templates/firefox/nothing-personal/index.html

@@ -192,7 +192,7 @@ <h4><span aria-hidden="true">[</span>Sign up for our newsletter<span aria-hidden
               include_language=False,
               include_country=False,
               newsletters='mozilla-and-you, nothing-personal-college-interest',
-              multi_opt_in=True
+              multi_opt_in_required=True
             )}}
 
             <p>By subscribing, you’ll receive Mozilla updates, plus exclusive college-related content if you opt in. You may unsubscribe from either at any time.</p>

bedrock/newsletter/forms.py

@@ -189,10 +189,9 @@ class NewsletterFooterForm(forms.Form):
 
     # has to take a newsletters argument so it can figure
     # out which languages to list in the form.
-    def __init__(self, newsletters, locale, data=None, multi_opt_in=False, *args, **kwargs):
+    def __init__(self, newsletters, locale, data=None, multi_opt_in_required=False, *args, **kwargs):
         regions = product_details.get_regions(locale)
         regions = sorted(iter(regions.items()), key=itemgetter(1))
-        is_multi_newsletter = "," in newsletters
 
         try:
             if isinstance(newsletters, str):
@@ -203,6 +202,7 @@ def __init__(self, newsletters, locale, data=None, multi_opt_in=False, *args, **
             # form validation will work with submitted data
             newsletters = ["mozilla-and-you"]
 
+        is_multi_newsletter = len(newsletters) > 1
         lang = locale.lower()
         if "-" in lang:
             lang, country = lang.split("-", 1)
@@ -235,7 +235,7 @@ def __init__(self, newsletters, locale, data=None, multi_opt_in=False, *args, **
         self.fields["newsletters"].choices = [(n, self.choice_labels.get(n, n)) for n in newsletters]
 
         # Automatically check newsletter choices unless opt-in is explicitly required.
-        if is_multi_newsletter and multi_opt_in:
+        if is_multi_newsletter and multi_opt_in_required:
             self.fields["newsletters"].initial = None
         else:
             self.fields["newsletters"].initial = newsletters

bedrock/newsletter/templatetags/helpers.py

@@ -38,7 +38,7 @@ def email_newsletter_form(
     spinner_color=None,
     email_label=None,
     email_placeholder=None,
-    multi_opt_in=False,
+    multi_opt_in_required=False,  # switches multi-newsletter forms to be opt-in rather than pre-checked.
 ):
     request = ctx["request"]
     context = ctx.get_all()
@@ -50,7 +50,7 @@ def email_newsletter_form(
 
     form = ctx.get("newsletter_form", None)
     if not form:
-        form = NewsletterFooterForm(newsletters, get_locale(request), multi_opt_in=multi_opt_in)
+        form = NewsletterFooterForm(newsletters, get_locale(request), multi_opt_in_required=multi_opt_in_required)
 
     if isinstance(newsletters, list):
         newsletters = ", ".join(newsletters)