Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redo the credits page. #2220

Merged
merged 4 commits into from Nov 14, 2018

Conversation

Projects
None yet
4 participants
@picklesrus
Copy link
Contributor

picklesrus commented Oct 21, 2018

See #2093 for details.

Resolves:

#2093
_

Changes:

Update the credits page

screen shot 2018-10-21 at 2 59 22 pm

screen shot 2018-10-21 at 2 59 10 pm

screen shot 2018-10-21 at 2 58 52 pm

screen shot 2018-10-21 at 2 58 34 pm

picklesrus added some commits Oct 10, 2018

Redo the credits page.
See #2093 for details.
@chrisgarrity
Copy link
Member

chrisgarrity left a comment

Sorry, I just realized the credits page uses FormattedHTMLMessage all over the place. It's something that we're trying to remove whenever we update a page.

@@ -2,458 +2,158 @@ const React = require('react');
const render = require('../../lib/render.jsx');
const FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;

This comment has been minimized.

Copy link
@chrisgarrity

chrisgarrity Oct 23, 2018

Member

FormattedHTMLMessage has been deprecated. Whenever we update strings that use it, we replace them with normal FormattedMessage strings with placeholders. The wiki has instructions for doing the conversion.

"credits.partnersBody": "Paula Bontá and Brian Silverman, Playful Invention Company (who started contributing to the design of Scratch even before it was called Scratch).",
"credits.researchersTitle": "Scratch Researchers",
"credits.researchersBody": "<a href=\"https://scratch.mit.edu/info/research/\">Research on Scratch</a> is being conducted by members of the MIT Scratch Team and researchers at other universities, including Yasmin Kafai (who collaborated on the <a href=\"http://www.nsf.gov/awardsearch/showAward?AWD_ID=0325828\">initial NSF Scratch grant</a>) at the University of Pennsylvania Graduate School of Education, Karen Brennan (who leads the <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd project</a>) at the Harvard Graduate School of Education, Benjamin Mako Hill at the University of Washington, Andrés Monroy Hernández at Microsoft Research, Mimi Ito and Crystle Martin at the University of California, Irvine, Quinn Burke at College of Charleston, Deborah Fields at Utah State University, and Kylie Peppler at Indiana University.",
"credits.researchersBody" : "<a href=\"https://scratch.mit.edu/info/research/\">Research on Scratch</a> is being conducted by members of the MIT Scratch Team and researchers at other universities, including:",

This comment has been minimized.

Copy link
@chrisgarrity

chrisgarrity Oct 23, 2018

Member

This will need a link placeholder, and the link text will need to be defined.

"credits.partnersBody": "Paula Bontá and Brian Silverman, Playful Invention Company (who started contributing to the design of Scratch even before it was called Scratch).",
"credits.researchersTitle": "Scratch Researchers",
"credits.researchersBody": "<a href=\"https://scratch.mit.edu/info/research/\">Research on Scratch</a> is being conducted by members of the MIT Scratch Team and researchers at other universities, including Yasmin Kafai (who collaborated on the <a href=\"http://www.nsf.gov/awardsearch/showAward?AWD_ID=0325828\">initial NSF Scratch grant</a>) at the University of Pennsylvania Graduate School of Education, Karen Brennan (who leads the <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd project</a>) at the Harvard Graduate School of Education, Benjamin Mako Hill at the University of Washington, Andrés Monroy Hernández at Microsoft Research, Mimi Ito and Crystle Martin at the University of California, Irvine, Quinn Burke at College of Charleston, Deborah Fields at Utah State University, and Kylie Peppler at Indiana University.",
"credits.researchersBody" : "<a href=\"https://scratch.mit.edu/info/research/\">Research on Scratch</a> is being conducted by members of the MIT Scratch Team and researchers at other universities, including:",
"credits.researchersContributors" : "Yasmin Kafai (who collaborated on the <a href=\"http://www.nsf.gov/awardsearch/showAward?AWD_ID=0325828\">initial NSF Scratch grant</a>) at the University of Pennsylvania Graduate School of Education, Karen Brennan (who leads the <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd project</a>) at the Harvard Graduate School of Education, Benjamin Mako Hill at the University of Washington, Andrés Monroy Hernández at Microsoft Research, Mimi Ito and Crystle Martin at the University of California, Irvine, Quinn Burke at College of Charleston, Deborah Fields at Utah State University, and Kylie Peppler at Indiana University.",

This comment has been minimized.

Copy link
@chrisgarrity

