From 653beccf4b2426f76f8d86578213f6193bec4ee1 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 9 Feb 2019 15:25:12 +0900 Subject: [PATCH 01/25] Don't refer to a section which does not exist --- src/views/faq/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/faq/l10n.json b/src/views/faq/l10n.json index 33348b2d1..f93ac58a0 100644 --- a/src/views/faq/l10n.json +++ b/src/views/faq/l10n.json @@ -55,7 +55,7 @@ "faq.languagesScratch3Body2":"All of our translations are done by volunteers. The Scratch 3.0 editor has already been translated into 40+ languages. You can view all the languages currently being translated and reviewed on our {transifexLink}. If you want to help with translation or review, please contact {emailLink}.", "faq.transifexLinkText":"translation server", "faq.removedBlocksScratch3Title":"Does Scratch 3.0 remove any coding blocks from earlier versions of Scratch?", - "faq.removedBlocksScratch3Body":"No coding blocks have been removed in Scratch 3.0, but some have changed a bit and others have moved into \"Extensions\" (as described below, under \"Where did the Pen blocks go?..\").", + "faq.removedBlocksScratch3Body":"No coding blocks have been removed in Scratch 3.0, but some have changed a bit and others have moved into \"Extensions\".", "faq.newBlocksScratch3Title":"Does Scratch 3.0 introduce new blocks?", "faq.newBlocksScratch3Body":"Yes! In Scratch 3.0 you’ll find:", "faq.newBlocksSoundEffect":"New \"sound effect\" blocks", From e15f0c8baa91f8d17380370fe8200176fcd842ab Mon Sep 17 00:00:00 2001 From: jakel181 <17256688+jakel181@users.noreply.github.com> Date: Thu, 14 Feb 2019 11:08:19 -0500 Subject: [PATCH 02/25] Update privacypolicy.jsx --- src/views/privacypolicy/privacypolicy.jsx | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/privacypolicy/privacypolicy.jsx b/src/views/privacypolicy/privacypolicy.jsx index a7f82e44d..58914f805 100644 --- a/src/views/privacypolicy/privacypolicy.jsx +++ b/src/views/privacypolicy/privacypolicy.jsx @@ -378,17 +378,16 @@ const Privacypolicy = () => (

How does the Scratch Team protect my personal information?

The Scratch Team has in place administrative, physical, and - technical procedures that are intended to protect the - information we collect on the Scratch website against - accidental or unlawful destruction, accidental loss, - unauthorized alteration, unauthorized disclosure or access, - misuse, and any other unlawful form of processing of the - Personal Information in our possession. For example, we - strictly limit access to the Scratch servers and the data we - store on them. However, as effective as these measures are, - no security system is impenetrable. We cannot completely - guarantee the security of our databases, nor can we - guarantee that the information you supply will not be + technical procedures that are intended to protect the information + we collect on the Scratch website against accidental or unlawful + destruction, accidental loss, unauthorized alteration, unauthorized + disclosure or access, misuse, and any other unlawful form of + processing of the Personal Information in our possession. For example, + we use SSL/TLS for all data transfer and strictly limit access + to the Scratch servers and the data we store on them. However, + as effective as these measures are, no security system is impenetrable. + We cannot completely guarantee the security of our databases, nor + can we guarantee that the information you supply will not be intercepted while being transmitted to us over the Internet.

