uepr-113-new-copy-changes

src/components/registration/steps.jsx

@@ -176,14 +176,15 @@ class UsernameStep extends React.Component {
                         <FormattedMessage id="registration.usernameStepTitle" />
                     )}
                 </h2>
-                <p className="description">
+                <p className="wide-description description">
                     {this.props.description ? (
                         this.props.description
                     ) : (
                         <span>
-                            <FormattedMessage id="registration.usernameStepDescription" />&nbsp;
+                            <FormattedMessage id="teacherRegistration.requestTeacherAccountInstructions" />
+                            <br />
                             <b>
-                                <FormattedMessage id="registration.usernameStepRealName" />
+                                <FormattedMessage id="teacherRegistration.usernameStepRealName" />
                             </b>
                         </span>
                     )}
@@ -1131,6 +1132,12 @@ const IntlUseScratchStep = injectIntl(UseScratchStep);
 /*
  * EMAIL STEP
  */
+
+const Email = chunks => (<a
+    href="mailto:no-reply@scratch.mit.edu"
+    className="underline-link"
+>{chunks}</a>);
+
 class EmailStep extends React.Component {
     constructor (props) {
         super(props);
@@ -1194,7 +1201,10 @@ class EmailStep extends React.Component {
                     <FormattedMessage id="teacherRegistration.emailStepTitle" />
                 </h2>
                 <p className="description description-wide">
-                    <FormattedMessage id="teacherRegistration.emailStepDescription1" />
+                    <FormattedMessage
+                        id="teacherRegistration.emailStepDescription1"
+                        values={{a: Email}}
+                    />
                 </p>
                 <p className="description description-wide">
                     <FormattedMessage id="teacherRegistration.emailStepDescription2" />
@@ -1279,7 +1289,11 @@ const IntlEmailStep = injectIntl(EmailStep);
 
 const EducatorResourcesLink = chunks => <a href="/educators#resources">{chunks}</a>;
 
-const BoldText = chunks => <strong>{chunks}</strong>;
+const BoldEmail = chunks => (<a
+    href="mailto:no-reply@scratch.mit.edu"
+    className="bold-link"
+>{chunks}</a>);
+const Link = chunks => <a href={chunks}>{chunks}</a>;
 const NewLine = () => <br />;
 /*
  * TEACHER APPROVAL STEP
@@ -1299,7 +1313,14 @@ const TeacherApprovalStep = props => (
                     <p>
                         <FormattedMessage
                             id="teacherRegistration.confirmYourEmailDescription"
-                            values={{b: BoldText, br: NewLine}}
+                            values={{a: BoldEmail, br: NewLine}}
+                        />
+                    </p>
+                    <br />
+                    <p>
+                        <FormattedMessage
+                            id="teacherRegistration.confirmYourEmailFirewall"
+                            values={{a: BoldEmail, br: NewLine}}
                         />
                     </p>
                     <br />
@@ -1317,7 +1338,7 @@ const TeacherApprovalStep = props => (
                 <p>
                     <FormattedMessage
                         id="registration.waitForApprovalDescription"
-                        values={{b: BoldText}}
+                        values={{b: Link}}
                     />
                 </p>
             </Card> : []

src/components/registration/steps.scss

@@ -44,6 +44,21 @@
         color: $ui-dark-gray;
     }
 
+    .wide-description {
+        margin: 0 -3.2rem 2rem -3.2rem;
+    }
+
+    .underline-link {
+        text-decoration: underline;
+        color: $ui-white;
+        font-weight: inherit;
+    }
+
+    .bold-link {
+        font-weight: bold;
+        color: $type-gray;
+    }
+
     &.class-invite-step {
         text-align: center;
 

src/views/teacherregistration/l10n.json

@@ -1,11 +1,13 @@
 {
+    "teacherRegistration.requestTeacherAccountInstructions": "Fill in the following forms to request an account. You will need to confirm your email address before your account is approved. The approval process may take up to one day after you have confirmed your email address.",
+    "teacherRegistration.usernameStepRealName": "Please do not use any portion of your real name in your usernames. Usernames containing names are subject to immediate deletion.",
     "teacherRegistration.nameStepTitle": "First & Last Name",
     "teacherRegistration.nameStepTitleNew": "First & Last Name",
     "teacherRegistration.nameStepDescription": "Your name will not be displayed publicly, and will be kept confidential and secure.",
     "teacherRegistration.firstName": "First Name",
     "teacherRegistration.lastName": "Last Name",
-    "teacherRegistration.phoneNumber": "Phone Number",
-    "teacherRegistration.phoneStepDescription": "Your phone number will not be displayed publicly, and will be kept confidential and secure",
+    "teacherRegistration.phoneNumber": "Mobile Number",
+    "teacherRegistration.phoneStepDescription": "Your mobile number will not be displayed publicly, and will be kept confidential and secure",
     "teacherRegistration.phoneConsent": "Yes, the Scratch Team may call me to verify my Teacher Account if needed",
     "teacherRegistration.validationPhoneNumber": "Please enter a valid phone number",
     "teacherRegistration.phoneSecurityNotice": "To secure your account, we will send you a one-time passcode to verify it’s really you. ",
@@ -35,10 +37,11 @@
     "teacherRegistration.useScratchMaxLength": "Description must be at most 300 characters",
     "teacherRegistration.howUseScratch": "How do you plan to use Scratch at your organization?",
     "teacherRegistration.emailStepTitle": "Email Address",
-    "teacherRegistration.emailStepDescription1": "We will send you an email from no-reply@scratch.mit.edu to verify your email address.",
+    "teacherRegistration.emailStepDescription1": "We will send you an email from <a>no-reply@scratch.mit.edu</a> to verify your email address.",
     "teacherRegistration.emailStepDescription2": " Once you confirm your email, we will proceed with reviewing your request for a Teacher Account.",
     "teacherRegistration.reviewProcess": "The review process may take up to 24 hours.",
-    "teacherRegistration.confirmYourEmailDescription": "Please check your inbox for a confirmation email from <br></br> <b>no-reply@scratch.mit.edu</b> to verify your email address. ",
+    "teacherRegistration.confirmYourEmailDescription": "Please check your inbox for a confirmation email from <br></br> <a>no-reply@scratch.mit.edu</a> to verify your email address before your account can be approved.",
+    "teacherRegistration.confirmYourEmailFirewall": "Many schools use email firewalls. To prevent delays in approving your account, please ask your school's IT department to whitelist <a>no-reply@scratch.mit.edu</a>. This will ensure that you can get automated emails from Scratch in the future, which you'll need for things like changing your or your students' passwords.",
     "teacherRegistration.confirmationEmail": "Click the link in the confirmation email sent to: ",
     "teacherRegistration.validationEmailMatch": "The emails do not match",
     "teacherRegistration.validationAge": "Sorry, teachers must be at least 16 years old"