Skip to content

E
edx-platform
Commit 7496041f by Will Daly
Options

Merge pull request #5567 from edx/will/register-says-enroll 

Change text of registration to enrollment
parents 3f33fa4e 5a9da83a
Showing with 85 additions and 120 deletions
conf/locale/eo/LC_MESSAGES/django.po
...@@ -37,8 +37,8 @@ msgid "" ...@@ -37,8 +37,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.1a\n" "Project-Id-Version: 0.1a\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-10-20 10:51-0400\n" "POT-Creation-Date: 2014-10-17 14:16+0000\n"
"PO-Revision-Date: 2014-10-20 14:51:41.189304\n" "PO-Revision-Date: 2014-10-17 14:16:50.815957\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -7750,21 +7750,15 @@ msgstr "Rését Pässwörd Ⱡ'#" ...@@ -7750,21 +7750,15 @@ msgstr "Rését Pässwörd Ⱡ'#"
msgid "Current Courses" msgid "Current Courses"
msgstr "Çürrént Çöürsés Ⱡ'#" msgstr "Çürrént Çöürsés Ⱡ'#"
#: lms/templates/dashboard.html #: lms/templates/dashboard.html lms/templates/dashboard.html
msgid "Looks like you haven't registered for any courses yet." msgid "Looks like you haven't enrolled in any courses yet."
msgstr "" msgstr "Lööks lïké ýöü hävén't énrölléd ïn äný çöürsés ýét. Ⱡ'σяєм ιρѕυм ∂#"
"Lööks lïké ýöü hävén't régïstéréd för äný çöürsés ýét. Ⱡ'σяєм ιρѕυм ∂σ#"
#: lms/templates/dashboard.html #: lms/templates/dashboard.html
msgid "Find courses now!" msgid "Find courses now!"
msgstr "Fïnd çöürsés nöw! Ⱡ'σ#" msgstr "Fïnd çöürsés nöw! Ⱡ'σ#"
#: lms/templates/dashboard.html #: lms/templates/dashboard.html
msgid "Looks like you haven't been enrolled in any courses yet."
msgstr ""
"Lööks lïké ýöü hävén't ßéén énrölléd ïn äný çöürsés ýét. Ⱡ'σяєм ιρѕυм ∂σł#"
#: lms/templates/dashboard.html
msgid "Course-loading errors" msgid "Course-loading errors"
msgstr "Çöürsé-löädïng érrörs Ⱡ'σя#" msgstr "Çöürsé-löädïng érrörs Ⱡ'σя#"
...@@ -7866,8 +7860,9 @@ msgstr "" ...@@ -7866,8 +7860,9 @@ msgstr ""
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
msgid "Unregister" #: lms/templates/instructor/instructor_dashboard_2/membership.html
msgstr "Ûnrégïstér Ⱡ#" msgid "Unenroll"
msgstr "Ûnénröll #"
#: lms/templates/edit_unit_link.html #: lms/templates/edit_unit_link.html
msgid "View Unit in Studio" msgid "View Unit in Studio"
...@@ -10414,16 +10409,16 @@ msgid "Access Courseware" ...@@ -10414,16 +10409,16 @@ msgid "Access Courseware"
msgstr "Àççéss Çöürséwäré Ⱡ'σ#" msgstr "Àççéss Çöürséwäré Ⱡ'σ#"
#: lms/templates/courseware/mktg_course_about.html #: lms/templates/courseware/mktg_course_about.html
msgid "You Are Registered" msgid "You Are Enrolled"
msgstr "Ýöü Àré Régïstéréd Ⱡ'σ#" msgstr "Ýöü Àré Énrölléd Ⱡ'σ#"
#: lms/templates/courseware/mktg_course_about.html #: lms/templates/courseware/mktg_course_about.html
msgid "Register for" msgid "Enroll in"
msgstr "Régïstér för Ⱡ#" msgstr "Énröll ïn #"
#. Translators: This is the second line on a button users can click. The #. Translators: This is the second line on a button users can click. The
#. first #. first
#. line is "Register for COURSE_NAME" #. line is "Enroll in COURSE_NAME"
#. The "choose your student track" means users can select between taking the #. The "choose your student track" means users can select between taking the
#. course as an auditor, as a verified student, etc #. course as an auditor, as a verified student, etc
#: lms/templates/courseware/mktg_course_about.html #: lms/templates/courseware/mktg_course_about.html
...@@ -10432,7 +10427,7 @@ msgstr "änd çhöösé ýöür stüdént träçk Ⱡ'σяєм #" ...@@ -10432,7 +10427,7 @@ msgstr "änd çhöösé ýöür stüdént träçk Ⱡ'σяєм #"
#. Translators: This is the second line on a button users can click. The #. Translators: This is the second line on a button users can click. The
#. first #. first
#. line is "Register for COURSE_NAME" #. line is "Enroll in COURSE_NAME"
#. 'Verification' here refers to verifying one's identity in order to receive #. 'Verification' here refers to verifying one's identity in order to receive
#. a #. a
#. verified certificate. #. verified certificate.
...@@ -10441,8 +10436,8 @@ msgid "and proceed to verification" ...@@ -10441,8 +10436,8 @@ msgid "and proceed to verification"
msgstr "änd pröçééd tö vérïfïçätïön Ⱡ'σяєм#" msgstr "änd pröçééd tö vérïfïçätïön Ⱡ'σяєм#"
#: lms/templates/courseware/mktg_course_about.html #: lms/templates/courseware/mktg_course_about.html
msgid "Registration Is Closed" msgid "Enrollment Is Closed"
msgstr "Régïsträtïön Ìs Çlöséd Ⱡ'σяє#" msgstr "Énröllmént Ìs Çlöséd Ⱡ'σя#"
#: lms/templates/courseware/news.html #: lms/templates/courseware/news.html
msgid "News - MITx 6.002x" msgid "News - MITx 6.002x"
...@@ -10693,8 +10688,8 @@ msgstr "" ...@@ -10693,8 +10688,8 @@ msgstr ""
"päýmént, ör ýöü çän Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕ#" "päýmént, ör ýöü çän Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕ#"
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
msgid "unregister" msgid "unenroll"
msgstr "ünrégïstér Ⱡ#" msgstr "ünénröll #"
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
msgid "for this course." msgid "for this course."
...@@ -10715,26 +10710,26 @@ msgstr "Vïéw Çöürsé Ⱡ#" ...@@ -10715,26 +10710,26 @@ msgstr "Vïéw Çöürsé Ⱡ#"
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
msgid "Are you sure you want to unregister from the purchased course" msgid "Are you sure you want to unenroll from the purchased course"
msgstr "" msgstr ""
"Àré ýöü süré ýöü wänt tö ünrégïstér fröm thé pürçhäséd çöürsé Ⱡ'σяєм ιρѕυм " "Àré ýöü süré ýöü wänt tö ünénröll fröm thé pürçhäséd çöürsé Ⱡ'σяєм ιρѕυм "
"∂σłσя#" "∂σłσ#"
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
msgid "Are you sure you want to unregister from" msgid "Are you sure you want to unenroll from"
msgstr "Àré ýöü süré ýöü wänt tö ünrégïstér fröm Ⱡ'σяєм ιρѕυ#" msgstr "Àré ýöü süré ýöü wänt tö ünénröll fröm Ⱡ'σяєм ιρѕ#"
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
msgid "" msgid ""
"Are you sure you want to unregister from the verified {cert_name_long} track" "Are you sure you want to unenroll from the verified {cert_name_long} track "
" of" "of"
msgstr "" msgstr ""
"Àré ýöü süré ýöü wänt tö ünrégïstér fröm thé vérïfïéd {cert_name_long} träçk" "Àré ýöü süré ýöü wänt tö ünénröll fröm thé vérïfïéd {cert_name_long} träçk "
" öf Ⱡ'σяєм ιρѕυм ∂σłσя #" "öf Ⱡ'σяєм ιρѕυм ∂σłσя #"
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
#: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html
...@@ -12744,10 +12739,6 @@ msgid "Enroll" ...@@ -12744,10 +12739,6 @@ msgid "Enroll"
msgstr "Énröll Ⱡ'σяєм ιρѕ#" msgstr "Énröll Ⱡ'σяєм ιρѕ#"
#: lms/templates/instructor/instructor_dashboard_2/membership.html #: lms/templates/instructor/instructor_dashboard_2/membership.html
msgid "Unenroll"
msgstr "Ûnénröll #"
#: lms/templates/instructor/instructor_dashboard_2/membership.html
msgid "Batch Beta Tester Addition" msgid "Batch Beta Tester Addition"
msgstr "Bätçh Bétä Téstér Àddïtïön Ⱡ'σяєм#" msgstr "Bätçh Bétä Téstér Àddïtïön Ⱡ'σяєм#"
...@@ -13990,6 +13981,7 @@ msgid "Student Account" ...@@ -13990,6 +13981,7 @@ msgid "Student Account"
msgstr "Stüdént Àççöünt Ⱡ'#" msgstr "Stüdént Àççöünt Ⱡ'#"
#: lms/templates/student_profile/index.html #: lms/templates/student_profile/index.html
#: lms/templates/student_profile/index.html
msgid "Student Profile" msgid "Student Profile"
msgstr "Stüdént Pröfïlé Ⱡ'#" msgstr "Stüdént Pröfïlé Ⱡ'#"
......
conf/locale/eo/LC_MESSAGES/djangojs.po
...@@ -26,8 +26,8 @@ msgid "" ...@@ -26,8 +26,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.1a\n" "Project-Id-Version: 0.1a\n"
"Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
"POT-Creation-Date: 2014-10-20 10:50-0400\n" "POT-Creation-Date: 2014-10-17 14:15+0000\n"
"PO-Revision-Date: 2014-10-20 14:51:41.242372\n" "PO-Revision-Date: 2014-10-17 14:16:51.150051\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n" "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -2403,33 +2403,6 @@ msgstr "Çlösé Çälçülätör Ⱡ'σ#" ...@@ -2403,33 +2403,6 @@ msgstr "Çlösé Çälçülätör Ⱡ'σ#"
msgid "Post body" msgid "Post body"
msgstr "Pöst ßödý #" msgstr "Pöst ßödý #"
#. Translators: "Distribution" refers to a grade distribution. This error
#. message appears when there is an error getting the data on grade
#. distribution.;
#: lms/static/coffee/src/instructor_dashboard/analytics.js
msgid "Error fetching distribution."
msgstr "Érrör fétçhïng dïstrïßütïön. Ⱡ'σяєм #"
#: lms/static/coffee/src/instructor_dashboard/analytics.js
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Unavailable metric display."
msgstr "Ûnäväïläßlé métrïç dïspläý. Ⱡ'σяєм#"
#: lms/static/coffee/src/instructor_dashboard/analytics.js
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Error fetching grade distributions."
msgstr "Érrör fétçhïng grädé dïstrïßütïöns. Ⱡ'σяєм ιρ#"
#: lms/static/coffee/src/instructor_dashboard/analytics.js
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Last Updated: <%= timestamp %>"
msgstr "Läst Ûpdätéd: <%= timestamp %> Ⱡ'σ#"
#: lms/static/coffee/src/instructor_dashboard/analytics.js
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "<%= num_students %> students scored."
msgstr "<%= num_students %> stüdénts sçöréd. Ⱡ'σя#"
#: lms/static/coffee/src/instructor_dashboard/data_download.js #: lms/static/coffee/src/instructor_dashboard/data_download.js
msgid "Error generating student profile information. Please try again." msgid "Error generating student profile information. Please try again."
msgstr "" msgstr ""
...@@ -2465,6 +2438,22 @@ msgstr "" ...@@ -2465,6 +2438,22 @@ msgstr ""
"Lïnks äré générätéd ön démänd änd éxpïré wïthïn 5 mïnütés düé tö thé " "Lïnks äré générätéd ön démänd änd éxpïré wïthïn 5 mïnütés düé tö thé "
"sénsïtïvé nätüré öf stüdént ïnförmätïön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#" "sénsïtïvé nätüré öf stüdént ïnförmätïön. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Unavailable metric display."
msgstr "Ûnäväïläßlé métrïç dïspläý. Ⱡ'σяєм#"
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Error fetching grade distributions."
msgstr "Érrör fétçhïng grädé dïstrïßütïöns. Ⱡ'σяєм ιρ#"
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "Last Updated: <%= timestamp %>"
msgstr "Läst Ûpdätéd: <%= timestamp %> Ⱡ'σ#"
#: lms/static/coffee/src/instructor_dashboard/instructor_analytics.js
msgid "<%= num_students %> students scored."
msgstr "<%= num_students %> stüdénts sçöréd. Ⱡ'σя#"
#: lms/static/coffee/src/instructor_dashboard/membership.js #: lms/static/coffee/src/instructor_dashboard/membership.js
msgid "Username" msgid "Username"
msgstr "Ûsérnämé #" msgstr "Ûsérnämé #"
...@@ -3198,18 +3187,6 @@ msgid "Please enter a valid password" ...@@ -3198,18 +3187,6 @@ msgid "Please enter a valid password"
msgstr "Pléäsé éntér ä välïd pässwörd Ⱡ'σяєм #" msgstr "Pléäsé éntér ä välïd pässwörd Ⱡ'σяєм #"
#: lms/static/js/student_account/account.js #: lms/static/js/student_account/account.js
msgid ""
"Password reset email sent. Follow the link in the email to change your "
"password."
msgstr ""
"Pässwörd rését émäïl sént. Föllöw thé lïnk ïn thé émäïl tö çhängé ýöür "
"pässwörd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
#: lms/static/js/student_account/account.js
msgid "We weren't able to send you a password reset email."
msgstr "Wé wérén't äßlé tö sénd ýöü ä pässwörd rését émäïl. Ⱡ'σяєм ιρѕυм ∂#"
#: lms/static/js/student_account/account.js
msgid "Please check your email to confirm the change" msgid "Please check your email to confirm the change"
msgstr "Pléäsé çhéçk ýöür émäïl tö çönfïrm thé çhängé Ⱡ'σяєм ιρѕυм#" msgstr "Pléäsé çhéçk ýöür émäïl tö çönfïrm thé çhängé Ⱡ'σяєм ιρѕυм#"
...@@ -4129,10 +4106,6 @@ msgstr "Pässwörd #" ...@@ -4129,10 +4106,6 @@ msgstr "Pässwörd #"
msgid "Change My Email Address" msgid "Change My Email Address"
msgstr "Çhängé Mý Émäïl Àddréss Ⱡ'σяє#" msgstr "Çhängé Mý Émäïl Àddréss Ⱡ'σяє#"
#: lms/templates/student_account/account.underscore
msgid "Reset Password"
msgstr "Rését Pässwörd Ⱡ'#"
#: lms/templates/student_profile/profile.underscore #: lms/templates/student_profile/profile.underscore
msgid "Full Name" msgid "Full Name"
msgstr "Füll Nämé #" msgstr "Füll Nämé #"
......
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