mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2024-11-27 01:25:52 -05:00
Update description of demographics step
This commit is contained in:
parent
1c5940cc05
commit
6d5b7d3c02
3 changed files with 14 additions and 3 deletions
|
@ -166,7 +166,8 @@ module.exports = {
|
|||
getDefaultProps: function () {
|
||||
return {
|
||||
defaultCountry: DEFAULT_COUNTRY,
|
||||
waiting: false
|
||||
waiting: false,
|
||||
description: null
|
||||
};
|
||||
},
|
||||
getInitialState: function () {
|
||||
|
@ -199,7 +200,11 @@ module.exports = {
|
|||
<intl.FormattedMessage id="registration.personalStepTitle" />
|
||||
</h2>
|
||||
<p className="description">
|
||||
{this.props.description ?
|
||||
this.props.description
|
||||
:
|
||||
<intl.FormattedMessage id="registration.personalStepDescription" />
|
||||
}
|
||||
<Tooltip title={'?'}
|
||||
tipContent={formatMessage({id: 'registration.nameStepTooltip'})} />
|
||||
</p>
|
||||
|
|
|
@ -115,6 +115,7 @@
|
|||
"registration.lastStepDescription": "We are currently processing your application. ",
|
||||
"registration.nameStepTooltip": "This information is used for verification and to aggregate usage statistics.",
|
||||
"registration.nextStep": "Next Step",
|
||||
"registration.notOnWebsite": "This information will not appear on the Scratch website.",
|
||||
"registration.personalStepTitle": "Personal Information",
|
||||
"registration.personalStepDescription": "Your individual responses will not be displayed publicly, and will be kept confidential and secure",
|
||||
"registration.showPassword": "Show password",
|
||||
|
|
|
@ -87,6 +87,10 @@ var StudentRegistration = intl.injectIntl(React.createClass({
|
|||
window.location = '/classes/' + this.props.classroomId + '/';
|
||||
},
|
||||
render: function () {
|
||||
var demographicsDescription = this.props.intl.formatMessage({
|
||||
id: 'registration.notOnWebsite',
|
||||
defaultMessage: 'This information will not appear on the Scratch website.'
|
||||
});
|
||||
return (
|
||||
<Deck className="student-registration">
|
||||
{this.state.registrationError ?
|
||||
|
@ -99,7 +103,8 @@ var StudentRegistration = intl.injectIntl(React.createClass({
|
|||
waiting={this.state.waiting} />
|
||||
<Steps.UsernameStep onNextStep={this.advanceStep}
|
||||
waiting={this.state.waiting} />
|
||||
<Steps.DemographicsStep onNextStep={this.register}
|
||||
<Steps.DemographicsStep description={demographicsDescription}
|
||||
onNextStep={this.register}
|
||||
waiting={this.state.waiting} />
|
||||
<Steps.ClassWelcomeStep classroom={this.state.classroom}
|
||||
messages={this.props.messages}
|
||||
|
|
Loading…
Reference in a new issue