Skip to content

E
edx-platform
Commit e7609597 by Will Daly
Options

Change text of registration to enrollment

parent 3f33fa4e
Showing with 39 additions and 39 deletions
lms/djangoapps/courseware/features/change_enrollment.feature
...@@ -19,5 +19,5 @@ Then I should be on the dashboard page ...@@ -19,5 +19,5 @@ Then I should be on the dashboard page
Then 2 "edx.course.enrollment.mode_changed" server event is emitted Then 2 "edx.course.enrollment.mode_changed" server event is emitted
# don't emit another mode_changed event upon unenrollment # don't emit another mode_changed event upon unenrollment
When I unregister for the course numbered "6.002x" When I unenroll from the course numbered "6.002x"
Then 2 "edx.course.enrollment.mode_changed" server events is emitted Then 2 "edx.course.enrollment.mode_changed" server events is emitted
lms/djangoapps/courseware/features/registration.feature
...@@ -12,11 +12,11 @@ Feature: LMS.Register for a course ...@@ -12,11 +12,11 @@ Feature: LMS.Register for a course
Then I should see the course numbered "6.002x" in my dashboard Then I should see the course numbered "6.002x" in my dashboard
And a "edx.course.enrollment.activated" server event is emitted And a "edx.course.enrollment.activated" server event is emitted
Scenario: I can unregister for a course Scenario: I can unenroll from a course
Given I am registered for the course "6.002x" Given I am registered for the course "6.002x"
And I visit the dashboard And I visit the dashboard
Then I should see the course numbered "6.002x" in my dashboard Then I should see the course numbered "6.002x" in my dashboard
When I unregister for the course numbered "6.002x" When I unenroll from the course numbered "6.002x"
Then I should be on the dashboard page Then I should be on the dashboard page
And I should see an empty dashboard message And I should see an empty dashboard message
And I should NOT see the course numbered "6.002x" in my dashboard And I should NOT see the course numbered "6.002x" in my dashboard
......
lms/djangoapps/courseware/features/registration.py
...@@ -44,9 +44,9 @@ def i_should_see_that_course_in_my_dashboard(_step, doesnt_appear, course): ...@@ -44,9 +44,9 @@ def i_should_see_that_course_in_my_dashboard(_step, doesnt_appear, course):
assert world.is_css_present(course_link_css) assert world.is_css_present(course_link_css)
@step(u'I unregister for the course numbered "([^"]*)"') @step(u'I unenroll from the course numbered "([^"]*)"')
def i_unregister_for_that_course(_step, course): def i_unenroll_from_that_course(_step, course):
unregister_css = 'section.info a[href*="#unenroll-modal"][data-course-number*="%s"]' % course unregister_css = 'section.info a[href*="#unenroll-modal"][data-course-number*="%s"]' % course
world.css_click(unregister_css) world.css_click(unregister_css)
button_css = 'section#unenroll-modal input[value="Unregister"]' button_css = 'section#unenroll-modal input[value="Unenroll"]'
world.css_click(button_css) world.css_click(button_css)
lms/djangoapps/courseware/tests/test_views.py
...@@ -264,7 +264,7 @@ class ViewsTestCase(TestCase): ...@@ -264,7 +264,7 @@ class ViewsTestCase(TestCase):
def test_course_mktg_register(self): def test_course_mktg_register(self):
response = self._load_mktg_about() response = self._load_mktg_about()
self.assertIn('Register for', response.content) self.assertIn('Enroll in', response.content)
self.assertNotIn('and choose your student track', response.content) self.assertNotIn('and choose your student track', response.content)
def test_course_mktg_register_multiple_modes(self): def test_course_mktg_register_multiple_modes(self):
...@@ -280,7 +280,7 @@ class ViewsTestCase(TestCase): ...@@ -280,7 +280,7 @@ class ViewsTestCase(TestCase):
) )
response = self._load_mktg_about() response = self._load_mktg_about()
self.assertIn('Register for', response.content) self.assertIn('Enroll in', response.content)
self.assertIn('and choose your student track', response.content) self.assertIn('and choose your student track', response.content)
# clean up course modes # clean up course modes
CourseMode.objects.all().delete() CourseMode.objects.all().delete()
...@@ -291,7 +291,7 @@ class ViewsTestCase(TestCase): ...@@ -291,7 +291,7 @@ class ViewsTestCase(TestCase):
# supports only English, override the language setting # supports only English, override the language setting
# and use English. # and use English.
response = self._load_mktg_about(language='eo') response = self._load_mktg_about(language='eo')
self.assertContains(response, "Register for") self.assertContains(response, "Enroll in")
@patch.dict(settings.FEATURES, {'IS_EDX_DOMAIN': False}) @patch.dict(settings.FEATURES, {'IS_EDX_DOMAIN': False})
def test_mktg_about_language_openedx(self): def test_mktg_about_language_openedx(self):
...@@ -299,7 +299,7 @@ class ViewsTestCase(TestCase): ...@@ -299,7 +299,7 @@ class ViewsTestCase(TestCase):
# may want to support languages other than English, # may want to support languages other than English,
# so respect the language code. # so respect the language code.
response = self._load_mktg_about(language='eo') response = self._load_mktg_about(language='eo')
self.assertContains(response, u"Régïstér för".encode('utf-8')) self.assertContains(response, u"Énröll ïn".encode('utf-8'))
def test_submission_history_accepts_valid_ids(self): def test_submission_history_accepts_valid_ids(self):
# log into a staff account # log into a staff account
......
lms/templates/courseware/mktg_course_about.html
...@@ -49,26 +49,26 @@ ...@@ -49,26 +49,26 @@
%if show_courseware_link: %if show_courseware_link:
<a class="action access-courseware" href="${course_target}" target="_top">${_("Access Courseware")}</a> <a class="action access-courseware" href="${course_target}" target="_top">${_("Access Courseware")}</a>
%else: %else:
<div class="action is-registered">${_("You Are Registered")}</div> <div class="action is-registered">${_("You Are Enrolled")}</div>
%endif %endif
%elif allow_registration: %elif allow_registration:
<a class="action action-register register ${'has-option-verified' if len(course_modes) > 1 else ''}" href="#">${_("Register for")} <strong>${course.display_number_with_default | h}</strong> <a class="action action-register register ${'has-option-verified' if len(course_modes) > 1 else ''}" href="#">${_("Enroll in")} <strong>${course.display_number_with_default | h}</strong>
%if len(course_modes) > 1: %if len(course_modes) > 1:
<span class="track"> <span class="track">
## Translators: This is the second line on a button users can click. The first line is "Register for COURSE_NAME" ## Translators: This is the second line on a button users can click. The first line is "Enroll in COURSE_NAME"
## The "choose your student track" means users can select between taking the course as an auditor, as a verified student, etc ## The "choose your student track" means users can select between taking the course as an auditor, as a verified student, etc
${_("and choose your student track")} ${_("and choose your student track")}
</span> </span>
%elif "professional" in course_modes: %elif "professional" in course_modes:
<span class="track"> <span class="track">
## Translators: This is the second line on a button users can click. The first line is "Register for COURSE_NAME" ## Translators: This is the second line on a button users can click. The first line is "Enroll in COURSE_NAME"
## 'Verification' here refers to verifying one's identity in order to receive a verified certificate. ## 'Verification' here refers to verifying one's identity in order to receive a verified certificate.
${_("and proceed to verification")} ${_("and proceed to verification")}
</span> </span>
%endif %endif
</a> </a>
%else: %else:
<div class="action registration-closed is-disabled">${_("Registration Is Closed")}</div> <div class="action registration-closed is-disabled">${_("Enrollment Is Closed")}</div>
%endif %endif
</li> </li>
</ul> </ul>
......
lms/templates/dashboard.html
...@@ -186,12 +186,12 @@ ...@@ -186,12 +186,12 @@
% else: % else:
<section class="empty-dashboard-message"> <section class="empty-dashboard-message">
% if settings.FEATURES.get('COURSES_ARE_BROWSABLE'): % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'):
<p>${_("Looks like you haven't registered for any courses yet.")}</p> <p>${_("Looks like you haven't enrolled in any courses yet.")}</p>
<a href="${marketing_link('COURSES')}"> <a href="${marketing_link('COURSES')}">
${_("Find courses now!")} ${_("Find courses now!")}
</a> </a>
% else: % else:
<p>${_("Looks like you haven't been enrolled in any courses yet.")}</p> <p>${_("Looks like you haven't enrolled in any courses yet.")}</p>
%endif %endif
</section> </section>
% endif % endif
...@@ -389,7 +389,7 @@ ...@@ -389,7 +389,7 @@
<input name="course_id" id="unenroll_course_id" type="hidden" /> <input name="course_id" id="unenroll_course_id" type="hidden" />
<input name="enrollment_action" type="hidden" value="unenroll" /> <input name="enrollment_action" type="hidden" value="unenroll" />
<div class="submit"> <div class="submit">
<input name="submit" type="submit" value="${_("Unregister")}" /> <input name="submit" type="submit" value="${_("Unenroll")}" />
</div> </div>
</form> </form>
</div> </div>
......
lms/templates/dashboard/_dashboard_course_listing.html
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
% if is_course_blocked: % if is_course_blocked:
<p id="block-course-msg" class="course-block"> <p id="block-course-msg" class="course-block">
${_('You can no longer access this course because payment has not yet been received. you can <a href="#">contact the account holder</a> to request payment, or you can')} ${_('You can no longer access this course because payment has not yet been received. you can <a href="#">contact the account holder</a> to request payment, or you can')}
<a id="unregister_block_course" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" href="#unenroll-modal" > ${_('unregister')} </a> <a id="unregister_block_course" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" href="#unenroll-modal" > ${_('unenroll')} </a>
${_('for this course.')} ${_('for this course.')}
</p> </p>
%endif %endif
...@@ -154,64 +154,64 @@ ...@@ -154,64 +154,64 @@
% if is_paid_course and show_refund_option: % if is_paid_course and show_refund_option:
## Translators: The course's name will be added to the end of this sentence. ## Translators: The course's name will be added to the end of this sentence.
% if not is_course_blocked: % if not is_course_blocked:
<a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unregister from the purchased course")}'; <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unenroll from the purchased course")}';
document.getElementById('refund-info').innerHTML=gettext('You will be refunded the amount you paid.')"> document.getElementById('refund-info').innerHTML=gettext('You will be refunded the amount you paid.')">
${_('Unregister')} ${_('Unenroll')}
</a> </a>
% else: % else:
<a class="disable-look-unregister" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unregister from the purchased course")}'; <a class="disable-look-unregister" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unenroll from the purchased course")}';
document.getElementById('refund-info').innerHTML=gettext('You will be refunded the amount you paid.')"> document.getElementById('refund-info').innerHTML=gettext('You will be refunded the amount you paid.')">
${_('Unregister')} ${_('Unenroll')}
</a> </a>
% endif % endif
% elif is_paid_course and not show_refund_option: % elif is_paid_course and not show_refund_option:
## Translators: The course's name will be added to the end of this sentence. ## Translators: The course's name will be added to the end of this sentence.
% if not is_course_blocked: % if not is_course_blocked:
<a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unregister from the purchased course")}'; <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unenroll from the purchased course")}';
document.getElementById('refund-info').innerHTML=gettext('You will not be refunded the amount you paid.')"> document.getElementById('refund-info').innerHTML=gettext('You will not be refunded the amount you paid.')">
${_('Unregister')} ${_('Unenroll')}
</a> </a>
% else: % else:
<a class="disable-look-unregister" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unregister from the purchased course")}'; <a class="disable-look-unregister" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unenroll from the purchased course")}';
document.getElementById('refund-info').innerHTML=gettext('You will not be refunded the amount you paid.')"> document.getElementById('refund-info').innerHTML=gettext('You will not be refunded the amount you paid.')">
${_('Unregister')} ${_('Unenroll')}
</a> </a>
% endif % endif
% elif enrollment.mode != "verified": % elif enrollment.mode != "verified":
## Translators: The course's name will be added to the end of this sentence. ## Translators: The course's name will be added to the end of this sentence.
% if not is_course_blocked: % if not is_course_blocked:
<a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unregister from")}'; document.getElementById('refund-info').innerHTML=''"> <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unenroll from")}'; document.getElementById('refund-info').innerHTML=''">
${_('Unregister')} ${_('Unenroll')}
</a> </a>
% else: % else:
<a class="disable-look-unregister" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unregister from")}'; document.getElementById('refund-info').innerHTML=''"> <a class="disable-look-unregister" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unenroll from")}'; document.getElementById('refund-info').innerHTML=''">
${_('Unregister')} ${_('Unenroll')}
</a> </a>
% endif % endif
% elif show_refund_option: % elif show_refund_option:
## Translators: The course's name will be added to the end of this sentence. ## Translators: The course's name will be added to the end of this sentence.
% if not is_course_blocked: % if not is_course_blocked:
<a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unregister from the verified {cert_name_long} track of").format(cert_name_long=cert_name_long)}'; <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unenroll from the verified {cert_name_long} track of").format(cert_name_long=cert_name_long)}';
document.getElementById('refund-info').innerHTML=gettext('You will be refunded the amount you paid.')"> document.getElementById('refund-info').innerHTML=gettext('You will be refunded the amount you paid.')">
${_('Unregister')} ${_('Unenroll')}
</a> </a>
% else: % else:
<a class="disable-look-unregister" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unregister from the verified {cert_name_long} track of").format(cert_name_long=cert_name_long)}'; <a class="disable-look-unregister" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unenroll from the verified {cert_name_long} track of").format(cert_name_long=cert_name_long)}';
document.getElementById('refund-info').innerHTML=gettext('You will be refunded the amount you paid.')"> document.getElementById('refund-info').innerHTML=gettext('You will be refunded the amount you paid.')">
${_('Unregister')} ${_('Unenroll')}
</a> </a>
% endif % endif
% else: % else:
## Translators: The course's name will be added to the end of this sentence. ## Translators: The course's name will be added to the end of this sentence.
% if not is_course_blocked: % if not is_course_blocked:
<a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unregister from the verified {cert_name_long} track of").format(cert_name_long=cert_name_long)}'; <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unenroll from the verified {cert_name_long} track of").format(cert_name_long=cert_name_long)}';
document.getElementById('refund-info').innerHTML=gettext('The refund deadline for this course has passed, so you will not receive a refund.')"> document.getElementById('refund-info').innerHTML=gettext('The refund deadline for this course has passed, so you will not receive a refund.')">
${_('Unregister')} ${_('Unenroll')}
</a> </a>
% else: % else:
<a class="disable-look-unregister" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unregister from the verified {cert_name_long} track of").format(cert_name_long=cert_name_long)}'; <a class="disable-look-unregister" data-course-id="${course.id | h}" data-course-number="${course.number | h}" onclick="document.getElementById('track-info').innerHTML='${_("Are you sure you want to unenroll from the verified {cert_name_long} track of").format(cert_name_long=cert_name_long)}';
document.getElementById('refund-info').innerHTML=gettext('The refund deadline for this course has passed, so you will not receive a refund.')"> document.getElementById('refund-info').innerHTML=gettext('The refund deadline for this course has passed, so you will not receive a refund.')">
${_('Unregister')} ${_('Unenroll')}
</a> </a>
% endif % endif
% endif % endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment