From 6d5b7d3c02816f71846b43a95917a5a2898a9407 Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Tue, 19 Jul 2016 22:58:50 -0400
Subject: [PATCH] Update description of demographics step

---
 src/components/registration/steps.jsx                 | 9 +++++++--
 src/l10n.json                                         | 1 +
 src/views/studentregistration/studentregistration.jsx | 7 ++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx
index b93ff9ddb..eb99d6cbd 100644
--- a/src/components/registration/steps.jsx
+++ b/src/components/registration/steps.jsx
@@ -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">
-                        <intl.FormattedMessage id="registration.personalStepDescription" />
+                        {this.props.description ?
+                            this.props.description
+                        :
+                            <intl.FormattedMessage id="registration.personalStepDescription" />
+                        }
                         <Tooltip title={'?'}
                                  tipContent={formatMessage({id: 'registration.nameStepTooltip'})} />
                     </p>
diff --git a/src/l10n.json b/src/l10n.json
index 689091326..a68260baf 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -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",
diff --git a/src/views/studentregistration/studentregistration.jsx b/src/views/studentregistration/studentregistration.jsx
index ed2eca297..4b9ee88b4 100644
--- a/src/views/studentregistration/studentregistration.jsx
+++ b/src/views/studentregistration/studentregistration.jsx
@@ -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}