Revert "Merge pull request #1149 from mewtaylor/issue/r2-4092"

This reverts commit 8e82398255, reversing
changes made to e1a0e9fece.

src/components/registration/steps.jsx

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

src/l10n.json

@@ -125,7 +125,6 @@
     "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",

src/views/teacherregistration/teacherregistration.jsx

@@ -50,7 +50,6 @@ 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,