Merge pull request #5785 from edx/renzo/copy-changes

Clean up logistration copy

common/djangoapps/user_api/views.py

@@ -76,10 +76,10 @@ class LoginSessionView(APIView):
         form_desc.add_field(
             "email",
             field_type="email",
-            label=_(u"E-mail"),
-            placeholder=_(u"example: username@domain.com"),
+            label=_(u"Email"),
+            placeholder=_(u"username@domain.com"),
             instructions=_(
-                u"This is the e-mail address you used to register with {platform}"
+                u"The email address you used to register with {platform}"
             ).format(platform=settings.PLATFORM_NAME),
             restrictions={
                 "min_length": account_api.EMAIL_MIN_LENGTH,
@@ -255,10 +255,10 @@ class RegistrationView(APIView):
         form_desc.add_field(
             "email",
             field_type="email",
-            label=_(u"E-mail"),
-            placeholder=_(u"example: username@domain.com"),
+            label=_(u"Email"),
+            placeholder=_(u"username@domain.com"),
             instructions=_(
-                u"This is the e-mail address you used to register with {platform}"
+                u"The email address you want to use with {platform}"
             ).format(platform=settings.PLATFORM_NAME),
             restrictions={
                 "min_length": account_api.EMAIL_MIN_LENGTH,
@@ -271,7 +271,7 @@ class RegistrationView(APIView):
         form_desc.add_field(
             "name",
             label=_(u"Full Name"),
-            instructions=_(u"Needed for any certificates you may earn"),
+            instructions=_(u"The name that will appear on your certificates"),
             restrictions={
                 "max_length": profile_api.FULL_NAME_MAX_LENGTH,
             },
@@ -281,8 +281,8 @@ class RegistrationView(APIView):
     def _add_username_field(self, form_desc, required=True):
         form_desc.add_field(
             "username",
-            label=_(u"Public Username"),
-            instructions=_(u"Will be shown in any discussions or forums you participate in (cannot be changed)"),
+            label=_(u"Username"),
+            instructions=_(u"The name that will identify you in your courses"),
             restrictions={
                 "min_length": account_api.USERNAME_MIN_LENGTH,
                 "max_length": account_api.USERNAME_MAX_LENGTH,
@@ -340,7 +340,7 @@ class RegistrationView(APIView):
     def _add_goals_field(self, form_desc, required=True):
         form_desc.add_field(
             "goals",
-            label=_("Please share with us your reasons for registering with edX"),
+            label=_("If you'd like, tell us why you're interested in edX."),
             field_type="textarea",
             required=required
         )

common/static/js/spec_helpers/edx.utils.validate.js

@@ -10,10 +10,10 @@ var edx = edx || {};
             validate: {
 
                 msg: {
-                    email: '<li>A properly formatted e-mail is required</li>',
-                    min: '<li><%= field %> must be a minimum of <%= count %> characters long</li>',
-                    max: '<li><%= field %> must be a maximum of <%= count %> characters long</li>',
-                    required: '<li><%= field %> field is required</li>',
+                    email: '<li>The email address you\'ve provided is invalid.</li>',
+                    min: '<li><%= field %> must have at least <%= count %> characters.</li>',
+                    max: '<li><%= field %> can only contain up to <%= count %> characters.</li>',
+                    required: '<li><%= field %> is required.</li>',
                     custom: '<li><%= content %></li>'
                 },
 

lms/static/js/student_account/views/AccessView.js

@@ -78,8 +78,8 @@ var edx = edx || {};
             reset: function( context ) {
                 var model = new edx.student.account.PasswordResetModel(),
                     data = [{
-                        label: 'E-mail',
-                        instructions: 'This is the e-mail address you used to register with edX',
+                        label: 'Email',
+                        instructions: 'The email address you used to register with edX',
                         name: 'email',
                         required: true,
                         type: 'email',

lms/templates/student_account/access.underscore

 <header class="js-login-register-header header">
     <h1 class="headline">Welcome!</h1>
-    <p class="tagline">Please log in to continue</p>
+    <p class="tagline">Log in or register to take courses from the world's best universities.</p>
 </header>
 
 <section class="form-type">
@@ -14,7 +14,7 @@
 <section class="form-type">
     <h2>
         <input type="radio" name="form" id="login-option" value="login" class="form-toggle" <% if ( mode === 'login' ) { %>checked<% } %>>
-        <label for="login-option" class="form-label">I am a returning user with an edX account</label>
+        <label for="login-option" class="form-label">I am a returning user</label>
     </h2>
     <div id="login-form" class="form-wrapper <% if ( mode !== 'login' ) { %>hidden" aria-hidden="true<% } %>"></div>
 </section>

lms/templates/student_account/login.underscore

 <form id="login" class="login-form">
     <div class="status already-authenticated-msg hidden" aria-hidden="true">
         <% if (currentProvider) { %>
-            <p class="message-copy">You've successfully logged into <%- currentProvider %>, but you need to link your account.  Please click "I am a new user" to create an edX account.</p>
+            <p class="message-copy">You've successfully logged into <%- currentProvider %>, but your <%- currentProvider %> account isn't linked with an edX account. To link your accounts, go to your edX dashboard.</p>
         <% } %>
     </div>
 
@@ -16,6 +16,6 @@
 
 <% _.each( providers, function( provider) { %>
     <button type="submit"class="button button-primary button-<%- provider.name %> login-provider" data-provider-url="<%- provider.loginUrl %>">
-        <span class="icon <%- provider.iconClass %>"></span>Sign in with <%- provider.name %>
+        <span class="icon <%- provider.iconClass %>"></span>Log in using <%- provider.name %>
     </button>
 <% }); %>

lms/templates/student_account/login_and_register.html

@@ -3,7 +3,7 @@
 
 <%inherit file="../main.html" />
 
-<%block name="pagetitle">${_("Login and Register")}</%block>
+<%block name="pagetitle">${_("Log in or Register")}</%block>
 
 <%block name="js_extra">
     <script type="text/javascript" src="${static.url('js/vendor/underscore-min.js')}"></script>

lms/templates/student_account/password_reset.underscore

 <header class="header">
-    <h1 class="headline">Password assistance</h1>
+    <h1 class="headline">Reset Password</h1>
 </header>
 
 <section class="form-type">
     <div id="password-reset-form" class="form-wrapper">
-        <p class="action-label">Please enter your email address below and we will send you instructions for setting a new password.</p>
+        <!-- <p class="action-label">Please enter your email address below and we will send you instructions for setting a new password.</p> -->
+        <p class="action-label">Enter the email address you used to create your account. We'll send you a link you can use to reset your password.</p>
         <form id="password-reset-form">
             <div class="status submission-error hidden" aria-hidden="true">
                 <h4 class="message-title">An error occurred.</h4>
@@ -13,14 +14,14 @@
 
             <%= fields %>
 
-            <button class="action action-primary action-update js-reset">Reset my password</button>
+            <button class="action action-primary action-update js-reset">Reset password</button>
         </form>
     </div>
 
     <div class="js-reset-success status submission-success hidden" aria-hidden="true">
-        <h4 class="message-title">Password Reset Successful</h4>
+        <h4 class="message-title">Password Reset Email Sent</h4>
         <div class="message-copy">
-            <p>We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly.</p>
+            <p>We've sent instructions for resetting your password to the email address you provided.</p>
         </div>
     </div>
 </section>

lms/templates/student_account/register.underscore

 <% if (currentProvider) { %>
     <div class="status" aria-hidden="false">
-        <p class="message-copy">You've successfully signed in with <%- currentProvider %>. We just need a little more information before you start learning with edX.</p>
+        <p class="message-copy">You've successfully logged into <%- currentProvider %>. We just need a little more information before you start learning with edX.</p>
     </div>
 <% } else {
     _.each( providers, function( provider) { %>
         <button type="submit"class="button button-primary button-<%- provider.name %> login-provider" data-provider-url="<%- provider.registerUrl %>">
-            <span class="icon <%- provider.iconClass %>"></span>Sign up with <%- provider.name %>
+            <span class="icon <%- provider.iconClass %>"></span>Register using <%- provider.name %>
         </button>
     <% });
 } %>
@@ -15,6 +15,7 @@
         <h4 class="message-title">An error occurred in your registration.</h4>
         <ul class="message-copy"></ul>
     </div>
+    <!-- PASSWORD FIELD DISPLAYS IN PLAIN TEXT -->
     <%= fields %>
-    <button class="action action-primary action-update js-register">Create My edX Account</button>
+    <button class="action action-primary action-update js-register">Register</button>
 </form>