scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 17:45:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5121 from zoebentley/conference-update-march-2021-fixed-dependencies

Browse source 
Made changes to conf 2020 page (fixed dependencies)
This commit is contained in:
Sarah Otts 2021-03-16 15:05:48 -04:00 committed by GitHub
commit c3342d9224
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/views/conference/2020/index/index.jsx
View file

@ -3,7 +3,6 @@ const FormattedMessage = require('react-intl').FormattedMessage;
const React = require('react'); const React = require('react');
const render = require('../../../../lib/render.jsx'); 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 Page = require('../../../../components/page/conference/2020/page.jsx');
const TitleBanner = require('../../../../components/title-banner/title-banner.jsx'); const TitleBanner = require('../../../../components/title-banner/title-banner.jsx');
@ -32,9 +31,6 @@ const ConferenceSplash = () => (
<strong><FormattedMessage id="conference-2020.desc1a" /></strong> <strong><FormattedMessage id="conference-2020.desc1a" /></strong>
<br /> <br />
<br /> <br />
<FormattedMessage id="conference-2020.desc2" />
<br />
<br />
<FormattedMessage id="conference-2020.desc3" /> <FormattedMessage id="conference-2020.desc3" />
</p> </p>
<table className="conf2020-panel-details"> <table className="conf2020-panel-details">
@ -62,7 +58,6 @@ const ConferenceSplash = () => (
value={new Date(2021, 6, 24)} value={new Date(2021, 6, 24)}
year="numeric" year="numeric"
/> />
<FormattedMessage id="conference-2020.dateDescMore" />
</td> </td>
</tr> </tr>
<tr className="conf2020-panel-row"> <tr className="conf2020-panel-row">
@ -78,43 +73,16 @@ const ConferenceSplash = () => (
</tr> </tr>
</tbody> </tbody>
</table> </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 <a
className="button mod-2020-panel" className="button mod-2020-panel"
href="http://scratch2020.eventbrite.com/" href="http://scratch2020.eventbrite.com/"
> >
<FormattedMessage id="conference-2020.register" /> <FormattedMessage id="conference-2020.register" />
</a> </a>
</section> </section>
<section className="conf2020-panel mod-stay"> <section className="conf2020-panel mod-stay">
<p className="conf2020-panel-desc"> <p className="conf2020-panel-desc">
<FormattedMessage id="conference-2020.stayDesc1" />
<br />
<br />
<FormattedMessage <FormattedMessage
id="conference-2020.stayDesc2" id="conference-2020.stayDesc2"
values={{ values={{

23
src/views/conference/2020/index/l10n.json
View file

@ -1,27 +1,18 @@
{ {
"conference-2020.title": "Scratch Conference 2021:", "conference-2020.title": "Scratch Around the World:",
"conference-2020.subtitle": "Let's Create Together!", "conference-2020.subtitle": "An Online Conference",
"conference-2020.dateDesc": "July 22-24, 2021 | Cambridge, MA, USA", "conference-2020.dateDesc": "July 22",
"conference-2020.dateDescMore": " (with opening reception the evening of July 21)", "conference-2020.locationDetails": "Online",
"conference-2020.locationDetails": "MIT Media Lab, Cambridge, MA",
"conference-2020.date": "When:", "conference-2020.date": "When:",
"conference-2020.location": "Where:", "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.desc1": "Join us for Scratch Around the World, an online conference for educators interested in 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.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.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": "The conference will be free of charge.",
"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.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.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.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." "conference-2020.organizedBy": "The Scratch Conference is organized by the Lifelong Kindergarten group at the MIT Media Lab in collaboration with the Scratch Foundation."
} }