remove lang for foundation (mozilla#16834)

* remove lang for foundation
* Style fix
* Temporary disable lang dropdown test

Author: maureenlholland

bedrock/newsletter/templates/newsletter/includes/form.html

@@ -72,7 +72,7 @@ <h4 class="mzp-c-newsletter-subtitle">{{ subtitle }}</h4>
           <p>{{ form.country|safe }}</p>
         {% endif %}
 
-        {% if include_language %}
+        {% if include_language and not id =='mozilla-foundation' %}
           {{ form.lang.label_tag() }}
           <p>{{ form.lang|safe }}</p>
         {% else %}
@@ -92,7 +92,7 @@ <h4 class="mzp-c-newsletter-subtitle">{{ subtitle }}</h4>
           </fieldset>
         {% endif %}
 
-        <p>
+        <p class="c-checkbox-container">
           <label for="privacy" class="mzp-u-inline">
             <input type="checkbox" id="privacy" name="privacy" required aria-required="true" data-testid="newsletter-privacy-checkbox"> {{ ftl('newsletter-form-im-okay-with-mozilla', url=url('privacy.notices.websites')) }}
           </label>

bedrock/newsletter/tests/test_footer_form.py

@@ -40,28 +40,29 @@ def test_country_selected(self):
         doc = pq(resp.content)
         assert doc('#id_country option[selected="selected"]').val() == "br"
 
-    @override_settings(DEV=True)
-    def test_language_selected(self):
-        """
-        The correct language for the locale should be initially selected or
-        'en' if it's not an option.
-        """
-        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"
+    # Temporary disabling
+    # @override_settings(DEV=True)
+    # def test_language_selected(self):
+    #     """
+    #     The correct language for the locale should be initially selected or
+    #     'en' if it's not an option.
+    #     """
+    #     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"
+    #     # 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() == ""
+    #     # 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):

media/css/protocol/protocol-mozilla.scss

@@ -70,6 +70,10 @@
     transform: translate(-50%, -50%);
 }
 
+#newsletter-form .c-checkbox-container {
+    grid-column-start: 1;
+}
+
 // style classes automatically added by python to match Protocol form error styles
 .errorlist {
     @include white-links;