From 3a5da15661ad2a825810a90adba3778085f622f5 Mon Sep 17 00:00:00 2001
From: maureenlholland <maureen.holland11@gmail.com>
Date: Tue, 10 Dec 2024 12:50:41 -0500
Subject: [PATCH 1/2] Update footer newsletter text and signups (fixes #15585)

Removes initial newsletter string, it cannot be used as a fallback
because the new newsletter sign-up includes more than just Firefox
content.
---
 .../protocol/footer/footer-newsletter.html    |  4 +-
 l10n/en/footer-refresh.ftl                    |  2 +-
 .../css/m24/components/footer-newsletter.scss | 38 ++++++++++---------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html b/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html
index b37152d8eef..99a8bf128a7 100644
--- a/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html
+++ b/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html
@@ -8,12 +8,12 @@
   <div class="moz24-newsletter-wrapper">
     <div class="moz24-newsletter-info">
       <img loading="lazy" class="moz24-newsletter-image" src="{{ static('img/logos/m24/symbol-white.svg') }}" alt="" width="40" height="48">
-      <p>{{ ftl('footer-refresh-get-the-best') }}</p>
+      <p>{{ ftl('footer-refresh-discover-mozilla-products') }}</p>
     </div>
 
     <div class="moz24-newsletter">
       {{ email_newsletter_form(
-        newsletters='mozilla-and-you',
+        newsletters='mozilla-foundation, mozilla-and-you',
         title=None
         )}}
       </div>
diff --git a/l10n/en/footer-refresh.ftl b/l10n/en/footer-refresh.ftl
index 98c43f215a6..832b8549578 100644
--- a/l10n/en/footer-refresh.ftl
+++ b/l10n/en/footer-refresh.ftl
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-footer-refresh-get-the-best = Get the best { -brand-name-firefox } tips, tricks and updates. We promise to keep your email private and secure — just the best of { -brand-name-firefox } sent straight to your inbox.
+footer-refresh-discover-mozilla-products =Discover { -brand-name-mozilla } products and initiatives. We promise to keep your email private and secure — no sharing, no selling, just great updates.
 footer-refresh-leadership = Leadership
 footer-refresh-advertise = Advertise with { -brand-name-mozilla }
 footer-refresh-firefox-release-notes = { -brand-name-firefox } Release Notes
diff --git a/media/css/m24/components/footer-newsletter.scss b/media/css/m24/components/footer-newsletter.scss
index 979bcd3fb21..00dba04f09d 100644
--- a/media/css/m24/components/footer-newsletter.scss
+++ b/media/css/m24/components/footer-newsletter.scss
@@ -195,9 +195,26 @@ $max-footer-content-width: $content-max;
 
         @media #{$mq-lg} {
             display: grid;
-            grid-template-columns: 1fr 1fr;
-            grid-template-rows: 30px 45px 75px;
+            grid-template-columns: [full-width-start] 1fr 1fr [full-width-end];
             column-gap: $spacer-lg;
+
+            > * {
+                grid-column: full-width;
+            }
+
+            // country input
+            label:first-of-type,
+            p:first-of-type {
+                grid-column-start: 1;
+                grid-column-end: 2;
+            }
+
+            // lang input
+            label:nth-of-type(2),
+            p:nth-of-type(2) {
+                grid-column-start: 2;
+                grid-column-end: 3;
+            }
         }
 
         p {
@@ -209,25 +226,10 @@ $max-footer-content-width: $content-max;
 
             @media #{$mq-lg} {
                 display: inline-grid;
-
-                &:first-of-type {
-                    grid-column-start: 1;
-                    grid-column-end: 2;
-                }
-
-                &:nth-of-type(2) {
-                    grid-column-start: 2;
-                    grid-column-end: 3;
-                }
             }
 
             &:has(> label.mzp-u-inline) {
-                margin: $spacer-lg 0 $spacer-md;
-
-                @media #{$mq-lg} {
-                    grid-column-start: 1;
-                    grid-column-end: 3;
-                }
+                margin-bottom: $spacer-lg;
 
                 input {
                     margin: 0;

From 35fb4e14bd326897c0e795b0be83dbf60d4dad67 Mon Sep 17 00:00:00 2001
From: maureenlholland <maureen.holland11@gmail.com>
Date: Tue, 10 Dec 2024 14:18:21 -0500
Subject: [PATCH 2/2] Add fallback string from newsletter_form.ftl

---
 .../templates/includes/protocol/footer/footer-newsletter.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html b/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html
index 99a8bf128a7..a1f7bf109f9 100644
--- a/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html
+++ b/bedrock/base/templates/includes/protocol/footer/footer-newsletter.html
@@ -8,7 +8,7 @@
   <div class="moz24-newsletter-wrapper">
     <div class="moz24-newsletter-info">
       <img loading="lazy" class="moz24-newsletter-image" src="{{ static('img/logos/m24/symbol-white.svg') }}" alt="" width="40" height="48">
-      <p>{{ ftl('footer-refresh-discover-mozilla-products') }}</p>
+      <p>{{ ftl('footer-refresh-discover-mozilla-products', fallback='newsletter-form-we-will-only-send-v2') }}</p>
     </div>
 
     <div class="moz24-newsletter">