chrisgarrity Oct 23, 2018

Member

Yuk, this one's a mess for translation. I guess we don't update researchers that often, but each time we do it requires translators to retranslate the whole string. And it has the NSF link that should be a place holder. @kathymakes could we take a look at redoing the researchers so that it's not such a burden for translators?

"credits.partnersBody": "Paula Bontá and Brian Silverman, Playful Invention Company (who started contributing to the design of Scratch even before it was called Scratch).",
"credits.researchersTitle": "Scratch Researchers",
"credits.researchersBody": "<a href=\"https://scratch.mit.edu/info/research/\">Research on Scratch</a> is being conducted by members of the MIT Scratch Team and researchers at other universities, including Yasmin Kafai (who collaborated on the <a href=\"http://www.nsf.gov/awardsearch/showAward?AWD_ID=0325828\">initial NSF Scratch grant</a>) at the University of Pennsylvania Graduate School of Education, Karen Brennan (who leads the <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd project</a>) at the Harvard Graduate School of Education, Benjamin Mako Hill at the University of Washington, Andrés Monroy Hernández at Microsoft Research, Mimi Ito and Crystle Martin at the University of California, Irvine, Quinn Burke at College of Charleston, Deborah Fields at Utah State University, and Kylie Peppler at Indiana University.",
"credits.researchersBody" : "<a href=\"https://scratch.mit.edu/info/research/\">Research on Scratch</a> is being conducted by members of the MIT Scratch Team and researchers at other universities, including:",
"credits.researchersContributors" : "Yasmin Kafai (who collaborated on the <a href=\"http://www.nsf.gov/awardsearch/showAward?AWD_ID=0325828\">initial NSF Scratch grant</a>) at the University of Pennsylvania Graduate School of Education, Karen Brennan (who leads the <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd project</a>) at the Harvard Graduate School of Education, Benjamin Mako Hill at the University of Washington, Andrés Monroy Hernández at Microsoft Research, Mimi Ito and Crystle Martin at the University of California, Irvine, Quinn Burke at College of Charleston, Deborah Fields at Utah State University, and Kylie Peppler at Indiana University.",
"credits.acknowledgementsTitle": "Acknowledgements",
"credits.acknowledgementsContributors": "The following people have also contributed to the development and support of Scratch over the years:",
"credits.acknowledgementsTranslators": "With the help of <a href=\"http://wiki.scratch.mit.edu/wiki/Translators\">Scratch Translators</a> around the world, Scratch is available in many languages.",

This comment has been minimized.

Copy link
@chrisgarrity

chrisgarrity Oct 23, 2018

Member

Another HTML string that should have a placeholder, there are probably others in the unchanged parts of l10n.

@paulkaplan

This comment has been minimized.

Copy link
Member

paulkaplan commented Oct 24, 2018

@picklesrus looks like @chrisgarrity noticed some blocking issues with the way this is localized. Could you work with her to fix it up?

@picklesrus

This comment has been minimized.

Copy link
Contributor Author

picklesrus commented Oct 29, 2018

I've converted everything to FormattedMessage!
I didn't change the researchers message though. Still need to chat with Kathy about that. Since this is my first www PR, I imagine there will be code issues, so I think it should be okay to review in the meantime.

@paulkaplan
Copy link
Member

paulkaplan left a comment

A few css issues, but generally looks wonderful! I would totally pair on the css things, they basically boil down to:

  1. Use media queries to go from smallest to largest to take advantage of cascading effects. Things to look out for: repeated lines in multiple media queries, using both min and max widths.
  2. Use class selectors when there is specific meaning implied. Only use element selectors when overriding things like typography, since those are bound more tightly to the elements. Things to look out for are adding layout properties to element selectors, or using nested element selectors.
Show resolved Hide resolved src/views/credits/credits.scss Outdated
Show resolved Hide resolved src/views/credits/credits.scss Outdated
Show resolved Hide resolved src/views/credits/credits.scss Outdated
Show resolved Hide resolved src/views/credits/credits.scss Outdated
Show resolved Hide resolved src/views/credits/credits.scss Outdated
Show resolved Hide resolved src/views/credits/credits.scss Outdated
Show resolved Hide resolved src/views/credits/credits.scss
@picklesrus

This comment has been minimized.

Copy link
Contributor Author

picklesrus commented Nov 13, 2018

Thanks for pairing! Will wait til Friday to merge :)

@picklesrus picklesrus merged commit 6c7a56d into LLK:develop Nov 14, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.