From bcef7611d40b10439699b773c1d8f77153cea28b Mon Sep 17 00:00:00 2001 From: Renzo Lucioni Date: Wed, 29 Oct 2014 14:30:59 -0400 Subject: [PATCH] Clean up logistration copy --- common/djangoapps/user_api/views.py | 20 +++++++++---------- .../js/spec_helpers/edx.utils.validate.js | 8 ++++---- .../js/student_account/views/AccessView.js | 4 ++-- .../student_account/access.underscore | 4 ++-- .../student_account/login.underscore | 4 ++-- .../student_account/login_and_register.html | 2 +- .../student_account/password_reset.underscore | 11 +++++----- .../student_account/register.underscore | 7 ++++--- 8 files changed, 31 insertions(+), 29 deletions(-) diff --git a/common/djangoapps/user_api/views.py b/common/djangoapps/user_api/views.py index 2397b3c4ed..17356fe31d 100644 --- a/common/djangoapps/user_api/views.py +++ b/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 ) diff --git a/common/static/js/spec_helpers/edx.utils.validate.js b/common/static/js/spec_helpers/edx.utils.validate.js index 67cab08d37..bd9b1ff1ab 100644 --- a/common/static/js/spec_helpers/edx.utils.validate.js +++ b/common/static/js/spec_helpers/edx.utils.validate.js @@ -10,10 +10,10 @@ var edx = edx || {}; validate: { msg: { - email: '
  • A properly formatted e-mail is required
    • ', - min: '
  • <%= field %> must be a minimum of <%= count %> characters long
    • ', - max: '
  • <%= field %> must be a maximum of <%= count %> characters long
    • ', - required: '
  • <%= field %> field is required
    • ', + email: '
  • The email address you\'ve provided is invalid.
    • ', + min: '
  • <%= field %> must have at least <%= count %> characters.
    • ', + max: '
  • <%= field %> can only contain up to <%= count %> characters.
    • ', + required: '
  • <%= field %> is required.
    • ', custom: '
  • <%= content %>
    • ' }, diff --git a/lms/static/js/student_account/views/AccessView.js b/lms/static/js/student_account/views/AccessView.js index f29450b7d0..807866cead 100644 --- a/lms/static/js/student_account/views/AccessView.js +++ b/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', diff --git a/lms/templates/student_account/access.underscore b/lms/templates/student_account/access.underscore index a920aaed56..46be42e50f 100644 --- a/lms/templates/student_account/access.underscore +++ b/lms/templates/student_account/access.underscore @@ -1,6 +1,6 @@

    Welcome!

    -

    Please log in to continue

    +

    Log in or register to take courses from the world's best universities.

    @@ -14,7 +14,7 @@

    checked<% } %>> - +

    diff --git a/lms/templates/student_account/login.underscore b/lms/templates/student_account/login.underscore index d6f37273b7..8075c79ed5 100644 --- a/lms/templates/student_account/login.underscore +++ b/lms/templates/student_account/login.underscore @@ -1,7 +1,7 @@ diff --git a/lms/templates/student_account/register.underscore b/lms/templates/student_account/register.underscore index 294428582e..dc9e1e37b8 100644 --- a/lms/templates/student_account/register.underscore +++ b/lms/templates/student_account/register.underscore @@ -1,11 +1,11 @@ <% if (currentProvider) { %>
    -

    You've successfully signed in with <%- currentProvider %>. We just need a little more information before you start learning with edX.

    +

    You've successfully logged into <%- currentProvider %>. We just need a little more information before you start learning with edX.

    <% } else { _.each( providers, function( provider) { %> <% }); } %> @@ -15,6 +15,7 @@

    An error occurred in your registration.

    + <%= fields %> - +