-
Notifications
You must be signed in to change notification settings - Fork 855
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9002 from Bogomil-Stoyanov/feat/uepr-113-copy-reg…
…istration-screen feat: [UEPR-113] Update the copy on some teacher's account registration screens
- Loading branch information
Showing
6 changed files
with
97 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -176,14 +176,15 @@ class UsernameStep extends React.Component { | |
| <FormattedMessage id="registration.usernameStepTitle" /> | ||
| )} | ||
| </h2> | ||
| <p className="description"> | ||
| <p className="description wide"> | ||
| {this.props.description ? ( | ||
| this.props.description | ||
| ) : ( | ||
| <span> | ||
| <FormattedMessage id="registration.usernameStepDescription" /> | ||
| <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:[email protected]" | ||
| className="underline-link" | ||
| >{chunks}</a>); | ||
|
|
||
| class EmailStep extends React.Component { | ||
| constructor (props) { | ||
| super(props); | ||
|
|
@@ -1193,8 +1200,17 @@ class EmailStep extends React.Component { | |
| <h2> | ||
| <FormattedMessage id="teacherRegistration.emailStepTitle" /> | ||
| </h2> | ||
| <p className="description wide"> | ||
| <FormattedMessage | ||
| id="teacherRegistration.emailStepDescription1" | ||
| values={{a: Email}} | ||
| /> | ||
| </p> | ||
| <p className="description wide"> | ||
| <FormattedMessage id="teacherRegistration.emailStepDescription2" /> | ||
| </p> | ||
| <p className="description"> | ||
| <FormattedMessage id="teacherRegistration.emailStepDescription" /> | ||
| <FormattedMessage id="teacherRegistration.reviewProcess" /> | ||
| <Tooltip | ||
| tipContent={ | ||
| this.props.intl.formatMessage({id: 'registration.nameStepTooltip'}) | ||
|
|
@@ -1273,6 +1289,11 @@ const IntlEmailStep = injectIntl(EmailStep); | |
|
|
||
| const EducatorResourcesLink = chunks => <a href="/educators#resources">{chunks}</a>; | ||
|
|
||
| const BoldEmail = chunks => (<a | ||
| href="mailto:[email protected]" | ||
| className="bold-link" | ||
| >{chunks}</a>); | ||
| const Link = chunks => <a href={chunks}>{chunks}</a>; | ||
| /* | ||
| * TEACHER APPROVAL STEP | ||
| */ | ||
|
|
@@ -1289,17 +1310,35 @@ const TeacherApprovalStep = props => ( | |
| <Card className="confirm"> | ||
| <h4><FormattedMessage id="registration.confirmYourEmail" /></h4> | ||
| <p> | ||
| <FormattedMessage id="registration.confirmYourEmailDescription" /><br /> | ||
| <strong>{props.email}</strong> | ||
| <FormattedMessage | ||
| id="teacherRegistration.confirmYourEmailDescription" | ||
| values={{a: BoldEmail}} | ||
| /> | ||
| </p> | ||
| <br /> | ||
| <p> | ||
| <FormattedMessage | ||
| id="teacherRegistration.confirmYourEmailFirewall" | ||
| values={{a: BoldEmail}} | ||
| /> | ||
| </p> | ||
| <br /> | ||
| <p> | ||
| <FormattedMessage | ||
| id="teacherRegistration.confirmationEmail" | ||
| /> | ||
| <strong>{props.email}</strong></p> | ||
| </Card> | ||
| ) | ||
| } | ||
| {props.invited ? | ||
| <Card className="wait"> | ||
| <h4><FormattedMessage id="registration.waitForApproval" /></h4> | ||
| <p> | ||
| <FormattedMessage id="registration.waitForApprovalDescription" /> | ||
| <FormattedMessage | ||
| id="registration.waitForApprovalDescription" | ||
| values={{b: Link}} | ||
| /> | ||
| </p> | ||
| </Card> : [] | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,16 @@ | ||
| { | ||
| "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. ", | ||
| "teacherRegistration.validationPhoneConsent": "You must consent to verification of your Teacher Account", | ||
| "teacherRegistration.privacyDescription": "Your information will not be displayed publicly, and will be kept confidential and secure.", | ||
| "teacherRegistration.organization": "Organization", | ||
|
|
@@ -34,7 +37,12 @@ | |
| "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.emailStepDescription": "We will send you a confirmation email that will allow you to access your Scratch Teacher Account.", | ||
| "teacherRegistration.emailStepDescription1": "We will send you an email from <a>[email protected]</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 <a>[email protected]</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>[email protected]</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" | ||
| } | ||