diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo index 896c686aa5..3aab0924b8 100644 Binary files a/conf/locale/eo/LC_MESSAGES/django.mo and b/conf/locale/eo/LC_MESSAGES/django.mo differ diff --git a/conf/locale/eo/LC_MESSAGES/django.po b/conf/locale/eo/LC_MESSAGES/django.po index c3157ade09..8f9ae0de6c 100644 --- a/conf/locale/eo/LC_MESSAGES/django.po +++ b/conf/locale/eo/LC_MESSAGES/django.po @@ -37,8 +37,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1a\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2014-10-20 10:51-0400\n" -"PO-Revision-Date: 2014-10-20 14:51:41.189304\n" +"POT-Creation-Date: 2014-10-17 14:16+0000\n" +"PO-Revision-Date: 2014-10-17 14:16:50.815957\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "MIME-Version: 1.0\n" @@ -7750,20 +7750,14 @@ msgstr "Rését Pässwörd Ⱡ'#" msgid "Current Courses" msgstr "Çürrént Çöürsés Ⱡ'#" -#: lms/templates/dashboard.html -msgid "Looks like you haven't registered for any courses yet." -msgstr "" -"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 "Looks like you haven't enrolled in any courses yet." +msgstr "Lööks lïké ýöü hävén't énrölléd ïn äný çöürsés ýét. Ⱡ'σяєм ιρѕυм ∂#" #: lms/templates/dashboard.html msgid "Find courses now!" msgstr "Fïnd çöürsés nöw! Ⱡ'σ#" -#: 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" msgstr "Çöürsé-löädïng érrörs Ⱡ'σя#" @@ -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 -msgid "Unregister" -msgstr "Ûnrégïstér Ⱡ#" +#: lms/templates/instructor/instructor_dashboard_2/membership.html +msgid "Unenroll" +msgstr "Ûnénröll #" #: lms/templates/edit_unit_link.html msgid "View Unit in Studio" @@ -10414,16 +10409,16 @@ msgid "Access Courseware" msgstr "Àççéss Çöürséwäré Ⱡ'σ#" #: lms/templates/courseware/mktg_course_about.html -msgid "You Are Registered" -msgstr "Ýöü Àré Régïstéréd Ⱡ'σ#" +msgid "You Are Enrolled" +msgstr "Ýöü Àré Énrölléd Ⱡ'σ#" #: lms/templates/courseware/mktg_course_about.html -msgid "Register for" -msgstr "Régïstér för Ⱡ#" +msgid "Enroll in" +msgstr "Énröll ïn #" #. Translators: This is the second line on a button users can click. The #. 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 #. course as an auditor, as a verified student, etc #: lms/templates/courseware/mktg_course_about.html @@ -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 #. 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 #. a #. verified certificate. @@ -10441,8 +10436,8 @@ msgid "and proceed to verification" msgstr "änd pröçééd tö vérïfïçätïön Ⱡ'σяєм#" #: lms/templates/courseware/mktg_course_about.html -msgid "Registration Is Closed" -msgstr "Régïsträtïön Ìs Çlöséd Ⱡ'σяє#" +msgid "Enrollment Is Closed" +msgstr "Énröllmént Ìs Çlöséd Ⱡ'σя#" #: lms/templates/courseware/news.html msgid "News - MITx 6.002x" @@ -10693,8 +10688,8 @@ msgstr "" "päýmént, ör ýöü çän Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕ#" #: lms/templates/dashboard/_dashboard_course_listing.html -msgid "unregister" -msgstr "ünrégïstér Ⱡ#" +msgid "unenroll" +msgstr "ünénröll #" #: lms/templates/dashboard/_dashboard_course_listing.html msgid "for this course." @@ -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 -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 "" -"À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 -msgid "Are you sure you want to unregister from" -msgstr "Àré ýöü süré ýöü wänt tö ünrégïstér fröm Ⱡ'σяєм ιρѕυ#" +msgid "Are you sure you want to unenroll from" +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 msgid "" -"Are you sure you want to unregister from the verified {cert_name_long} track" -" of" +"Are you sure you want to unenroll from the verified {cert_name_long} track " +"of" msgstr "" -"Àré ýöü süré ýöü wänt tö ünrégïstér fröm thé vérïfïéd {cert_name_long} träçk" -" öf Ⱡ'σяєм ιρѕυм ∂σłσя #" +"Àré ýöü süré ýöü wänt tö ünénröll fröm thé vérïfïéd {cert_name_long} träçk " +"öf Ⱡ'σяєм ιρѕυм ∂σłσя #" #: lms/templates/dashboard/_dashboard_course_listing.html #: lms/templates/dashboard/_dashboard_course_listing.html @@ -12743,10 +12738,6 @@ msgstr "" msgid "Enroll" msgstr "Énröll Ⱡ'σяєм ιρѕ#" -#: 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" msgstr "Bätçh Bétä Téstér Àddïtïön Ⱡ'σяєм#" @@ -13989,6 +13980,7 @@ msgstr "" msgid "Student Account" msgstr "Stüdént Àççöünt Ⱡ'#" +#: lms/templates/student_profile/index.html #: lms/templates/student_profile/index.html msgid "Student Profile" msgstr "Stüdént Pröfïlé Ⱡ'#" diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.mo b/conf/locale/eo/LC_MESSAGES/djangojs.mo index 951f3e0930..683201cafd 100644 Binary files a/conf/locale/eo/LC_MESSAGES/djangojs.mo and b/conf/locale/eo/LC_MESSAGES/djangojs.mo differ diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.po b/conf/locale/eo/LC_MESSAGES/djangojs.po index 02169bc300..a7977b2a67 100644 --- a/conf/locale/eo/LC_MESSAGES/djangojs.po +++ b/conf/locale/eo/LC_MESSAGES/djangojs.po @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1a\n" "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n" -"POT-Creation-Date: 2014-10-20 10:50-0400\n" -"PO-Revision-Date: 2014-10-20 14:51:41.242372\n" +"POT-Creation-Date: 2014-10-17 14:15+0000\n" +"PO-Revision-Date: 2014-10-17 14:16:51.150051\n" "Last-Translator: \n" "Language-Team: openedx-translation \n" "MIME-Version: 1.0\n" @@ -2403,33 +2403,6 @@ msgstr "Çlösé Çälçülätör Ⱡ'σ#" msgid "Post body" 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 msgid "Error generating student profile information. Please try again." 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é " "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 msgid "Username" msgstr "Ûsérnämé #" @@ -3197,18 +3186,6 @@ msgstr "Pléäsé éntér ä välïd émäïl äddréss Ⱡ'σяєм ιρ#" msgid "Please enter a valid password" msgstr "Pléäsé éntér ä välïd pässwörd Ⱡ'σяєм #" -#: 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" msgstr "Pléäsé çhéçk ýöür émäïl tö çönfïrm thé çhängé Ⱡ'σяєм ιρѕυм#" @@ -4129,10 +4106,6 @@ msgstr "Pässwörd #" msgid "Change My Email Address" 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 msgid "Full Name" msgstr "Füll Nämé #" 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