diff --git a/lms/djangoapps/courseware/features/change_enrollment.feature b/lms/djangoapps/courseware/features/change_enrollment.feature index bfa528e99a..7ffefd7cf0 100644 --- a/lms/djangoapps/courseware/features/change_enrollment.feature +++ b/lms/djangoapps/courseware/features/change_enrollment.feature @@ -19,5 +19,5 @@ Then I should be on the dashboard page Then 2 "edx.course.enrollment.mode_changed" server event is emitted # 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 diff --git a/lms/djangoapps/courseware/features/registration.feature b/lms/djangoapps/courseware/features/registration.feature index 807c3d8cc5..fe270a3f85 100644 --- a/lms/djangoapps/courseware/features/registration.feature +++ b/lms/djangoapps/courseware/features/registration.feature @@ -12,11 +12,11 @@ Feature: LMS.Register for a course Then I should see the course numbered "6.002x" in my dashboard 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" And I visit the 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 And I should see an empty dashboard message And I should NOT see the course numbered "6.002x" in my dashboard diff --git a/lms/djangoapps/courseware/features/registration.py b/lms/djangoapps/courseware/features/registration.py index 5540696b17..12bbe26ee5 100644 --- a/lms/djangoapps/courseware/features/registration.py +++ b/lms/djangoapps/courseware/features/registration.py @@ -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) -@step(u'I unregister for the course numbered "([^"]*)"') -def i_unregister_for_that_course(_step, course): +@step(u'I unenroll from the course numbered "([^"]*)"') +def i_unenroll_from_that_course(_step, course): unregister_css = 'section.info a[href*="#unenroll-modal"][data-course-number*="%s"]' % course 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) diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py index ad1bad1251..b13c77165a 100644 --- a/lms/djangoapps/courseware/tests/test_views.py +++ b/lms/djangoapps/courseware/tests/test_views.py @@ -264,7 +264,7 @@ class ViewsTestCase(TestCase): def test_course_mktg_register(self): 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) def test_course_mktg_register_multiple_modes(self): @@ -280,7 +280,7 @@ class ViewsTestCase(TestCase): ) 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) # clean up course modes CourseMode.objects.all().delete() @@ -291,7 +291,7 @@ class ViewsTestCase(TestCase): # supports only English, override the language setting # and use English. 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}) def test_mktg_about_language_openedx(self): @@ -299,7 +299,7 @@ class ViewsTestCase(TestCase): # may want to support languages other than English, # so respect the language code. 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): # log into a staff account diff --git a/lms/templates/courseware/mktg_course_about.html b/lms/templates/courseware/mktg_course_about.html index 67962dc8b9..48aa799372 100644 --- a/lms/templates/courseware/mktg_course_about.html +++ b/lms/templates/courseware/mktg_course_about.html @@ -49,26 +49,26 @@ %if show_courseware_link: ${_("Access Courseware")} %else: -
${_("You Are Registered")}
+
${_("You Are Enrolled")}
%endif %elif allow_registration: - ${_("Register for")} ${course.display_number_with_default | h} + ${_("Enroll in")} ${course.display_number_with_default | h} %if len(course_modes) > 1: - ## 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 ${_("and choose your student track")} %elif "professional" in course_modes: - ## 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. ${_("and proceed to verification")} %endif %else: -
${_("Registration Is Closed")}
+
${_("Enrollment Is Closed")}
%endif diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 6412106f27..253a56220f 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -186,12 +186,12 @@ % else:
% if settings.FEATURES.get('COURSES_ARE_BROWSABLE'): -

${_("Looks like you haven't registered for any courses yet.")}

+

${_("Looks like you haven't enrolled in any courses yet.")}

${_("Find courses now!")} % else: -

${_("Looks like you haven't been enrolled in any courses yet.")}

+

${_("Looks like you haven't enrolled in any courses yet.")}

%endif
% endif @@ -389,7 +389,7 @@
- +
diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html index 20e86d887a..dc2279f9e4 100644 --- a/lms/templates/dashboard/_dashboard_course_listing.html +++ b/lms/templates/dashboard/_dashboard_course_listing.html @@ -130,7 +130,7 @@ % if is_course_blocked:

${_('You can no longer access this course because payment has not yet been received. you can contact the account holder to request payment, or you can')} - ${_('unregister')} + ${_('unenroll')} ${_('for this course.')}

%endif @@ -154,64 +154,64 @@ % if is_paid_course and show_refund_option: ## Translators: The course's name will be added to the end of this sentence. % if not is_course_blocked: - - ${_('Unregister')} + ${_('Unenroll')} % else: - - ${_('Unregister')} + ${_('Unenroll')} % endif % elif is_paid_course and not show_refund_option: ## Translators: The course's name will be added to the end of this sentence. % if not is_course_blocked: - - ${_('Unregister')} + ${_('Unenroll')} % else: - - ${_('Unregister')} + ${_('Unenroll')} % endif % elif enrollment.mode != "verified": ## Translators: The course's name will be added to the end of this sentence. % if not is_course_blocked: - - ${_('Unregister')} + + ${_('Unenroll')} % else: - - ${_('Unregister')} + + ${_('Unenroll')} % endif % elif show_refund_option: ## Translators: The course's name will be added to the end of this sentence. % if not is_course_blocked: - - ${_('Unregister')} + ${_('Unenroll')} % else: - - ${_('Unregister')} + ${_('Unenroll')} % endif % else: ## Translators: The course's name will be added to the end of this sentence. % if not is_course_blocked: - - ${_('Unregister')} + ${_('Unenroll')} % else: - - ${_('Unregister')} + ${_('Unenroll')} % endif % endif