From ec87c9ee8fc5df310b8fb78860eb4cfec88c04c0 Mon Sep 17 00:00:00 2001 From: jakel181 <17256688+jakel181@users.noreply.github.com> Date: Thu, 14 Feb 2019 11:12:50 -0500 Subject: [PATCH 03/25] Update privacypolicy.jsx --- src/views/privacypolicy/privacypolicy.jsx | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/views/privacypolicy/privacypolicy.jsx b/src/views/privacypolicy/privacypolicy.jsx index 58914f805..0463a3920 100644 --- a/src/views/privacypolicy/privacypolicy.jsx +++ b/src/views/privacypolicy/privacypolicy.jsx @@ -378,17 +378,19 @@ const Privacypolicy = () => (

How does the Scratch Team protect my personal information?

The Scratch Team has in place administrative, physical, and - technical procedures that are intended to protect the information - we collect on the Scratch website against accidental or unlawful - destruction, accidental loss, unauthorized alteration, unauthorized - disclosure or access, misuse, and any other unlawful form of - processing of the Personal Information in our possession. For example, - we use SSL/TLS for all data transfer and strictly limit access + technical procedures that are intended to protect the + information we collect on the Scratch website against + accidental or unlawful destruction, accidental loss, + unauthorized alteration, unauthorized disclosure or access, + misuse, and any other unlawful form of processing of the + Personal Information in our possession. For example, we + use SSL/TLS for all data transfer and strictly limit access to the Scratch servers and the data we store on them. However, - as effective as these measures are, no security system is impenetrable. - We cannot completely guarantee the security of our databases, nor - can we guarantee that the information you supply will not be - intercepted while being transmitted to us over the Internet. + as effective as these measures are, no security system is + impenetrable. We cannot completely guarantee the security of + our databases, nor can we guarantee that the information you + supply will not be intercepted while being transmitted to us + over the Internet.

From 99a4408df3a96201db733a54f7ae6299db090d5e Mon Sep 17 00:00:00 2001 From: jakel181 <17256688+jakel181@users.noreply.github.com> Date: Thu, 14 Feb 2019 11:23:41 -0500 Subject: [PATCH 04/25] Update privacypolicy.jsx --- src/views/privacypolicy/privacypolicy.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/privacypolicy/privacypolicy.jsx b/src/views/privacypolicy/privacypolicy.jsx index 0463a3920..1591fecef 100644 --- a/src/views/privacypolicy/privacypolicy.jsx +++ b/src/views/privacypolicy/privacypolicy.jsx @@ -11,7 +11,7 @@ const Privacypolicy = () => (

- The Scratch Privacy Policy was last updated: May 23, 2018 + The Scratch Privacy Policy was last updated: February 14, 2019

From 752a90965c30c882a9153b923f0557f88748bf39 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Thu, 14 Feb 2019 14:12:50 -0500 Subject: [PATCH 05/25] in FAQ, added reference to Scratch Extensions to blocks change answer --- src/views/faq/faq.jsx | 9 ++++++++- src/views/faq/l10n.json | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/faq/faq.jsx b/src/views/faq/faq.jsx index a7fb6b9f3..557969351 100644 --- a/src/views/faq/faq.jsx +++ b/src/views/faq/faq.jsx @@ -147,7 +147,14 @@ const Faq = injectIntl(props => ( />

-
+
+ + )}} + /> +
); -module.exports = Navigation; +module.exports = injectIntl(Navigation); diff --git a/src/l10n.json b/src/l10n.json index 126c9c5b1..cd3e528d4 100644 --- a/src/l10n.json +++ b/src/l10n.json @@ -11,6 +11,9 @@ "general.community": "Community", "general.confirmEmail": "Confirm Email", "general.contactUs": "Contact Us", + "general.contact": "Contact", + "general.emailUs": "Email Us", + "general.conferences": "Conferences", "general.copyright": "Scratch is a project of the Lifelong Kindergarten Group at the MIT Media Lab", "general.copyrightDraft": "Scratch is a project of the Scratch Foundation in collaboration with the Lifelong Kindergarten Group at the MIT Media Lab.", "general.country": "Country", @@ -18,6 +21,7 @@ "general.credits": "Credits", "general.dmca": "DMCA", "general.emailAddress": "Email Address", + "general.english": "English", "general.error": "Oops! Something went wrong", "general.errorIdentifier": "Your error was logged with id {errorId}", "general.explore": "Explore", diff --git a/src/views/conference/2019/index/index.jsx b/src/views/conference/2019/index/index.jsx index 4197bfaa1..199f578e1 100644 --- a/src/views/conference/2019/index/index.jsx +++ b/src/views/conference/2019/index/index.jsx @@ -53,7 +53,7 @@ const ConferenceSplash = () => ( src="/svgs/conference/flags/cl.svg" />
-

+

Conferencia Scratch al Sur

@@ -117,7 +117,7 @@ const ConferenceSplash = () => ( /> - {'Español (Spanish) - simultaneous translation during plenary sessions'} + @@ -212,7 +212,7 @@ const ConferenceSplash = () => ( /> - {'English'} + @@ -306,7 +306,7 @@ const ConferenceSplash = () => ( /> - {'English'} + diff --git a/src/views/conference/2019/index/l10n.json b/src/views/conference/2019/index/l10n.json index fb9a962fc..e2bf39d61 100644 --- a/src/views/conference/2019/index/l10n.json +++ b/src/views/conference/2019/index/l10n.json @@ -25,7 +25,7 @@ "conference-2019.kenyaDesc": "In recognition of Africa's technological contributions to the world and the potential of the youth of Africa, Scratch2019NBO will be held in Nairobi, Kenya. Join educators from around the world to share lessons, empower young people, and celebrate accomplishments in creative coding.", "conference-2019.kenyaAudience": "Educators, students, and enthusiasts", - "conference-2019.chileTitle": "Conferencia Scratch al Sur", "conference-2019.chileDesc": "Scratch al Sur is a gathering for teachers and policy makers to learn about the importance of introducing programming languages in schools. All lectures and workshops will provide an opportunity to share different experiences, from higher levels to those who are beginning to participate in Scratch's global community.", - "conference-2019.chileAudience": "Teachers and policy makers" + "conference-2019.chileAudience": "Teachers and policy makers", + "conference-2019.spanishWithSimultaneous": "Spanish - simultaneous translation into English during plenary sessions" } From 7cbf6764e20339fc112801321b998ecab82adcc6 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Wed, 27 Feb 2019 17:00:58 -0500 Subject: [PATCH 22/25] updated route alias for conferences --- src/routes.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/routes.json b/src/routes.json index fa6a6fc64..24ed6c264 100644 --- a/src/routes.json +++ b/src/routes.json @@ -23,7 +23,7 @@ { "name": "conference-index", "pattern": "^/conference/?(\\?.*)?$", - "routeAlias": "/conference(?!/201[4-5])", + "routeAlias": "/conference(?!/201[4-9])", "view": "conference/2019/index/index", "title": "Scratch Conference", "viewportWidth": "device-width" @@ -31,7 +31,7 @@ { "name": "conference-index-2017", "pattern": "^/conference/2017/?$", - "routeAlias": "/conference(?!/201[4-5])", + "routeAlias": "/conference(?!/201[4-9])", "view": "conference/2017/index/index", "title": "Scratch Conference", "viewportWidth": "device-width" @@ -39,21 +39,21 @@ { "name": "conference-details-2018", "pattern": "^/conference/2018/:id/details/?$", - "routeAlias": "/conference(?!/201[4-5])", + "routeAlias": "/conference(?!/201[4-9])", "view": "conference/2018/details/details", "title": "Event Details" }, { "name": "conference-expectations-2018", "pattern": "^/conference/2018/expect/?$", - "routeAlias": "/conference(?!/201[4-5])", + "routeAlias": "/conference(?!/201[4-9])", "view": "conference/2018/expect/expect", "title": "What to Expect" }, { "name": "conference-index-2018", "pattern": "^/conference/2018/?$", - "routeAlias": "/conference(?!/201[4-5])", + "routeAlias": "/conference(?!/201[4-9])", "view": "conference/2018/index/index", "title": "Scratch Conference", "viewportWidth": "device-width" @@ -61,21 +61,21 @@ { "name": "conference-plan-2018", "pattern": "^/conference/2018/plan/?$", - "routeAlias": "/conference(?!/201[4-5])", + "routeAlias": "/conference(?!/201[4-9])", "view": "conference/2018/plan/plan", "title": "Plan Your Visit" }, { "name": "conference-schedule-2018", "pattern": "^/conference/2018/schedule/?$", - "routeAlias": "/conference(?!/201[4-5])", + "routeAlias": "/conference(?!/201[4-9])", "view": "conference/2018/schedule/schedule", "title": "Conference Schedule" }, { "name": "conference-index-2019", "pattern": "^/conference/2019/?$", - "routeAlias": "/conference(?!/201[4-5])", + "routeAlias": "/conference(?!/201[4-9])", "view": "conference/2019/index/index", "title": "Scratch Conference", "viewportWidth": "device-width" From 6e568ceae9f054f50b0f3e8a3135ae8a07a9e996 Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Thu, 28 Feb 2019 09:20:25 -0500 Subject: [PATCH 23/25] Bump GUI --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6653d60e9..337d8ee7f 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "react-responsive": "3.0.0", "react-slick": "0.16.0", "react-string-replace": "0.4.1", - "scratch-gui": "0.1.0-prerelease.20190220184137", + "scratch-gui": "0.1.0-prerelease.20190228140239", "react-telephone-input": "4.3.4", "redux": "3.5.2", "redux-thunk": "2.0.1", From 2a4e076339157502517cd67fca7d497a152605d1 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Thu, 28 Feb 2019 10:44:30 -0500 Subject: [PATCH 24/25] corrected mail list form; links use _blank; redirect conference url; logo links to main site --- .../navigation/conference/2019/navigation.jsx | 9 ++++++++- src/routes.json | 6 ++---- src/views/conference/2019/index/index.jsx | 10 +++++++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/components/navigation/conference/2019/navigation.jsx b/src/components/navigation/conference/2019/navigation.jsx index 6ad073f81..07480c94f 100644 --- a/src/components/navigation/conference/2019/navigation.jsx +++ b/src/components/navigation/conference/2019/navigation.jsx @@ -12,13 +12,20 @@ const Navigation = () => (

  • Scratch Logo + +
    • +
  • +

    diff --git a/src/routes.json b/src/routes.json index 24ed6c264..d9dc446eb 100644 --- a/src/routes.json +++ b/src/routes.json @@ -24,9 +24,7 @@ "name": "conference-index", "pattern": "^/conference/?(\\?.*)?$", "routeAlias": "/conference(?!/201[4-9])", - "view": "conference/2019/index/index", - "title": "Scratch Conference", - "viewportWidth": "device-width" + "redirect": "/conference/2019" }, { "name": "conference-index-2017", @@ -77,7 +75,7 @@ "pattern": "^/conference/2019/?$", "routeAlias": "/conference(?!/201[4-9])", "view": "conference/2019/index/index", - "title": "Scratch Conference", + "title": "Scratch Conferences", "viewportWidth": "device-width" }, { diff --git a/src/views/conference/2019/index/index.jsx b/src/views/conference/2019/index/index.jsx index 199f578e1..63300cbb6 100644 --- a/src/views/conference/2019/index/index.jsx +++ b/src/views/conference/2019/index/index.jsx @@ -135,6 +135,8 @@ const ConferenceSplash = () => (     @@ -230,6 +232,8 @@ const ConferenceSplash = () => ( @@ -324,6 +328,8 @@ const ConferenceSplash = () => ( @@ -340,7 +346,9 @@ const ConferenceSplash = () => ( From e6f1a701f19032b8cf79dac942d25b335407eea4 Mon Sep 17 00:00:00 2001 From: Ben Wheeler Date: Thu, 28 Feb 2019 10:57:44 -0500 Subject: [PATCH 25/25] use long version of mailing list url --- src/views/conference/2019/index/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/conference/2019/index/index.jsx b/src/views/conference/2019/index/index.jsx index 63300cbb6..999c5a02e 100644 --- a/src/views/conference/2019/index/index.jsx +++ b/src/views/conference/2019/index/index.jsx @@ -346,7 +346,7 @@ const ConferenceSplash = () => (