Skip to content

GitLab

S
scratch-www
Commit d3b8acbb authored by Kerr Travers's avatar Kerr Travers Committed by chrisgarrity
Browse files
Options

Fixes #1700 | Update about page (#1714) 

Fixes #1700 adds 'Siegel Family Endowment' to the credits. Also changes all uses of `FormattedHTMLMessage` to `FormattedMessage` with placeholders.
parent 70c8edd1
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 16 deletions
src/views/about/about.jsx
View file @ d3b8acbb
var React = require('react'); var React = require('react');
var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
var FormattedMessage = require('react-intl').FormattedMessage; var FormattedMessage = require('react-intl').FormattedMessage;
var render = require('../../lib/render.jsx'); var render = require('../../lib/render.jsx');
...@@ -42,7 +41,7 @@ var About = React.createClass({ ...@@ -42,7 +41,7 @@ var About = React.createClass({
<li> <li>
<h3><FormattedMessage id='about.whoUsesScratch' /></h3> <h3><FormattedMessage id='about.whoUsesScratch' /></h3>
<img src="/images/about/who-uses-scratch.jpg" alt="" /> <img src="/images/about/who-uses-scratch.jpg" alt="" />
<p><FormattedHTMLMessage id='about.whoUsesScratchDescription' /></p> <p><FormattedMessage id='about.whoUsesScratchDescription' /></p>
</li> </li>
<li> <li>
...@@ -53,31 +52,75 @@ var About = React.createClass({ ...@@ -53,31 +52,75 @@ var About = React.createClass({
webkitAllowFullScreen webkitAllowFullScreen
mozallowfullscreen mozallowfullscreen
allowFullScreen /> allowFullScreen />
<p><FormattedHTMLMessage id='about.literacyDescription' /></p> <p><FormattedMessage id='about.literacyDescription' /></p>
</li> </li>
<li> <li>
<h3><FormattedMessage id='about.aroundTheWorld' /></h3> <h3><FormattedMessage id='about.aroundTheWorld' /></h3>
<img src="/images/about/around-the-world.png" alt="" /> <img src="/images/about/around-the-world.png" alt="" />
<p><FormattedHTMLMessage id='about.aroundTheWorldDescription' /></p> <p><FormattedMessage
id='about.aroundTheWorldDescription'
values={{
translationLink: (
<a href='http://wiki.scratch.mit.edu/wiki/How_to_Translate_Scratch'>
<FormattedMessage id='about.translationLinkText' />
</a>
)
}}
/></p>
</li> </li>
<li> <li>
<h3><FormattedMessage id='about.schools' /></h3> <h3><FormattedMessage id='about.schools' /></h3>
<img src="/images/about/scratch-in-schools.jpg" alt="" /> <img src="/images/about/scratch-in-schools.jpg" alt="" />
<p><FormattedHTMLMessage id='about.schoolsDescription' /></p> <p><FormattedMessage
id='about.schoolsDescription'
values={{
scratchedLink: (
<a href='http://scratched.gse.harvard.edu/'>
<FormattedMessage id='about.scratchedLinkText' />
</a>
)
}}
/></p>
</li> </li>
<li> <li>
<h3><FormattedMessage id='about.quotes' /></h3> <h3><FormattedMessage id='about.quotes' /></h3>
<img src="/images/about/quotes.gif" alt="Quotes about Scratch" /> <img src="/images/about/quotes.gif" alt="Quotes about Scratch" />
<p><FormattedHTMLMessage id='about.quotesDescription' /></p> <p><FormattedMessage
id='about.quotesDescription'
values={{
quotesLink: (
<a href='http://wiki.scratch.mit.edu/wiki/How_to_Translate_Scratch'>
<FormattedMessage id='about.quotesLinkText'/>
</a>
)
}}
/></p>
</li> </li>
<li> <li>
<h3><FormattedMessage id='about.research' /></h3> <h3><FormattedMessage id='about.research' /></h3>
<img src="/images/about/research-remix.png" alt="" /> <img src="/images/about/research-remix.png" alt="" />
<p><FormattedHTMLMessage id='about.researchDescription' /></p> <p><FormattedMessage
id='about.researchDescription'
values={{
researchLink: (
<a href='/info/research'>
<FormattedMessage id='about.researchLinkText'/>
</a>
),
spfaLink: (
<a href='http://web.media.mit.edu/~mres/papers/Scratch-CACM-final.pdf'>
<FormattedMessage id='about.spfaLinkText'/>
</a>
),
statisticsLink: (
<a href='/statistics'>
<FormattedMessage id='about.statisticsLinkText'/>
</a>
)
}}
/></p>
</li> </li>
<li> <li>
...@@ -102,8 +145,28 @@ var About = React.createClass({ ...@@ -102,8 +145,28 @@ var About = React.createClass({
<li> <li>
<h3><FormattedMessage id='about.support' /></h3> <h3><FormattedMessage id='about.support' /></h3>
<p><FormattedHTMLMessage id='about.supportDescription' /></p> <p><FormattedMessage
</li> id='about.supportDescription'
values={{
supportersList: 'National Science Foundation, Scratch Foundation, Siegel Family Endowment, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, MacArthur Foundation', // eslint-disable-line max-len
creditsLink: (
<a href='//scratch.mit.edu/info/credits'>
<FormattedMessage id='about.creditsLinkText'/>
</a>
),
donateLink: (
<a href='//secure.donationpay.org/scratchfoundation/'>
<FormattedMessage id='about.donateLinkText'/>
</a>
),
donateemail: (
<a href='mailto:donate@scratch.mit.edu'>
donate@scratch.mit.edu
</a>
)
}}
/></p>
</li>
</ul> </ul>
</div> </div>
</div> </div>
......
src/views/about/l10n.json
View file @ d3b8acbb
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
"about.whoUsesScratch": "Who Uses Scratch?", "about.whoUsesScratch": "Who Uses Scratch?",
"about.whoUsesScratchDescription": "Scratch is designed especially for ages 8 to 16, but is used by people of all ages. Millions of people are creating Scratch projects in a wide variety of settings, including homes, schools, museums, libraries, and community centers.", "about.whoUsesScratchDescription": "Scratch is designed especially for ages 8 to 16, but is used by people of all ages. Millions of people are creating Scratch projects in a wide variety of settings, including homes, schools, museums, libraries, and community centers.",
"about.aroundTheWorld": "Around the World", "about.aroundTheWorld": "Around the World",
"about.aroundTheWorldDescription": "Scratch is used in more than 150 different countries and available in more than 40 languages. To change languages, click the menu at the bottom of the page. Or, in the Project Editor, click the globe at the top of the page. To add or improve a translation, see the <a href=\"http://wiki.scratch.mit.edu/wiki/How_to_Translate_Scratch\">translation</a> page.", "about.aroundTheWorldDescription": "Scratch is used in more than 150 different countries and available in more than 40 languages. To change languages, click the menu at the bottom of the page. Or, in the Project Editor, click the globe at the top of the page. To add or improve a translation, see the {translationLink} page.",
"about.translationLinkText": "translation",
"about.quotes": "Quotes", "about.quotes": "Quotes",
"about.quotesDescription": "The Scratch Team has received many emails from youth, parents, and educators expressing thanks for Scratch. Want to see what people are saying? You can read a collection of the <a href=\"/info/quotes\">quotes</a> we&#39;ve received.", "about.quotesDescription": "The Scratch Team has received many emails from youth, parents, and educators expressing thanks for Scratch. Want to see what people are saying? You can read a collection of the {quotesLink} we've received.",
"about.quotesLinkText": "quotes",
"about.learnMore": "Learn More About Scratch", "about.learnMore": "Learn More About Scratch",
"about.learnMoreHelp": "Tips Page", "about.learnMoreHelp": "Tips Page",
"about.learnMoreFaq": "Frequently Asked Questions", "about.learnMoreFaq": "Frequently Asked Questions",
...@@ -18,9 +20,15 @@ ...@@ -18,9 +20,15 @@
"about.literacy": "Learn to Code, Code to Learn", "about.literacy": "Learn to Code, Code to Learn",
"about.literacyDescription": "The ability to code computer programs is an important part of literacy in today’s society. When people learn to code in Scratch, they learn important strategies for solving problems, designing projects, and communicating ideas.", "about.literacyDescription": "The ability to code computer programs is an important part of literacy in today’s society. When people learn to code in Scratch, they learn important strategies for solving problems, designing projects, and communicating ideas.",
"about.schools": "Scratch in Schools", "about.schools": "Scratch in Schools",
"about.schoolsDescription": "Students are learning with Scratch at all levels (from elementary school to college) and across disciplines (such as math, computer science, language arts, social studies). Educators share stories, exchange resources, ask questions, and find people on the <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd website</a>.", "about.schoolsDescription": "Students are learning with Scratch at all levels (from elementary school to college) and across disciplines (such as math, computer science, language arts, social studies). Educators share stories, exchange resources, ask questions, and find people on the {scratchedLink}.",
"about.scratchedLinkText": "ScratchEd website",
"about.research": "Research", "about.research": "Research",
"about.researchDescription": "The MIT Scratch Team and collaborators are researching how people use and learn with Scratch (for an introduction, see <a href=\"http://web.media.mit.edu/~mres/papers/Scratch-CACM-final.pdf\">Scratch: Programming for All</a>). Find out more about Scratch <a href=\"/info/research\">research</a> and <a href=\"/statistics\">statistics</a> about Scratch.", "about.researchDescription": "The MIT Scratch Team and collaborators are researching how people use and learn with Scratch (for an introduction, see {spfaLink}. Find out more about Scratch {researchLink} and {statisticsLink} about Scratch.",
"about.spfaLinkText": "Scratch: Programming for All",
"about.researchLinkText": "research",
"about.statisticsLinkText": "statistics",
"about.support": "Support and Funding", "about.support": "Support and Funding",
"about.supportDescription": "The Scratch project has received financial support from the National Science Foundation, Scratch Foundation, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, and MacArthur Foundation. See the <a href=\"/info/credits\">credits page</a> for more information. If you&#39;d like to support Scratch, please see the Scratch Foundation <a href=\"https://secure.donationpay.org/scratchfoundation/\">donate page</a>, or contact us at <a href=\"mailto:donate@scratch.mit.edu\">donate@scratch.mit.edu</a>." "about.supportDescription": "The Scratch project has received financial support from the following organizations: {supportersList}. See the {creditsLink} for more information. If you'd like to support Scratch, please see the Scratch Foundation {donateLink}, or contact us at {donateemail}.",
"about.donateLinkText": "donations page",
"about.creditsLinkText": "credits page"
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment