From 44d2d08353baa0f60f34031569d250414d0b8c14 Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Fri, 29 Sep 2023 13:00:47 +0200
Subject: [PATCH] Merge pull request #15037 from overleaf/rd-extend-b2s-promo

Extending Back to School 2023 promo

GitOrigin-RevId: 31055aac2c9b0b40e3308b5033bd3390ad0785de
---
 .../views/subscriptions/interstitial-payment.pug    |  2 +-
 .../interstitial-payment_no_nudge_monthly.pug       |  2 +-
 .../interstitial-payment_nudge_annual.pug           |  2 +-
 services/web/app/views/subscriptions/plans.pug      |  2 +-
 services/web/frontend/extracted-translations.json   |  5 +++--
 .../notifications/ads/back-to-school-modal.tsx      | 13 +++++++------
 services/web/locales/en.json                        |  6 +++---
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/services/web/app/views/subscriptions/interstitial-payment.pug b/services/web/app/views/subscriptions/interstitial-payment.pug
index 0bab801914..7e473d3077 100644
--- a/services/web/app/views/subscriptions/interstitial-payment.pug
+++ b/services/web/app/views/subscriptions/interstitial-payment.pug
@@ -29,7 +29,7 @@ block content
 								p
 									strong #{translate("back_to_school_banner_bargain_with_x_percent_off_in_school_or_not", {x: '15'})}
 									br
