(
values={{
emailLink:
conference@scratch.mit.edu
- ,
- registrationLink:
-
}}
/>
diff --git a/src/views/conference/2020/index/l10n.json b/src/views/conference/2020/index/l10n.json
index 20582749b..2bdfd09e5 100644
--- a/src/views/conference/2020/index/l10n.json
+++ b/src/views/conference/2020/index/l10n.json
@@ -1,26 +1,27 @@
{
- "conference-2020.title": "Scratch Conference 2020:",
+ "conference-2020.title": "Scratch Conference 2021:",
"conference-2020.subtitle": "Let's Create Together!",
- "conference-2020.dateDesc": "July 23-25, 2020 | Cambridge, MA, USA",
- "conference-2020.dateDescMore": " (with opening reception the evening of July 22)",
+ "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.seeBelow": "Learn more about conference dates and locations below.",
"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.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": "We have delayed the opening of registration until April 3. We’re excited to gather together as a community in July, but we are closely monitoring the situation around the Coronavirus (COVID-19) to determine how it might impact our plans. We will provide more information as it becomes available.",
+ "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 have organized for conference rates at three hotels in the area for Scratch Conference participants, including: {hyattLink} (1.2 miles: 24 minute walk), {acLink} (2.3 miles, 25 minutes by subway), and the {allstonLink} (4.4 miles, 35 minutes by bus+subway). To reserve a room, click the link for that hotel. We recommend booking as soon as possible as the discounted rates are subject to availability. We're also planning to offer a lower-cost, college dormitory option; we'll post information as soon as it's available. You can also explore other hotel and housing options that work best for you.",
- "conference-2020.stayDesc2": "Please see the {registrationLink} for more details. For additional questions, contact the Scratch Conference Team at {emailLink}",
- "conference-2020.registrationLinkText": "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."
}
diff --git a/src/views/contact-us/contact-us.jsx b/src/views/contact-us/contact-us.jsx
index 613d99418..3f042bcad 100644
--- a/src/views/contact-us/contact-us.jsx
+++ b/src/views/contact-us/contact-us.jsx
@@ -7,8 +7,11 @@ const Page = require('../../components/page/www/page.jsx');
const render = require('../../lib/render.jsx');
const HelpForm = require('../../components/helpform/helpform.jsx');
+const HelpWidget = require('../../components/helpwidget/helpwidget.jsx');
+const {CONTACT_US_POPUP} = require('../../lib/feature-flags.js');
const InformationPage = require('../../components/informationpage/informationpage.jsx');
+require('./contact-us.scss');
class ContactUs extends React.Component {
constructor (props) {
@@ -18,65 +21,123 @@ class ContactUs extends React.Component {
body: ''
};
const query = window.location.search;
- // assumes that scratchr2 will only ever send one parameter
+ let scratchId = '';
// The subject is not localized because sending in English is easier for Scratch Team
if (query.indexOf('studio=') !== -1) {
- this.state.subject = `Inappropriate content reported in studio ${query.split('=')[1]}`;
- this.state.body = `https://scratch.mit.edu/studios/${query.split('=')[1]}`;
+ scratchId = query.match(/studio=([0-9]+)/)[1];
+ this.state.subject = `Inappropriate content reported in studio ${scratchId}`;
+ this.state.body = `https://scratch.mit.edu/studios/${scratchId}`;
} else if (query.indexOf('profile=') !== -1) {
- this.state.subject = `Inappropriate content reported in profile ${query.split('=')[1]}`;
- this.state.body = `https://scratch.mit.edu/users/${query.split('=')[1]}`;
+ scratchId = query.match(/profile=([a-zA-Z0-9-_]+)/)[1];
+ this.state.subject = `Inappropriate content reported in profile ${scratchId}`;
+ this.state.body = `https://scratch.mit.edu/users/${scratchId}`;
} else if (query.indexOf('confirmation=') !== -1) {
this.state.subject = 'Problem with email confirmation';
}
}
render () {
return (
-
-
-
-
-
- )}}
- />
-
-
-
+
+ {!CONTACT_US_POPUP && (
+
+
+
+
)}}
- />
-
+ />
+
+
+
+ )}}
+ />
+
+ )}}
+ />
+
+ )}}
+ />
+
+
+
+
+ )}
+ {CONTACT_US_POPUP && (
+
+
+
+
+
+
+
)}}
- />
-
- )}}
- />
-
-
-
-
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )}}
+ />
+
+
+
+
+ )}
-
+ {!CONTACT_US_POPUP && (
+
+ )}
);
}
diff --git a/src/views/contact-us/contact-us.scss b/src/views/contact-us/contact-us.scss
new file mode 100644
index 000000000..9076f95a5
--- /dev/null
+++ b/src/views/contact-us/contact-us.scss
@@ -0,0 +1,8 @@
+#contact-us.helpwidget {
+ margin-bottom: 0;
+}
+.contact-us {
+ .gethelp-button {
+ margin-bottom: 2rem;
+ }
+}
diff --git a/src/views/contact-us/l10n.json b/src/views/contact-us/l10n.json
index 85054b2df..0a1828b89 100644
--- a/src/views/contact-us/l10n.json
+++ b/src/views/contact-us/l10n.json
@@ -12,5 +12,13 @@
"contactUs.bugsLinkText":"Bugs and Glitches",
"contactUs.formIntro":"If you still need to contact us, please fill out the form below with as much detail as you can. If you have any screenshots, attachments or links that help to explain your problem, please include them. We get a lot of mail, so we may not be able to respond to your message.",
"contactUs.findHelp":"Where to find help:",
- "contactUs.contactScratch":"Contact the Scratch Team"
+ "contactUs.contactScratch":"Contact the Scratch Team",
+ "contactUs.qTitle":"Questions",
+ "contactUs.seeFaq":"See the FAQ",
+ "contactUs.faqInfo":"You can find a list of answers to many questions about Scratch on our {faqLink} page.",
+ "contactUs.askCommunity":"Ask the Community",
+ "contactUs.forumsIntro":"You can also look through and post questions in the Scratch Discussion forums.",
+ "contactUs.forumsHelp":"There are many friendly and experienced Scratch community members who can help with the following topics and more:",
+ "contactUs.needSupport":"Need Support?",
+ "contactUs.supportInfo":"Click {helpLink} to type in a question about anything related to Scratch or to contact us. The Scratch Team receives lots of messages each day and is not able to answer each one individually, so we encourage you to read our online support articles and participate in the Discussion forums."
}
diff --git a/src/views/splash/l10n.json b/src/views/splash/l10n.json
index 203bbe276..7ecb0fbc6 100644
--- a/src/views/splash/l10n.json
+++ b/src/views/splash/l10n.json
@@ -42,5 +42,8 @@
"welcome.welcomeToScratch": "Welcome to Scratch!",
"welcome.learn": "Learn how to make a project in Scratch",
"welcome.tryOut": "Try out starter projects",
- "welcome.connect": "Connect with other Scratchers"
+ "welcome.connect": "Connect with other Scratchers",
+
+ "activity.seeUpdates": "This is where you will see updates from Scratchers you follow",
+ "activity.checkOutScratchers": "Check out some Scratchers you might like to follow"
}
diff --git a/src/views/splash/presentation.jsx b/src/views/splash/presentation.jsx
index 9a973e59b..030bb1b70 100644
--- a/src/views/splash/presentation.jsx
+++ b/src/views/splash/presentation.jsx
@@ -178,16 +178,10 @@ class ActivityList extends React.Component {
key="activity-empty"
>