From 63c6bf59f27417dfc9861c0cb63667be0e553896 Mon Sep 17 00:00:00 2001
From: Matthew Taylor <mewtaylor@gmail.com>
Date: Thu, 19 Jan 2017 18:37:11 -0500
Subject: [PATCH] Merge pull request #1149 from mewtaylor/issue/r2-4092

For R2-4092: Add checkbox to opt-in to teacher emails
---
 src/components/registration/steps.jsx         | 44 ++++++++++++-------
 src/l10n.json                                 |  1 +
 .../teacherregistration.jsx                   |  1 +
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx
index 9e48545b4..cd17ae99d 100644
--- a/src/components/registration/steps.jsx
+++ b/src/components/registration/steps.jsx
@@ -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} />
diff --git a/src/l10n.json b/src/l10n.json
index 3d516f840..c9199f5b2 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -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",
diff --git a/src/views/teacherregistration/teacherregistration.jsx b/src/views/teacherregistration/teacherregistration.jsx
index 46cc34c7c..d468085ae 100644
--- a/src/views/teacherregistration/teacherregistration.jsx
+++ b/src/views/teacherregistration/teacherregistration.jsx
@@ -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,