From eabab89bd55e71ab369366752990f3aba5dba7cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zoe=CC=88=20Bentley?= <zoe.bentley.1@gmail.com>
Date: Wed, 10 Mar 2021 11:13:46 -0500
Subject: [PATCH 1/3] Made changes to conf 2020 page (fixed dependencies)

---
 src/views/conference/2020/index/index.jsx | 33 +----------------------
 src/views/conference/2020/index/l10n.json | 23 +++++-----------
 2 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/src/views/conference/2020/index/index.jsx b/src/views/conference/2020/index/index.jsx
index f380c73e2..60488e266 100644
--- a/src/views/conference/2020/index/index.jsx
+++ b/src/views/conference/2020/index/index.jsx
@@ -32,9 +32,6 @@ const ConferenceSplash = () => (
                     <strong><FormattedMessage id="conference-2020.desc1a" /></strong>
                     <br />
                     <br />
-                    <FormattedMessage id="conference-2020.desc2" />
-                    <br />
-                    <br />
                     <FormattedMessage id="conference-2020.desc3" />
                 </p>
                 <table className="conf2020-panel-details">
@@ -62,7 +59,6 @@ const ConferenceSplash = () => (
                                     value={new Date(2021, 6, 24)}
                                     year="numeric"
                                 />
-                                <FormattedMessage id="conference-2020.dateDescMore" />
                             </td>
                         </tr>
                         <tr className="conf2020-panel-row">
@@ -78,43 +74,16 @@ const ConferenceSplash = () => (
                         </tr>
                     </tbody>
                 </table>
-            </section>
-            <section className="conf2020-panel mod-registration">
-                <FlexRow className="conf2020-panel-title">
-                    <div className="conf2020-panel-title-text">
-                        <h3><FormattedMessage id="conference-2020.registrationTitle" /></h3>
-                    </div>
-                </FlexRow>
-                <p className="conf2020-panel-desc">
-                    <FormattedMessage id="conference-2020.registrationFee" />
-                    <br />
-                    <FormattedMessage id="conference-2020.registrationOpen" />
-                    <br />
-                    <br />
-                    <FormattedMessage id="conference-2020.registrationDelayed" />
-                    <br />
-                    <br />
-                    <FormattedMessage
-                        id="conference-2020.connectNow"
-                        values={{
-                            scratchInPracticeLink: <a href="https://sip.scratch.mit.edu/">
-                                <FormattedMessage id="conference-2020.scratchInPracticeText" />
-                            </a>
-                        }}
-                    />
-                </p>
                 <a
                     className="button mod-2020-panel"
                     href="http://scratch2020.eventbrite.com/"
                 >
                     <FormattedMessage id="conference-2020.register" />
                 </a>
+
             </section>
             <section className="conf2020-panel mod-stay">
                 <p className="conf2020-panel-desc">
-                    <FormattedMessage id="conference-2020.stayDesc1" />
-                    <br />
-                    <br />
                     <FormattedMessage
                         id="conference-2020.stayDesc2"
                         values={{
diff --git a/src/views/conference/2020/index/l10n.json b/src/views/conference/2020/index/l10n.json
index 2bdfd09e5..aed4293b4 100644
--- a/src/views/conference/2020/index/l10n.json
+++ b/src/views/conference/2020/index/l10n.json
@@ -1,27 +1,18 @@
 {
-    "conference-2020.title": "Scratch Conference 2021:",
-    "conference-2020.subtitle": "Let's Create Together!",
-    "conference-2020.dateDesc": "July 22-24, 2021 | Cambridge, MA, USA",
-    "conference-2020.dateDescMore": " (with opening reception the evening of July 21)",
-    "conference-2020.locationDetails": "MIT Media Lab, Cambridge, MA",
+    "conference-2020.title": "Scratch Around the World:",
+    "conference-2020.subtitle": "An Online Conference",
+    "conference-2020.dateDesc": "July 22-24, 2021",
+    "conference-2020.locationDetails": "Online",
 
     "conference-2020.date": "When:",
     "conference-2020.location": "Where:",
 
-    "conference-2020.desc1": "Join us for the Scratch Conference, an international gathering where educators, researchers, and developers share ideas for supporting creative learning with Scratch.",
-    "conference-2020.desc1a": "Due to the global health crisis, we have delayed the conference for one year, to July 22-24, 2021.",
-    "conference-2020.desc2": "Scratch has become the world's largest coding community for children around the world. The conference offers hands-on workshops, panel discussions, and interactive demonstrations to explore ways for using Scratch to expand creative learning experiences for diverse learners across subject areas.",
-    "conference-2020.desc3": "Together we'll exchange ideas and strategies on how to use Scratch to engage students in learning to think creatively, reason systematically, and work collaboratively—essential skills for everyone in today’s society.",
+    "conference-2020.desc1": "Join us for Scratch Around the World, an online conference for educators interested in creative learning with Scratch.",
+    "conference-2020.desc1a": "Although we are not able to meet in person this year, we are excited to find ways to connect and share with others in the global Scratch educator community.",
+    "conference-2020.desc3": "The conference will be free of charge.",
 
-    "conference-2020.registrationTitle": "Registration:",
-    "conference-2020.registrationFee": "Conference Fee: $250",
-    "conference-2020.registrationOpen": "The conference fee includes 7 meals (3 breakfast, 3 lunches, 1 dinner) plus refreshments during the day.",
-    "conference-2020.registrationDelayed": "In response to the coronavirus crisis (COVID-19), we have decided to delay the Scratch conference for one year, to July 22-24, 2021. We are sending well wishes to our entire global community and hope you can join us then!",
-    "conference-2020.connectNow": "Want to connect now? We invite you to learn more about our online conversations, resources, and events at {scratchInPracticeLink}.",
-    "conference-2020.scratchInPracticeText": "Scratch in Practice",
     "conference-2020.register": "Go to registration page",
 
-    "conference-2020.stayDesc1": "We will be posting revised lodging options at the beginning of 2021.",
     "conference-2020.stayDesc2": "For additional questions, contact the Scratch Conference Team at {emailLink}",
     "conference-2020.organizedBy": "The Scratch Conference is organized by the Lifelong Kindergarten group at the MIT Media Lab in collaboration with the Scratch Foundation."
 }

From da64706b0d16d9373288fe00c6015b7bead347f7 Mon Sep 17 00:00:00 2001
From: Sarah Otts <se0042@gmail.com>
Date: Fri, 12 Mar 2021 09:10:25 -0500
Subject: [PATCH 2/3] Remove unused FlexRow

---
 src/views/conference/2020/index/index.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/conference/2020/index/index.jsx b/src/views/conference/2020/index/index.jsx
index 60488e266..6574cd6f4 100644
--- a/src/views/conference/2020/index/index.jsx
+++ b/src/views/conference/2020/index/index.jsx
@@ -3,7 +3,6 @@ const FormattedMessage = require('react-intl').FormattedMessage;
 const React = require('react');
 const render = require('../../../../lib/render.jsx');
 
-const FlexRow = require('../../../../components/flex-row/flex-row.jsx');
 const Page = require('../../../../components/page/conference/2020/page.jsx');
 const TitleBanner = require('../../../../components/title-banner/title-banner.jsx');
 

From 9e74481db49ff35cadd03c3fcefd5744973fc5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zoe=CC=88=20Bentley?= <zoe.bentley.1@gmail.com>
Date: Tue, 16 Mar 2021 14:57:04 -0400
Subject: [PATCH 3/3] Changed the date to be only one day, July 22

---
 src/views/conference/2020/index/l10n.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/conference/2020/index/l10n.json b/src/views/conference/2020/index/l10n.json
index aed4293b4..5bef0abdc 100644
--- a/src/views/conference/2020/index/l10n.json
+++ b/src/views/conference/2020/index/l10n.json
@@ -1,7 +1,7 @@
 {
     "conference-2020.title": "Scratch Around the World:",
     "conference-2020.subtitle": "An Online Conference",
-    "conference-2020.dateDesc": "July 22-24, 2021",
+    "conference-2020.dateDesc": "July 22",
     "conference-2020.locationDetails": "Online",
 
     "conference-2020.date": "When:",