scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-18 09:00:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update description of demographics step

Browse source
This commit is contained in:
Ray Schamp 2016-07-19 22:58:50 -04:00
parent 1c5940cc05
commit 6d5b7d3c02
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/registration/steps.jsx
View file

@ -166,7 +166,8 @@ module.exports = {
getDefaultProps: function () { getDefaultProps: function () {
return { return {
defaultCountry: DEFAULT_COUNTRY, defaultCountry: DEFAULT_COUNTRY,
waiting: false waiting: false,
description: null
}; };
}, },
getInitialState: function () { getInitialState: function () {
@ -199,7 +200,11 @@ module.exports = {
<intl.FormattedMessage id="registration.personalStepTitle" /> <intl.FormattedMessage id="registration.personalStepTitle" />
</h2> </h2>
<p className="description"> <p className="description">
<intl.FormattedMessage id="registration.personalStepDescription" /> {this.props.description ?
this.props.description
:
<intl.FormattedMessage id="registration.personalStepDescription" />
}
<Tooltip title={'?'} <Tooltip title={'?'}
tipContent={formatMessage({id: 'registration.nameStepTooltip'})} /> tipContent={formatMessage({id: 'registration.nameStepTooltip'})} />
</p> </p>

1
src/l10n.json
View file

@ -115,6 +115,7 @@
"registration.lastStepDescription": "We are currently processing your application. ", "registration.lastStepDescription": "We are currently processing your application. ",
"registration.nameStepTooltip": "This information is used for verification and to aggregate usage statistics.", "registration.nameStepTooltip": "This information is used for verification and to aggregate usage statistics.",
"registration.nextStep": "Next Step", "registration.nextStep": "Next Step",
"registration.notOnWebsite": "This information will not appear on the Scratch website.",
"registration.personalStepTitle": "Personal Information", "registration.personalStepTitle": "Personal Information",
"registration.personalStepDescription": "Your individual responses will not be displayed publicly, and will be kept confidential and secure", "registration.personalStepDescription": "Your individual responses will not be displayed publicly, and will be kept confidential and secure",
"registration.showPassword": "Show password", "registration.showPassword": "Show password",

7
src/views/studentregistration/studentregistration.jsx
View file

@ -87,6 +87,10 @@ var StudentRegistration = intl.injectIntl(React.createClass({
window.location = '/classes/' + this.props.classroomId + '/'; window.location = '/classes/' + this.props.classroomId + '/';
}, },
render: function () { render: function () {
var demographicsDescription = this.props.intl.formatMessage({
id: 'registration.notOnWebsite',
defaultMessage: 'This information will not appear on the Scratch website.'
});
return ( return (
<Deck className="student-registration"> <Deck className="student-registration">
{this.state.registrationError ? {this.state.registrationError ?
@ -99,7 +103,8 @@ var StudentRegistration = intl.injectIntl(React.createClass({
waiting={this.state.waiting} /> waiting={this.state.waiting} />
<Steps.UsernameStep onNextStep={this.advanceStep} <Steps.UsernameStep onNextStep={this.advanceStep}
waiting={this.state.waiting} /> waiting={this.state.waiting} />
<Steps.DemographicsStep onNextStep={this.register} <Steps.DemographicsStep description={demographicsDescription}
onNextStep={this.register}
waiting={this.state.waiting} /> waiting={this.state.waiting} />
<Steps.ClassWelcomeStep classroom={this.state.classroom} <Steps.ClassWelcomeStep classroom={this.state.classroom}
messages={this.props.messages} messages={this.props.messages}