scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1244 from mewtaylor/issue/opt-in

Browse source 
[Develop] Hotfix: re-add checkbox to opt-in to email list for teacher
This commit is contained in:
Matthew Taylor 2017-03-15 10:15:16 -04:00 committed by GitHub
commit 0bb60700ba
3 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -877,23 +877,35 @@ module.exports = {
</p>
<Card>
<Form onValidSubmit={this.onValidSubmit}>
<Input label={formatMessage({id: 'general.emailAddress'})}
type="text"
name="user.email"
validations="isEmail"
validationError={formatMessage({id: 'general.validationEmail'})}
required />
<Input label={formatMessage({id: 'general.confirmEmail'})}
type="text"
name="confirmEmail"
validations="equalsField:user.email"
validationErrors={{
equalsField: formatMessage({id: 'general.validationEmailMatch'})
}}
required />
<Input
label={formatMessage({id: 'general.emailAddress'})}
type="text"
name="user.email"
validations="isEmail"
validationError={formatMessage({id: 'general.validationEmail'})}
required
/>
<Input
label={formatMessage({id: 'general.confirmEmail'})}
type="text"
name="confirmEmail"
validations="equalsField:user.email"
validationErrors={{
equalsField: formatMessage({id: 'general.validationEmailMatch'})
}}
required
/>
<Checkbox
label={formatMessage({id: 'registration.optIn'})}
value={true}
help={null}
name="subscribe"
/>
<GeneralError name="all" />
<NextStepButton waiting={this.props.waiting}
text={<intl.FormattedMessage id="registration.nextStep" />} />
<NextStepButton
waiting={this.props.waiting}
text={<intl.FormattedMessage id="registration.nextStep" />}
/>
</Form>
</Card>
<StepNavigation steps={this.props.totalSteps - 1} active={this.props.activeStep} />

1
src/l10n.json
View file

@ -126,6 +126,7 @@
"registration.newPassword": "New Password",
"registration.nextStep": "Next Step",
"registration.notYou": "Not you? Log in as another user",
"registration.optIn": "Send me updates on using Scratch in educational settings",
"registration.personalStepTitle": "Personal Information",
"registration.personalStepDescription": "Your individual responses will not be displayed publicly, and will be kept confidential and secure",
"registration.selectCountry": "select country",

1
src/views/teacherregistration/teacherregistration.jsx
View file

@ -50,6 +50,7 @@ var TeacherRegistration = intl.injectIntl(React.createClass({
this.state.formData.user.gender
),
country: this.state.formData.user.country,
subscribe: formData.subscribe,
is_robot: this.state.formData.user.isRobot,
first_name: this.state.formData.user.name.first,
last_name: this.state.formData.user.name.last,