-									| #{translate("back_to_school_banner_hurry_offer_ends_sep_30")}
+									| #{translate("back_to_school_banner_extended_offer_oct_15")}
 							.notification-action
 								a.btn.btn-sm.btn-default-outline(
 									href="/about/back-to-school-promo-2023"
diff --git a/services/web/app/views/subscriptions/interstitial-payment_no_nudge_monthly.pug b/services/web/app/views/subscriptions/interstitial-payment_no_nudge_monthly.pug
index 1ba013e051..058dff9c25 100644
--- a/services/web/app/views/subscriptions/interstitial-payment_no_nudge_monthly.pug
+++ b/services/web/app/views/subscriptions/interstitial-payment_no_nudge_monthly.pug
@@ -29,7 +29,7 @@ block content
 								p
 									strong #{translate("back_to_school_banner_bargain_with_x_percent_off_in_school_or_not", {x: '15'})}
 									br
-									| #{translate("back_to_school_banner_hurry_offer_ends_sep_30")}
+									| #{translate("back_to_school_banner_extended_offer_oct_15")}
 							.notification-action
 								a.btn.btn-sm.btn-default-outline(
 									href="/about/back-to-school-promo-2023"
diff --git a/services/web/app/views/subscriptions/interstitial-payment_nudge_annual.pug b/services/web/app/views/subscriptions/interstitial-payment_nudge_annual.pug
index 996c2e215d..5b903848ac 100644
--- a/services/web/app/views/subscriptions/interstitial-payment_nudge_annual.pug
+++ b/services/web/app/views/subscriptions/interstitial-payment_nudge_annual.pug
@@ -29,7 +29,7 @@ block content
 								p
 									strong #{translate("back_to_school_banner_bargain_with_x_percent_off_in_school_or_not", {x: '15'})}
 									br
-									| #{translate("back_to_school_banner_hurry_offer_ends_sep_30")}
+									| #{translate("back_to_school_banner_extended_offer_oct_15")}
 							.notification-action
 								a.btn.btn-sm.btn-default-outline(
 									href="/about/back-to-school-promo-2023"
diff --git a/services/web/app/views/subscriptions/plans.pug b/services/web/app/views/subscriptions/plans.pug
index 91f0d6e22e..1676c70c67 100644
--- a/services/web/app/views/subscriptions/plans.pug
+++ b/services/web/app/views/subscriptions/plans.pug
@@ -29,7 +29,7 @@ block content
 									p
 										strong #{translate("back_to_school_banner_bargain_with_x_percent_off_in_school_or_not", {x: '15'})}
 										br
-										| #{translate("back_to_school_banner_hurry_offer_ends_sep_30")}
+										| #{translate("back_to_school_banner_extended_offer_oct_15")}
 								.notification-action
 									a.btn.btn-sm.btn-default-outline(
 										href="/about/back-to-school-promo-2023"
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 34ac83fdcf..0c2ac778c1 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -90,8 +90,9 @@
   "autocomplete": "",
   "autocomplete_references": "",
   "back": "",
-  "back_to_school_modal_bargain_with_x_percent_off": "",
-  "back_to_school_modal_offer_ends_sep_30": "",
+  "back_to_school_banner_extended_offer_oct_15": "",
+  "back_to_school_banner_x_percent_off": "",
+  "back_to_school_bargain_for_everyone": "",
   "back_to_school_modal_offers_from_writefull_and_papers": "",
   "back_to_subscription": "",
   "back_to_your_projects": "",
diff --git a/services/web/frontend/js/features/project-list/components/notifications/ads/back-to-school-modal.tsx b/services/web/frontend/js/features/project-list/components/notifications/ads/back-to-school-modal.tsx
index 1e561db012..5ec57eabb0 100644
--- a/services/web/frontend/js/features/project-list/components/notifications/ads/back-to-school-modal.tsx
+++ b/services/web/frontend/js/features/project-list/components/notifications/ads/back-to-school-modal.tsx
@@ -76,9 +76,9 @@ export default function BackToSchoolModal() {
 
   return (
     <AccessibleModal show={showModal} onHide={handleHide}>
-      <Modal.Header closeButton>
-        <Modal.Title>
-          {t('back_to_school_modal_bargain_with_x_percent_off', { x: '15' })}
+      <Modal.Header style={{ borderBottom: 'none' }} closeButton>
+        <Modal.Title style={{ fontSize: '20px' }}>
+          {t('back_to_school_bargain_for_everyone')}
         </Modal.Title>
       </Modal.Header>
       <Modal.Body className="modal-body-share">
@@ -91,10 +91,11 @@ export default function BackToSchoolModal() {
             }}
           />
         </p>
+        <strong style={{ fontSize: '20px' }}>
+          {t('back_to_school_banner_x_percent_off', { x: '15' })}
+        </strong>
         <p>{t('back_to_school_modal_offers_from_writefull_and_papers')}</p>
-        <p>
-          <strong>{t('back_to_school_modal_offer_ends_sep_30')}</strong>
-        </p>
+        <p>{t('back_to_school_banner_extended_offer_oct_15')}</p>
       </Modal.Body>
       <Modal.Footer>
         <Button bsStyle="default" onClick={handleMaybeLater}>
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 97947d72be..ac8ac883e2 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -143,10 +143,10 @@
   "back_to_editor": "Back to the editor",
   "back_to_log_in": "Back to log in",
   "back_to_school_banner_bargain_with_x_percent_off_in_school_or_not": "Grab a back-to-school bargain with __x__% off all individual Overleaf subscriptions (whether you’re in school or not!)",
-  "back_to_school_banner_hurry_offer_ends_sep_30": "Hurry! Offer ends September 30.",
+  "back_to_school_banner_extended_offer_oct_15": "Don’t miss out! Offer extended to October 15.",
+  "back_to_school_banner_x_percent_off": "__x__% off all individual Overleaf subscriptions",
+  "back_to_school_bargain_for_everyone": "Back-to-school bargains for everyone",
   "back_to_school_homepage_bargain_with_x_percent_off": "Grab a back-to-school bargain with __x__% off all individual Overleaf subscriptions",
-  "back_to_school_modal_bargain_with_x_percent_off": "Everyone can grab a back-to-school bargain this fall with __x__% off an Overleaf subscription",
-  "back_to_school_modal_offer_ends_sep_30": "Offer ends September 30.",
   "back_to_school_modal_offers_from_writefull_and_papers": "And with offers from Writefull and Papers too, you’ll have the tools you need to write smarter this year.",
   "back_to_subscription": "Back to Subscription",
   "back_to_your_projects": "Back to your projects",