diff --git a/bin/lib/localized-urls.json b/bin/lib/localized-urls.json index 5b85d12e0..67d248d61 100644 --- a/bin/lib/localized-urls.json +++ b/bin/lib/localized-urls.json @@ -1,11 +1,17 @@ { "en": { - "cards.starterLink": "//scratch.mit.edu/scratchr2/static/pdfs/help/Scratch2Cards.pdf", - "cards.nameLink": "//scratch.mit.edu/scratchr2/static/pdfs/help/AnimateYourNameCards.pdf", - "cards.pongLink": "//scratch.mit.edu/scratchr2/static/pdfs/help/PongCards.pdf", - "cards.storyLink": "//scratch.mit.edu/scratchr2/static/pdfs/help/StoryCards.pdf", - "cards.danceLink": "//scratch.mit.edu/scratchr2/static/pdfs/help/DanceCards.pdf", - "cards.hideLink": "//scratch.mit.edu/scratchr2/static/pdfs/help/Hide-and-Seek-Cards.pdf" + "cards.starterLink": "/pdfs/cards/Scratch2Cards.pdf", + "cards.nameLink": "/pdfs/cards/AnimateYourNameCards.pdf", + "cards.flyLink": "/pdfs/cards/FlyCards.pdf", + "cards.raceLink": "/pdfs/cards/RaceGameCards.pdf", + "cards.musicLink": "/pdfs/cards/MusicCards.pdf", + "cards.hideLink": "/pdfs/cards/Hide-and-Seek-Cards.pdf", + "cards.storyLink": "/pdfs/cards/StoryCards.pdf", + "cards.dressupLink": "/pdfs/cards/DressupCards.pdf", + "cards.pongLink": "/pdfs/cards/PongCards.pdf", + "cards.danceLink": "/pdfs/cards/DanceCards.pdf", + "cards.catchLink": "/pdfs/cards/CatchCards.pdf", + "cards.petLink": "/pdfs/cards/PetCards.pdf" }, "ar": { "cards.starterLink": "//cdn.scratch.mit.edu/scratchr2/static/pdfs/help/ar/Scratch2Cards.pdf" diff --git a/languages.json b/languages.json index 53df38654..6616751c9 100644 --- a/languages.json +++ b/languages.json @@ -34,7 +34,6 @@ "it": "Italiano", "kn": "ಭಾಷೆ-ಹೆಸರು", "rw": "Kinyarwanda", - "km": "សំលៀកបំពាក", "ht": "Kreyòl", "ku": "Kurdî", "la": "Latina", diff --git a/src/redux/session.js b/src/redux/session.js index 49dd51823..e0a2bbbee 100644 --- a/src/redux/session.js +++ b/src/redux/session.js @@ -10,6 +10,12 @@ var Types = keyMirror({ SET_STATUS: null }); +var banWhitelistPaths = [ + '/accounts/banned-response/', + '/community_guidelines/', + '/community_guidelines' +]; + module.exports.Status = keyMirror({ FETCHED: null, NOT_FETCHED: null, @@ -71,7 +77,7 @@ module.exports.refreshSession = function () { if ( body.user && body.user.banned && - window.location.pathname !== '/accounts/banned-response/') { + banWhitelistPaths.indexOf(window.location.pathname) === -1) { return window.location = '/accounts/banned-response/'; } else if ( body.flags && diff --git a/src/views/cards/cards.jsx b/src/views/cards/cards.jsx index d9d59a497..1c47dfd82 100644 --- a/src/views/cards/cards.jsx +++ b/src/views/cards/cards.jsx @@ -21,40 +21,60 @@ var Cards = injectIntl(React.createClass({ var locale = this.props.intl.locale || 'en'; var formatMessage = this.props.intl.formatMessage; var englishLinks = { - 'cards.starterLink': '//scratch.mit.edu/scratchr2/static/pdfs/help/Scratch2Cards.pdf', - 'cards.nameLink': '//scratch.mit.edu/scratchr2/static/pdfs/help/AnimateYourNameCards.pdf', - 'cards.pongLink': '//scratch.mit.edu/scratchr2/static/pdfs/help/PongCards.pdf', - 'cards.storyLink': '//scratch.mit.edu/scratchr2/static/pdfs/help/StoryCards.pdf', - 'cards.danceLink': '//scratch.mit.edu/scratchr2/static/pdfs/help/DanceCards.pdf', - 'cards.hideLink': '//scratch.mit.edu/scratchr2/static/pdfs/help/Hide-and-Seek-Cards.pdf' + 'cards.starterLink': '/pdfs/cards/Scratch2Cards.pdf', + 'cards.nameLink': '/pdfs/cards/AnimateYourNameCards.pdf', + 'cards.flyLink': '/pdfs/cards/FlyCards.pdf', + 'cards.raceLink': '/pdfs/cards/RaceGameCards.pdf', + 'cards.musicLink': '/pdfs/cards/MusicCards.pdf', + 'cards.hideLink': '/pdfs/cards/Hide-and-Seek-Cards.pdf', + 'cards.storyLink': '/pdfs/cards/StoryCards.pdf', + 'cards.dressupLink': '/pdfs/cards/DressupCards.pdf', + 'cards.pongLink': '/pdfs/cards/PongCards.pdf', + 'cards.danceLink': '/pdfs/cards/DanceCards.pdf', + 'cards.catchLink': '/pdfs/cards/CatchCards.pdf', + 'cards.petLink': '/pdfs/cards/PetCards.pdf' }; var formattedLinks = { 'cards.starterLink': formatMessage({id: 'cards.starterLink'}), 'cards.nameLink': formatMessage({id: 'cards.nameLink'}), - 'cards.pongLink': formatMessage({id: 'cards.pongLink'}), + 'cards.flyLink': formatMessage({id: 'cards.flyLink'}), + 'cards.raceLink': formatMessage({id: 'cards.raceLink'}), + 'cards.musicLink': formatMessage({id: 'cards.musicLink'}), + 'cards.hideLink': formatMessage({id: 'cards.hideLink'}), 'cards.storyLink': formatMessage({id: 'cards.storyLink'}), + 'cards.dressupLink': formatMessage({id: 'cards.dressupLink'}), + 'cards.pongLink': formatMessage({id: 'cards.pongLink'}), 'cards.danceLink': formatMessage({id: 'cards.danceLink'}), - 'cards.hideLink': formatMessage({id: 'cards.hideLink'}) + 'cards.catchLink': formatMessage({id: 'cards.catchLink'}), + 'cards.petLink': formatMessage({id: 'cards.petLink'}) }; return (
+
diff --git a/src/views/developers/developers.jsx b/src/views/developers/developers.jsx index 4733bcd35..a29805a2c 100644 --- a/src/views/developers/developers.jsx +++ b/src/views/developers/developers.jsx @@ -1,6 +1,9 @@ var React = require('react'); var render = require('../../lib/render.jsx'); +var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage; +var FormattedMessage = require('react-intl').FormattedMessage; + var Page = require('../../components/page/www/page.jsx'); var FlexRow = require('../../components/flex-row/flex-row.jsx'); var SubNavigation = require('../../components/subnavigation/subnavigation.jsx'); @@ -15,38 +18,36 @@ var Developers = React.createClass({
- On this page, you’ll find information about open source projects created and maintained{' '}
- by the Scratch Team at MIT, as well{' '}
- as our thoughts on best practices for designing learning experiences for children.
+
- The following projects are open source and available for any purpose.
+
- Scratch Blocks is a new development project for the next generation of{' '}
- graphical programming blocks, based on a collaboration between Google and MIT’s{' '}
- Scratch Team — building on Google’s{' '}
- Blockly technology{' '}
- and informed by the Scratch Team’s expertise in developing creative{' '}
- learning tools for young people. Scratch Blocks will provide a framework{' '}
- for building programming blocks in both vertical (text-based) and horizontal{' '}
- (icon-based) formats. You can access the code (currently as a{' '}
- developer-preview) and documentation{' '}
- here.
+
- This first release includes code for Scratch’s Horizontal Grammar. Looking{' '}
- ahead, we plan to release additional code including but not limited to the{' '}
- Vertical Grammar (currently used by Scratch), a new Rendering Engine to support{' '}
- sprites and graphic effects, and a new Audio Engine to support creation with{' '}
- sound and music.
+
- Scratch-www is a standalone web client for the Scratch Community, built{' '}
- using React and Redux. Access the code and documentation{' '}
- here.
+
+ ScratchJr is an introductory programming language{' '} + that enables young children (ages 5-7) to create{' '} + their own interactive stories and games. For more{' '} + information, visit the{' '} + ScratchJr website{' '} + or access the code and documentation{' '} + here. +
+
- We created Scratch to empower young people to think creatively, reason systematically,{' '}
- and work collaboratively. We are guided by a set of Learning Principles and{' '}
- Design Principles that we hope you will follow as you develop new tools and{' '}
- technologies with Scratch Blocks.
+
- We are pleased to provide Scratch free of charge. If you enjoy using Scratch, please{' '}
- consider making a donation{' '}
- to support Scratch. Donations of any size are appreciated.
+
- Your donation to the Scratch Foundation will be used to support future development of{' '}
- Scratch software and the Scratch website.
+
- Thanks for supporting Scratch!
+
- The creation and maintenance of this open source code would not be possible without{' '}
- generous technical and financial support from our partners:
+
- Scratch is a free programming language and online community where young{' '}
- people can create their own interactive stories, games, and animations.{' '}
- Scratch is a project of the{' '}
- Lifelong Kindergarten{' '}
- Group at the MIT Media Lab.{' '}
- You can learn more about Scratch{' '}
- here.
+
- You may use this code in accordance with the license which governs{' '}
- each project. We also strongly encourage you to consider the learning{' '}
- and design principles (above, on this page) when building creative{' '}
- learning experiences for kids of all ages.
+
- If you wish, you can publicly state that your application is powered by{' '}
- Scratch Blocks. If you do so, we would also encourage you to link back to{' '}
- the code repository.
+
- We plan to open source additional code relating to the Scratch programming{' '}
- language over the next few months. Keep an eye on this page!
+
- Scratch Blocks builds upon the Blockly code base, and is specifically{' '}
- designed with our principles in mind to support creative learning experiences.
+
- You can reach us over on github or{' '}
- you can send an email to{' '}
- help@scratch.mit.edu.{' '}
- We look forward to hearing from you!
+
The Scratch Privacy Policy was last updated: October 2016