From 3b9bfce6e3327b0360496c3cd929ac973110b3f2 Mon Sep 17 00:00:00 2001 From: Jianfei Wang Date: Thu, 27 Jun 2013 21:28:37 +0800 Subject: [PATCH 01/56] tsinghuax i18n changes Extract strings for i18n Fix Javascript i18n Fix Email i18n Fix JS&Widgets i18n --- cms/djangoapps/contentstore/utils.py | 5 +- cms/djangoapps/contentstore/views/user.py | 9 +- cms/static/client_templates/checklist.html | 4 +- .../course_info_handouts.html | 2 +- cms/static/coffee/files.json | 1 + cms/static/js/base.js | 24 +- .../js/models/settings/course_details.js | 12 +- .../models/settings/course_grading_policy.js | 10 +- cms/static/js/views/section.js | 5 +- cms/templates/404.html | 9 +- cms/templates/500.html | 13 +- cms/templates/activation_active.html | 7 +- cms/templates/activation_complete.html | 7 +- cms/templates/activation_invalid.html | 12 +- cms/templates/asset_index.html | 4 +- cms/templates/base.html | 5 +- cms/templates/checklists.html | 13 +- cms/templates/course_info.html | 13 +- cms/templates/edit-static-page.html | 21 +- cms/templates/edit-tabs.html | 21 +- cms/templates/edit_subsection.html | 53 +- cms/templates/editable_preview.html | 11 +- cms/templates/emails/activation_email.txt | 10 +- .../emails/activation_email_subject.txt | 3 +- cms/templates/error.html | 21 +- cms/templates/export.html | 31 +- cms/templates/howitworks.html | 93 +-- cms/templates/import.html | 27 +- cms/templates/index.html | 10 +- cms/templates/login.html | 25 +- cms/templates/manage_users.html | 13 +- cms/templates/overview.html | 79 +- .../registration/activation_complete.html | 9 +- cms/templates/registration/reg_complete.html | 4 +- cms/templates/settings.html | 2 +- cms/templates/settings_advanced.html | 31 +- .../settings_discussions_faculty.html | 197 ++--- cms/templates/settings_graders.html | 39 +- cms/templates/signup.html | 45 +- cms/templates/static-pages.html | 13 +- cms/templates/unit.html | 47 +- cms/templates/widgets/header.html | 15 +- cms/templates/widgets/sock.html | 27 +- common/djangoapps/mitxmako/middleware.py | 1 + common/djangoapps/student/views.py | 66 +- common/lib/xmodule/xmodule/course_module.py | 10 +- common/lib/xmodule/xmodule/util/date_utils.py | 11 +- conf/locale/babel.cfg | 2 + conf/locale/config | 2 +- lms/envs/common.py | 5 + lms/templates/admin_dashboard.html | 2 +- lms/templates/annotatable.html | 10 +- .../combined_open_ended.html | 5 +- .../combined_open_ended_legend.html | 3 +- .../combined_open_ended_status.html | 3 +- .../open_ended_result_table.html | 23 +- .../openended/open_ended.html | 15 +- .../openended/open_ended_error.html | 5 +- .../openended/open_ended_evaluation.html | 21 +- .../openended/open_ended_rubric.html | 5 +- .../selfassessment/self_assessment_hint.html | 3 +- .../self_assessment_prompt.html | 5 +- lms/templates/contact.html | 30 +- lms/templates/course.html | 9 +- lms/templates/course_filter.html | 22 +- .../course_groups/cohort_management.html | 13 +- lms/templates/course_groups/debug.html | 3 +- lms/templates/courseware/course_about.html | 43 +- .../courseware/course_navigation.html | 3 +- lms/templates/courseware/courses.html | 7 +- .../courseware/courseware-error.html | 7 +- lms/templates/courseware/courseware.html | 19 +- lms/templates/courseware/grade_summary.html | 5 +- lms/templates/courseware/gradebook.html | 3 +- lms/templates/courseware/info.html | 9 +- .../courseware/instructor_dashboard.html | 266 +++---- .../courseware/mktg_coming_soon.html | 5 +- .../courseware/mktg_course_about.html | 17 +- lms/templates/courseware/news.html | 5 +- lms/templates/courseware/notifications.html | 13 +- lms/templates/courseware/progress.html | 7 +- lms/templates/courseware/syllabus.html | 5 +- lms/templates/courseware/welcome-back.html | 3 +- lms/templates/dashboard.html | 103 ++- lms/templates/debug/run_python_form.html | 3 +- lms/templates/discussion/_blank_slate.html | 5 +- .../_discussion_course_navigation.html | 5 +- .../discussion/_discussion_module.html | 3 +- .../discussion/_filter_dropdown.html | 7 +- .../discussion/_inline_new_post.html | 17 +- lms/templates/discussion/_new_post.html | 19 +- .../discussion/_recent_active_posts.html | 3 +- lms/templates/discussion/_search_bar.html | 3 +- lms/templates/discussion/_similar_posts.html | 3 +- lms/templates/discussion/_single_thread.html | 3 +- .../discussion/_thread_list_template.html | 17 +- .../discussion/_underscore_templates.html | 41 +- lms/templates/discussion/_user_profile.html | 5 +- lms/templates/discussion/index.html | 3 +- lms/templates/discussion/maintenance.html | 5 +- lms/templates/discussion/single_thread.html | 3 +- lms/templates/discussion/user_profile.html | 5 +- lms/templates/email_change_failed.html | 8 +- lms/templates/email_change_successful.html | 6 +- lms/templates/email_exists.html | 8 +- lms/templates/emails_change_successful.html | 6 +- lms/templates/enroll_students.html | 22 +- lms/templates/extauth_failure.html | 6 +- lms/templates/folditbasic.html | 16 +- lms/templates/folditchallenge.html | 8 +- lms/templates/footer.html | 20 +- lms/templates/forgot_password_modal.html | 16 +- lms/templates/help_modal.html | 72 +- lms/templates/index.html | 33 +- lms/templates/instructor/staff_grading.html | 25 +- lms/templates/invalid_email_key.html | 14 +- lms/templates/licenses/serial_numbers.html | 3 +- lms/templates/login.html | 48 +- lms/templates/login_modal.html | 18 +- lms/templates/main.html | 22 +- lms/templates/main_django.html | 4 +- lms/templates/module-error.html | 12 +- lms/templates/name_changes.html | 16 +- lms/templates/navigation.html | 34 +- lms/templates/notes.html | 14 +- .../combined_notifications.html | 11 +- .../open_ended_flagged_problems.html | 19 +- .../open_ended_problems.html | 21 +- lms/templates/peer_grading/peer_grading.html | 23 +- .../peer_grading/peer_grading_closed.html | 9 +- .../peer_grading/peer_grading_problem.html | 49 +- lms/templates/problem.html | 12 +- lms/templates/provider_login.html | 16 +- lms/templates/register.html | 120 +-- .../registration/activate_account_notice.html | 7 +- .../registration/activation_complete.html | 13 +- .../registration/activation_invalid.html | 13 +- lms/templates/registration/login.html | 16 +- lms/templates/registration/logout.html | 9 +- .../registration/password_change_done.html | 2 +- .../registration/password_reset_complete.html | 7 +- .../registration/password_reset_confirm.html | 43 +- .../registration/password_reset_done.html | 5 +- .../registration/registration_complete.html | 2 +- .../registration/registration_form.html | 31 +- lms/templates/seq_module.html | 12 +- lms/templates/signup_modal.html | 56 +- lms/templates/staff_problem_info.html | 34 +- lms/templates/static_htmlbook.html | 4 +- lms/templates/static_pdfbook.html | 30 +- lms/templates/static_templates/404.html | 7 +- lms/templates/static_templates/about.html | 31 +- lms/templates/static_templates/contact.html | 35 +- lms/templates/static_templates/copyright.html | 19 +- lms/templates/static_templates/faq.html | 91 +-- lms/templates/static_templates/help.html | 229 +++--- lms/templates/static_templates/honor.html | 31 +- lms/templates/static_templates/jobs.html | 725 +++++++++--------- lms/templates/static_templates/media-kit.html | 45 +- lms/templates/static_templates/press.html | 13 +- lms/templates/static_templates/privacy.html | 95 +-- .../static_templates/server-down.html | 5 +- .../static_templates/server-error.html | 5 +- .../static_templates/server-overloaded.html | 5 +- lms/templates/static_templates/tos.html | 127 +-- lms/templates/staticbook.html | 10 +- lms/templates/stripped-main.html | 4 +- lms/templates/test_center_register.html | 192 ++--- lms/templates/tracking_log.html | 6 +- lms/templates/university_profile/anux.html | 7 +- .../university_profile/berkeleyx.html | 7 +- lms/templates/university_profile/delftx.html | 7 +- lms/templates/university_profile/edge.html | 23 +- lms/templates/university_profile/epflx.html | 11 +- .../university_profile/georgetownx.html | 7 +- .../university_profile/harvardx.html | 9 +- lms/templates/university_profile/mcgillx.html | 7 +- lms/templates/university_profile/mitx.html | 11 +- lms/templates/university_profile/ricex.html | 7 +- .../university_profile/template.html | 7 +- .../university_profile/torontox.html | 7 +- .../university_profile/utaustinx.html | 7 +- lms/templates/university_profile/utx.html | 9 +- .../university_profile/wellesleyx.html | 7 +- lms/templates/using.html | 10 +- lms/templates/video.html | 6 +- lms/templates/videoalpha.html | 6 +- lms/templates/wiki/article.html | 3 +- lms/templates/wiki/includes/article_menu.html | 3 +- lms/templates/wiki/includes/cheatsheet.html | 47 +- .../wiki/includes/editor_widget.html | 3 +- .../wiki/plugins/attachments/index.html | 7 +- lms/templates/wiki/preview_inline.html | 5 +- lms/templates/word_cloud.html | 4 +- lms/urls.py | 13 + 195 files changed, 2542 insertions(+), 2314 deletions(-) diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py index 452806fe648e..5fa0d949b085 100644 --- a/cms/djangoapps/contentstore/utils.py +++ b/cms/djangoapps/contentstore/utils.py @@ -9,12 +9,13 @@ import logging import re from xmodule.modulestore.draft import DIRECT_ONLY_CATEGORIES +from django.utils.translation import ugettext as _ log = logging.getLogger(__name__) # In order to instantiate an open ended tab automatically, need to have this data -OPEN_ENDED_PANEL = {"name": "Open Ended Panel", "type": "open_ended"} -NOTES_PANEL = {"name": "My Notes", "type": "notes"} +OPEN_ENDED_PANEL = {"name": _("Open Ended Panel"), "type": "open_ended"} +NOTES_PANEL = {"name": _("My Notes"), "type": "notes"} EXTRA_TAB_PANELS = dict([(p['type'], p) for p in [OPEN_ENDED_PANEL, NOTES_PANEL]]) diff --git a/cms/djangoapps/contentstore/views/user.py b/cms/djangoapps/contentstore/views/user.py index dae0d246a51b..e996ab7cea15 100644 --- a/cms/djangoapps/contentstore/views/user.py +++ b/cms/djangoapps/contentstore/views/user.py @@ -2,6 +2,7 @@ from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse from django.contrib.auth.decorators import login_required +from django.utils.translation import ugettext as _ from django_future.csrf import ensure_csrf_cookie from mitxmako.shortcuts import render_to_response @@ -78,7 +79,7 @@ def add_user(request, location): if not email: msg = { 'Status': 'Failed', - 'ErrMsg': 'Please specify an email address.', + 'ErrMsg': _('Please specify an email address.'), } return JsonResponse(msg, 400) @@ -92,7 +93,7 @@ def add_user(request, location): if user is None: msg = { 'Status': 'Failed', - 'ErrMsg': "Could not find user by email address '{0}'.".format(email), + 'ErrMsg': _("Could not find user by email address '{0}'.").format(email), } return JsonResponse(msg, 404) @@ -100,7 +101,7 @@ def add_user(request, location): if not user.is_active: msg = { 'Status': 'Failed', - 'ErrMsg': 'User {0} has registered but has not yet activated his/her account.'.format(email), + 'ErrMsg': _('User {0} has registered but has not yet activated his/her account.').format(email), } return JsonResponse(msg, 400) @@ -129,7 +130,7 @@ def remove_user(request, location): if user is None: msg = { 'Status': 'Failed', - 'ErrMsg': "Could not find user by email address '{0}'.".format(email), + 'ErrMsg': _("Could not find user by email address '{0}'.").format(email), } return JsonResponse(msg, 404) diff --git a/cms/static/client_templates/checklist.html b/cms/static/client_templates/checklist.html index e985ab95093e..1f6278be5d9d 100644 --- a/cms/static/client_templates/checklist.html +++ b/cms/static/client_templates/checklist.html @@ -8,13 +8,13 @@ id="<%= 'course-checklist' + checklistIndex %>"> <% var widthPercentage = 'width:' + percentChecked + '%;'; %> - <%= percentChecked %>% of checklist completed + <%= percentChecked %>${_("% of checklist completed")}

<%= checklistShortDescription %>

- Tasks Completed: <%= itemsChecked %>/<%= items.length %> + ${_("Tasks Completed:")} <%= itemsChecked %>/<%= items.length %>
diff --git a/cms/static/client_templates/course_info_handouts.html b/cms/static/client_templates/course_info_handouts.html index 958a1c77d658..cf9fdb5c854d 100644 --- a/cms/static/client_templates/course_info_handouts.html +++ b/cms/static/client_templates/course_info_handouts.html @@ -6,7 +6,7 @@

Course Handouts

<%= model.get('data') %> <% } else {%> -

You have no handouts defined

+

${_("You have no handouts defined")}

<% } %>
diff --git a/cms/static/coffee/files.json b/cms/static/coffee/files.json index 3c27629f694b..3964bee45558 100644 --- a/cms/static/coffee/files.json +++ b/cms/static/coffee/files.json @@ -1,5 +1,6 @@ { "static_files": [ + "../jsi18n/", "js/vendor/RequireJS.js", "js/vendor/jquery.min.js", "js/vendor/jquery-ui.min.js", diff --git a/cms/static/js/base.js b/cms/static/js/base.js index c2f401c77e2c..983974580660 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -79,10 +79,10 @@ $(document).ready(function() { }); // general link management - new window/tab - $('a[rel="external"]').attr('title', 'This link will open in a new browser window/tab').bind('click', linkNewWindow); + $('a[rel="external"]').attr('title', gettext('This link will open in a new browser window/tab')).bind('click', linkNewWindow); // general link management - lean modal window - $('a[rel="modal"]').attr('title', 'This link will open in a modal window').leanModal({ + $('a[rel="modal"]').attr('title', gettext('This link will open in a modal window')).leanModal({ overlay: 0.50, closeButton: '.action-modal-close' }); @@ -199,8 +199,8 @@ function toggleSections(e) { $section = $('.courseware-section'); sectionCount = $section.length; $button = $(this); - $labelCollapsed = $(' Collapse All Sections'); - $labelExpanded = $(' Expand All Sections'); + $labelCollapsed = $(gettext(' Collapse All Sections')); + $labelExpanded = $(gettext(' Expand All Sections')); var buttonLabel = $button.hasClass('is-activated') ? $labelCollapsed : $labelExpanded; $button.toggleClass('is-activated').html(buttonLabel); @@ -326,7 +326,7 @@ function saveSubsection() { $changedInput = null; }, error: function() { - showToastMessage('There has been an error while saving your changes.'); + showToastMessage(gettext('There has been an error while saving your changes.')); } }); } @@ -372,11 +372,11 @@ function deleteSection(e) { } function _deleteItem($el) { - if (!confirm('Are you sure you wish to delete this item. It cannot be reversed!')) return; + if (!confirm(gettext('Are you sure you wish to delete this item. It cannot be reversed!'))) return; var id = $el.data('id'); - analytics.track('Deleted an Item', { + analytics.track(gettext('Deleted an Item'), { 'course': course_location_analytics, 'id': id }); @@ -552,7 +552,7 @@ function saveNewSection(e) { var template = $saveButton.data('template'); var display_name = $(this).find('.new-section-name').val(); - analytics.track('Created a Section', { + analytics.track(gettext('Created a Section'), { 'course': course_location_analytics, 'display_name': display_name }); @@ -599,11 +599,11 @@ function saveNewCourse(e) { var display_name = $newCourse.find('.new-course-name').val(); if (org == '' || number == '' || display_name == '') { - alert('You must specify all fields in order to create a new course.'); + alert(gettext('You must specify all fields in order to create a new course.')); return; } - analytics.track('Created a Course', { + analytics.track(gettext('Created a Course'), { 'org': org, 'number': number, 'display_name': display_name @@ -660,7 +660,7 @@ function saveNewSubsection(e) { var template = $(this).find('.new-subsection-name-save').data('template'); var display_name = $(this).find('.new-subsection-name-input').val(); - analytics.track('Created a Subsection', { + analytics.track(gettext('Created a Subsection'), { 'course': course_location_analytics, 'display_name': display_name }); @@ -706,7 +706,7 @@ function saveSetSectionScheduleDate(e) { var id = $modal.attr('data-id'); - analytics.track('Edited Section Release Date', { + analytics.track(gettext('Edited Section Release Date'), { 'course': course_location_analytics, 'id': id, 'start': start diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js index b71b4e2ab281..ff6b3cfefdb4 100644 --- a/cms/static/js/models/settings/course_details.js +++ b/cms/static/js/models/settings/course_details.js @@ -38,23 +38,23 @@ CMS.Models.Settings.CourseDetails = Backbone.Model.extend({ // A bit funny in that the video key validation is asynchronous; so, it won't stop the validation. var errors = {}; if (newattrs.start_date === null) { - errors.start_date = "The course must have an assigned start date."; + errors.start_date = gettext("The course must have an assigned start date."); } if (newattrs.start_date && newattrs.end_date && newattrs.start_date >= newattrs.end_date) { - errors.end_date = "The course end date cannot be before the course start date."; + errors.end_date = gettext("The course end date cannot be before the course start date."); } if (newattrs.start_date && newattrs.enrollment_start && newattrs.start_date < newattrs.enrollment_start) { - errors.enrollment_start = "The course start date cannot be before the enrollment start date."; + errors.enrollment_start = gettext("The course start date cannot be before the enrollment start date."); } if (newattrs.enrollment_start && newattrs.enrollment_end && newattrs.enrollment_start >= newattrs.enrollment_end) { - errors.enrollment_end = "The enrollment start date cannot be after the enrollment end date."; + errors.enrollment_end = gettext("The enrollment start date cannot be after the enrollment end date."); } if (newattrs.end_date && newattrs.enrollment_end && newattrs.end_date < newattrs.enrollment_end) { - errors.enrollment_end = "The enrollment end date cannot be after the course end date."; + errors.enrollment_end = gettext("The enrollment end date cannot be after the course end date."); } if (newattrs.intro_video && newattrs.intro_video !== this.get('intro_video')) { if (this._videokey_illegal_chars.exec(newattrs.intro_video)) { - errors.intro_video = "Key should only contain letters, numbers, _, or -"; + errors.intro_video = gettext("Key should only contain letters, numbers, _, or -"); } // TODO check if key points to a real video using google's youtube api } diff --git a/cms/static/js/models/settings/course_grading_policy.js b/cms/static/js/models/settings/course_grading_policy.js index 8162145003fc..2e63b5fd3592 100644 --- a/cms/static/js/models/settings/course_grading_policy.js +++ b/cms/static/js/models/settings/course_grading_policy.js @@ -79,13 +79,13 @@ CMS.Models.Settings.CourseGrader = Backbone.Model.extend({ // FIXME somehow this.collection is unbound sometimes. I can't track down when var existing = this.collection && this.collection.some(function(other) { return (other != this) && (other.get('type') == attrs['type']);}, this); if (existing) { - errors.type = "There's already another assignment type with this name."; + errors.type = gettext("There's already another assignment type with this name."); } } } if (attrs['weight']) { if (!isFinite(attrs.weight) || /\D+/.test(attrs.weight)) { - errors.weight = "Please enter an integer between 0 and 100."; + errors.weight = gettext("Please enter an integer between 0 and 100."); } else { attrs.weight = parseInt(attrs.weight); // see if this ensures value saved is int @@ -99,18 +99,18 @@ CMS.Models.Settings.CourseGrader = Backbone.Model.extend({ }} if (attrs['min_count']) { if (!isFinite(attrs.min_count) || /\D+/.test(attrs.min_count)) { - errors.min_count = "Please enter an integer."; + errors.min_count = gettext("Please enter an integer."); } else attrs.min_count = parseInt(attrs.min_count); } if (attrs['drop_count']) { if (!isFinite(attrs.drop_count) || /\D+/.test(attrs.drop_count)) { - errors.drop_count = "Please enter an integer."; + errors.drop_count = gettext("Please enter an integer."); } else attrs.drop_count = parseInt(attrs.drop_count); } if (attrs['min_count'] && attrs['drop_count'] && attrs.drop_count > attrs.min_count) { - errors.drop_count = "Cannot drop more " + attrs.type + " than will assigned."; + errors.drop_count = gettext("Cannot drop more %s than will assigned.").split("%s").join(attrs.type); } if (!_.isEmpty(errors)) return errors; } diff --git a/cms/static/js/views/section.js b/cms/static/js/views/section.js index eccc547a0615..eb7405233e55 100644 --- a/cms/static/js/views/section.js +++ b/cms/static/js/views/section.js @@ -1,8 +1,9 @@ CMS.Views.SectionShow = Backbone.View.extend({ - template: _.template('" class="section-name-span"><%= name %>'), +template: _.template('<%= name %>'), render: function() { var attrs = { - name: this.model.escape('name') + name: gettext(this.model.escape('name')), + sometext: gettext("Edit this section\'s name") }; this.$el.html(this.template(attrs)); this.delegateEvents(); diff --git a/cms/templates/404.html b/cms/templates/404.html index a45a223badd9..3f89a80de8d0 100644 --- a/cms/templates/404.html +++ b/cms/templates/404.html @@ -1,14 +1,15 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> -<%block name="title">Page Not Found +<%block name="title">${_("Page Not Found")} <%block name="content">
-

Page not found

-

The page that you were looking for was not found. Go back to the homepage or let us know about any pages that may have been moved at technical@edx.org.

+

${_("Page not found")}

+

${_('The page that you were looking for was not found. Go back to the homepage or let us know about any pages that may have been moved at technical@edx.org.')}

- \ No newline at end of file + diff --git a/cms/templates/500.html b/cms/templates/500.html index 3d18d9dcc59e..101bc112adb1 100644 --- a/cms/templates/500.html +++ b/cms/templates/500.html @@ -1,18 +1,19 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> -<%block name="title">Studio Server Error +<%block name="title">${_("Studio Server Error")} <%block name="content">
-

The Studio servers encountered an error

+

${_("The Studio servers encountered an error")}

- An error occurred in Studio and the page could not be loaded. Please try again in a few moments. - We've logged the error and our staff is currently working to resolve this error as soon as possible. - If the problem persists, please email us at technical@edx.org. + ${_("An error occurred in Studio and the page could not be loaded. Please try again in a few moments.")} + ${_("We've logged the error and our staff is currently working to resolve this error as soon as possible.")} + ${_('If the problem persists, please email us at technical@edx.org.')}

- \ No newline at end of file + diff --git a/cms/templates/activation_active.html b/cms/templates/activation_active.html index 712c73abf936..853e44ed01cb 100644 --- a/cms/templates/activation_active.html +++ b/cms/templates/activation_active.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%block name="content"> @@ -6,9 +7,9 @@
-

Account already active!

-

This account has already been activated. Log in here.

+

${_("Account already active!")}

+

${_('This account has already been activated. Log in here.')}

- \ No newline at end of file + diff --git a/cms/templates/activation_complete.html b/cms/templates/activation_complete.html index 1e195a632ca7..e8eef263baac 100644 --- a/cms/templates/activation_complete.html +++ b/cms/templates/activation_complete.html @@ -1,12 +1,13 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%block name="content">
-

Activation Complete!

-

Thanks for activating your account. Log in here.

+

${_("Activation Complete!")}

+

${_('Thanks for activating your account. Log in here.')}

- \ No newline at end of file + diff --git a/cms/templates/activation_invalid.html b/cms/templates/activation_invalid.html index c4eb16875b53..4d22c296c903 100644 --- a/cms/templates/activation_invalid.html +++ b/cms/templates/activation_invalid.html @@ -1,16 +1,14 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%block name="content">
-

Activation Invalid

+

${_("Activation Invalid")}

-

Something went wrong. Check to make sure the URL you went to was - correct -- e-mail programs will sometimes split it into two - lines. If you still have issues, e-mail us to let us know what happened - at bugs@mitx.mit.edu.

+

${_('Something went wrong. Check to make sure the URL you went to was correct -- e-mail programs will sometimes split it into two lines. If you still have issues, e-mail us to let us know what happened at bugs@mitx.mit.edu.')}

-

Or you can go back to the home page.

+

${_('Or you can go back to the home page.')}

- \ No newline at end of file + diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index bdad7b7b886c..6c92994a6f01 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -2,7 +2,7 @@ <%! from django.core.urlresolvers import reverse %> <%! from django.utils.translation import ugettext as _ %> <%block name="bodyclass">is-signedin course uploads -<%block name="title">Files & Uploads +<%block name="title">${_("Files & Uploads")} <%namespace name='static' file='static_content.html'/> @@ -48,7 +48,7 @@

Page Actions

diff --git a/cms/templates/base.html b/cms/templates/base.html index e58dcdfc60fa..7e99e1389f46 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -1,3 +1,4 @@ +## -*- coding: utf-8 -*- <%namespace name='static' file='static_content.html'/> @@ -16,7 +17,8 @@ - + + <%static:css group='base-style'/> @@ -35,7 +37,6 @@ ## javascript - diff --git a/cms/templates/checklists.html b/cms/templates/checklists.html index 6f78e952c0af..ad4f29aeb618 100644 --- a/cms/templates/checklists.html +++ b/cms/templates/checklists.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> <%block name="title">Course Checklists @@ -30,8 +31,8 @@

- Tools - > Course Checklists + ${_("Tools")} + > ${_("Course Checklists")}

@@ -40,18 +41,18 @@

-

Current Checklists

+

${_("Current Checklists")}

- \ No newline at end of file + diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 7fa15100658f..08c71259c4e6 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%! from django.utils.translation import ugettext as _ %> <%! from django.core.urlresolvers import reverse %> <%block name="title">Static Pages <%block name="bodyclass">is-signedin course pages static-pages @@ -19,15 +20,15 @@

- Content - > Static Pages + ${_("Content")} + > ${_("Static Pages")}

@@ -37,11 +38,11 @@

Page Actions

-

Static Pages are additional pages that supplement your Courseware. Other course authors have used them to share a syllabus, calendar, handouts, and more.

+

${_("Static Pages are additional pages that supplement your Courseware. Other course authors have used them to share a syllabus, calendar, handouts, and more.")}

@@ -69,15 +70,15 @@

Page Actions

-

How Static Pages are Used in Your Course

+

${_("How Static Pages are Used in Your Course")}

- Preview of how Static Pages are used in your course -
These pages will be presented in your course's main navigation alongside Courseware, Course Info, Discussion, etc.
+ ${_('Preview of how Static Pages are used in your course')} +
${_("These pages will be presented in your course's main navigation alongside Courseware, Course Info, Discussion, etc.")}
- close modal + ${_("close modal")}
diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index fcda977324e3..d08f31bd7e5f 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%! import logging @@ -5,7 +6,7 @@ %> <%! from django.core.urlresolvers import reverse %> -<%block name="title">CMS Subsection +<%block name="title">${_("CMS Subsection")} <%block name="bodyclass">is-signedin course subsection @@ -18,11 +19,11 @@
- +
- + ${units.enum_units(subsection, subsection_units=subsection_units)}
@@ -30,63 +31,61 @@
-

Subsection Settings

+

${_("Subsection Settings")}

- - ${_("Release Day")} +
- - ${_("Release Time")} (UTC) +
% if subsection.lms.start and not almost_same_datetime(subsection.lms.start, parent_item.lms.start): % if parent_item.lms.start is None: -

The date above differs from the release date of - ${parent_item.display_name_with_default}, which is unset. +

${_("The date above differs from the release date of %s, which is unset.") % parent_item.display_name_with_default} % else: -

The date above differs from the release date of ${parent_item.display_name_with_default} – - ${get_default_time_display(parent_item.lms.start)}. +

${_("The date above differs from the release date of %s - %s") % (parent_item.display_name_with_default, get_default_time_display(parent_item.lms.start))}. % endif -

+

% endif
- + -
+
- Set a due date + ${_("Set a due date")}
- - ${_("Due Day")} +
- - ${_("Due Time")} (UTC) +
- Remove due date + ${_("Remove due date")}
- Preview Drafts + ${_("Preview Drafts")} %if can_view_live: - View Live + ${_("View Live")} %endif
diff --git a/cms/templates/editable_preview.html b/cms/templates/editable_preview.html index 731fd9b1c8ca..4fe11eca2cf4 100644 --- a/cms/templates/editable_preview.html +++ b/cms/templates/editable_preview.html @@ -1,13 +1,14 @@ +<%! from django.utils.translation import ugettext as _ %>
${content}
- Edit - Delete + ${_("Edit")} + ${_("Delete")}
- +
-
Edit Video Component
+
${_("Edit Video Component")}
- SaveCancel + ${_("Save")}${_("Cancel")}
diff --git a/cms/templates/emails/activation_email.txt b/cms/templates/emails/activation_email.txt index 4badb4ca88d5..175442fed456 100644 --- a/cms/templates/emails/activation_email.txt +++ b/cms/templates/emails/activation_email.txt @@ -1,6 +1,6 @@ -Thank you for signing up for edX Studio! To activate your account, -please copy and paste this address into your web browser's -address bar: +<%! from django.utils.translation import ugettext as _ %> + +${_("Thank you for signing up for edX Studio! To activate your account, please copy and paste this address into your web browser's address bar:")} % if is_secure: https://${ site }/activate/${ key } @@ -8,6 +8,4 @@ address bar: http://${ site }/activate/${ key } % endif -If you didn't request this, you don't need to do anything; you won't -receive any more email from us. Please do not reply to this e-mail; if -you require assistance, check the help section of the edX web site. +${_("If you didn't request this, you don't need to do anything; you won't receive any more email from us. Please do not reply to this e-mail; if you require assistance, check the help section of the edX web site.")} diff --git a/cms/templates/emails/activation_email_subject.txt b/cms/templates/emails/activation_email_subject.txt index f4ffdccb1446..959bc316f566 100644 --- a/cms/templates/emails/activation_email_subject.txt +++ b/cms/templates/emails/activation_email_subject.txt @@ -1 +1,2 @@ -Your account for edX Studio +<%! from django.utils.translation import ugettext as _ %> +${_("Your account for edX Studio")} diff --git a/cms/templates/error.html b/cms/templates/error.html index e170b4e2c6ec..06d72281d3df 100644 --- a/cms/templates/error.html +++ b/cms/templates/error.html @@ -1,23 +1,24 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> <%block name="bodyclass">error <%block name="title"> % if error == '404': - 404 - Page Not Found + ${_("404 - Page Not Found")} % elif error == '500': - 500 - Internal Server Error + ${_("500 - Internal Server Error")} % endif <%block name="content">
% if error == '404': -

Hmm…

-

we can't find that page.

- % elif error == '500': -

Oops…

-

there was a problem with the server.

- % endif - Back to dashboard +

${_("Hmm…")}

+

${_("we can't find that page.")}

+ % elif error == '500': +

${_("Oops…")}

+

${_("there was a problem with the server.")}

+ % endif + ${_("Back to dashboard")}
- \ No newline at end of file + diff --git a/cms/templates/export.html b/cms/templates/export.html index 11c038e5e46e..97a9f38aaa26 100644 --- a/cms/templates/export.html +++ b/cms/templates/export.html @@ -1,16 +1,17 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%namespace name='static' file='static_content.html'/> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Course Export +<%block name="title">${_("Course Export")} <%block name="bodyclass">is-signedin course tools export <%block name="content">

- Tools - > Course Export + ${_("Tools")} + > ${_("Course Export")}

@@ -19,28 +20,28 @@

-

About Exporting Courses

-

When exporting your course, you will receive a .tar.gz formatted file that contains the following course data:

+

${_("About Exporting Courses")}

+

${_("When exporting your course, you will receive a .tar.gz formatted file that contains the following course data:")}

    -
  • Course Structure (Sections and sub-section ordering)
    • -
  • Individual Units
    • -
  • Individual Problems
    • -
  • Static Pages
    • -
  • Course Assets
    • +
  • ${_("Course Structure (Sections and sub-section ordering)")}
    • +
  • ${_("Individual Units")}
    • +
  • ${_("Individual Problems")}
    • +
  • ${_("Static Pages")}
    • +
  • ${_("Course Assets")}
-

Your course export will not include: student data, forum/discussion data, course settings, certificates, grading information, or user data.

+

${_("Your course export will not include: student data, forum/discussion data, course settings, certificates, grading information, or user data.")}

-

Export Course:

+

${_("Export Course:")}

- Download Files + ${_("Download Files")}
@@ -48,12 +49,12 @@

Export Course:

<%doc>
-

Export Course:

+

${_("Export Course:")}

Files Downloading -

Download not start? Try again

+

${_("Download not start?")} ${_("Try again")}

diff --git a/cms/templates/howitworks.html b/cms/templates/howitworks.html index b5acc6633914..bbb40b05e1a0 100644 --- a/cms/templates/howitworks.html +++ b/cms/templates/howitworks.html @@ -1,7 +1,8 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Welcome +<%block name="title">${_("Welcome")} <%block name="bodyclass">not-signedin index howitworks <%block name="content"> @@ -9,8 +10,8 @@
-

Welcome to

-

Studio helps manage your courses online, so you can focus on teaching them

+

${_('Welcome to ')}

+

${_("Studio helps manage your courses online, so you can focus on teaching them")}

@@ -18,15 +19,15 @@

Welcome to

-

Studio's Many Features

+

${_("Studio's Many Features")}

  1. - Studio Helps You Keep Your Courses Organized -
    Studio Helps You Keep Your Courses Organized
    + ${_('Studio Helps You Keep Your Courses Organized')} +
    ${_("Studio Helps You Keep Your Courses Organized")}
    @@ -34,23 +35,23 @@

    Studio's Many Features

    -

    Keeping Your Course Organized

    -

    The backbone of your course is how it is organized. Studio offers an Outline editor, providing a simple hierarchy and easy drag and drop to help you and your students stay organized.

    +

    ${_("Keeping Your Course Organized")}

    +

    ${_("The backbone of your course is how it is organized. Studio offers an Outline editor, providing a simple hierarchy and easy drag and drop to help you and your students stay organized.")}

    • -

      Simple Organization For Content

      -

      Studio uses a simple hierarchy of sections and subsections to organize your content.

      +

      ${_("Simple Organization For Content")}

      +

      ${_("Studio uses a simple hierarchy of sections and subsections to organize your content.")}

    • -

      Change Your Mind Anytime

      -

      Draft your outline and build content anywhere. Simple drag and drop tools let your reorganize quickly.

      +

      ${_("Change Your Mind Anytime")}

      +

      ${_("Draft your outline and build content anywhere. Simple drag and drop tools let your reorganize quickly.")}

    • -

      Go A Week Or A Semester At A Time

      -

      Build and release sections to your students incrementally. You don't have to have it all done at once.

      +

      ${_("Go A Week Or A Semester At A Time")}

      +

      ${_("Build and release sections to your students incrementally. You don't have to have it all done at once.")}

    @@ -59,8 +60,8 @@

    Go A Week Or A Semester At A Time

  2. - Learning is More than Just Lectures -
    Learning is More than Just Lectures
    + ${_('Learning is More than Just Lectures')} +
    ${_("Learning is More than Just Lectures")}
    @@ -68,23 +69,23 @@

    Go A Week Or A Semester At A Time

    -

    Learning is More than Just Lectures

    -

    Studio lets you weave your content together in a way that reinforces learning — short video lectures interleaved with exercises and more. Insert videos and author a wide variety of exercise types with just a few clicks.

    +

    ${_("Learning is More than Just Lectures")}

    +

    ${_("Studio lets you weave your content together in a way that reinforces learning — short video lectures interleaved with exercises and more. Insert videos and author a wide variety of exercise types with just a few clicks.")}

    • -

      Create Learning Pathways

      -

      Help your students understand a small interactive piece at a time with multimedia, HTML, and exercises.

      +

      ${_("Create Learning Pathways")}

      +

      ${_("Help your students understand a small interactive piece at a time with multimedia, HTML, and exercises.")}

    • -

      Work Visually, Organize Quickly

      -

      Work visually and see exactly what your students will see. Reorganize all your content with drag and drop.

      +

      ${_("Work Visually, Organize Quickly")}

      +

      ${_("Work visually and see exactly what your students will see. Reorganize all your content with drag and drop.")}

    • -

      A Broad Library of Problem Types

      -

      It's more than just multiple choice. Studio has nearly a dozen types of problems to challenge your learners.

      +

      ${_("A Broad Library of Problem Types")}

      +

      ${_("It's more than just multiple choice. Studio has nearly a dozen types of problems to challenge your learners.")}

    @@ -93,8 +94,8 @@

    A Broad Library of Problem Types

  3. - Studio Gives You Simple, Fast, and Incremental Publishing. With Friends. -
    Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.
    + ${_('Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.')} +
    ${_("Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.")}
    @@ -102,23 +103,23 @@

    A Broad Library of Problem Types

    -

    Simple, Fast, and Incremental Publishing. With Friends.

    -

    Studio works like web applications you already know, yet understands how you build curriculum. Instant publishing to the web when you want it, incremental release when it makes sense. And with co-authors, you can have a whole team building a course, together.

    +

    ${_("Simple, Fast, and Incremental Publishing. With Friends.")}

    +

    ${_("Studio works like web applications you already know, yet understands how you build curriculum. Instant publishing to the web when you want it, incremental release when it makes sense. And with co-authors, you can have a whole team building a course, together.")}

    • -

      Instant Changes

      -

      Caught a bug? No problem. When you want, your changes to live when you hit Save.

      +

      ${_("Instant Changes")}

      +

      ${_("Caught a bug? No problem. When you want, your changes to live when you hit Save.")}

    • -

      Release-On Date Publishing

      -

      When you've finished a section, pick when you want it to go live and Studio takes care of the rest. Build your course incrementally.

      +

      ${_("Release-On Date Publishing")}

      +

      ${_("When you've finished a section, pick when you want it to go live and Studio takes care of the rest. Build your course incrementally.")}

    • -

      Work in Teams

      -

      Co-authors have full access to all the same authoring tools. Make your course better through a team effort.

      +

      ${_("Work in Teams")}

      +

      ${_("Co-authors have full access to all the same authoring tools. Make your course better through a team effort.")}

    @@ -130,56 +131,56 @@

    Work in Teams

    -

    Sign Up for Studio Today!

    +

    ${_("Sign Up for Studio Today!")}
    -

    Outlining Your Course

    +

    ${_("Outlining Your Course")}

    -
    Simple two-level outline to organize your couse. Drag and drop, and see your course at a glance.
    +
    ${_("Simple two-level outline to organize your couse. Drag and drop, and see your course at a glance.")}
    - close modal + ${_("close modal")}
    -

    More than Just Lectures

    +

    ${_("More than Just Lectures")}

    -
    Quickly create videos, text snippets, inline discussions, and a variety of problem types.
    +
    ${_("Quickly create videos, text snippets, inline discussions, and a variety of problem types.")}
    - close modal + ${_("close modal")}
    -

    Publishing on Date

    +

    ${_("Publishing on Date")}

    -
    Simply set the date of a section or subsection, and Studio will publish it to your students for you.
    +
    ${_("Simply set the date of a section or subsection, and Studio will publish it to your students for you.")}
    - close modal + ${_("close modal")}
    diff --git a/cms/templates/import.html b/cms/templates/import.html index f9555a6aa89a..bcb8f38c5dc9 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -1,16 +1,17 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%namespace name='static' file='static_content.html'/> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Course Import +<%block name="title">${_("Course Import")} <%block name="bodyclass">is-signedin course tools import <%block name="content">

    - Tools - > Course Import + ${_("Tools")} + > ${_("Course Import")}

    @@ -19,19 +20,17 @@

    -

    Importing a new course will delete all content currently associated with your course - and replace it with the contents of the uploaded file.

    -

    File uploads must be gzipped tar files (.tar.gz) containing, at a minimum, a course.xml file.

    -

    Please note that if your course has any problems with auto-generated url_name nodes, - re-importing your course could cause the loss of student data associated with those problems.

    +

    ${_("Importing a new course will delete all content currently associated with your course and replace it with the contents of the uploaded file.")}

    +

    ${_("File uploads must be gzipped tar files (.tar.gz) containing, at a minimum, a course.xml file.")}

    +

    ${_("Please note that if your course has any problems with auto-generated url_name nodes, re-importing your course could cause the loss of student data associated with those problems.")}

    -

    Course to import:

    +

    ${_("Course to import:")}

    - Choose File -

    change

    + ${_("Choose File")} +

    ${_("change")}

    - +
    0%
    @@ -68,11 +67,11 @@

    Course to import:

    }, complete: function(xhr) { if (xhr.status == 200) { - alert('Your import was successful.'); + alert('${_("Your import was successful.")}'); window.location = '${successful_import_redirect_url}'; } else - alert('Your import has failed.\n\n' + xhr.responseText); + alert('${_("Your import has failed.")}\n\n' + xhr.responseText); submitBtn.show(); bar.hide(); } diff --git a/cms/templates/index.html b/cms/templates/index.html index e7205c943070..69c1552ed925 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -11,22 +11,22 @@
    - +
    - +
    - +
    - - + +
    diff --git a/cms/templates/login.html b/cms/templates/login.html index 1b52c559738e..d8a114590b11 100644 --- a/cms/templates/login.html +++ b/cms/templates/login.html @@ -1,6 +1,7 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Sign In +<%block name="title">${_("Sign In")} <%block name="bodyclass">not-signedin signin <%block name="content"> @@ -8,32 +9,32 @@
    -

    Sign In to edX Studio

    - +

    ${_("Sign In to edX Studio")}

    +
    - Required Information to Sign In to edX Studio + ${_("Required Information to Sign In to edX Studio")}
    1. - +
    2. - Forgot password? - + ${_("Forgot password?")} +
    - +
    @@ -42,11 +43,11 @@

    Sign In to edX Studio

    @@ -94,4 +95,4 @@

    Need Help?

    }); })(this) - \ No newline at end of file + diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index 462dd32c8194..7094ce6eae49 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -1,5 +1,6 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> -<%block name="title">Course Team Settings +<%block name="title">${_("Course Team Settings")} <%block name="bodyclass">is-signedin course users settings team @@ -7,16 +8,16 @@

    - Course Settings - > Course Team + ${_("Course Settings")} + > ${_("Course Team")}

    - \ No newline at end of file + diff --git a/cms/templates/unit.html b/cms/templates/unit.html index b9a83265d9bb..c72d86fb8233 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -1,7 +1,8 @@ +<%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> <%namespace name="units" file="widgets/units.html" /> -<%block name="title">Individual Unit +<%block name="title">${_("Individual Unit")} <%block name="bodyclass">is-signedin course unit <%block name="jsextra"> @@ -35,30 +36,30 @@
    -

    You are editing a draft. +

    ${_("You are editing a draft.")} % if published_date: - This unit was originally published on ${published_date}. + ${_("This unit was originally published on %s." % published_date)} % endif

    - View the Live Version + ${_("View the Live Version")}
    -

    +

      % for id in components:
    1. % endfor
    2. -
      Add New Component
      +
      ${_("Add New Component")}
      % endif - Cancel + ${_("Cancel")}
    % endif % endfor @@ -124,35 +125,35 @@
    Add New Component
    -

    Unit Settings

    +

    ${_("Unit Settings")}

    - +
    -

    This unit has been published. To make changes, you must edit a draft.

    -

    This is a draft of the published unit. To update the live version, you must replace it with this draft.

    +

    ${_('This unit has been published. To make changes, you must edit a draft.')}

    +

    ${_('This is a draft of the published unit. To update the live version, you must replace it with this draft.')}

    -

    This unit is scheduled to be released to students +

    ${_("This unit is scheduled to be released to students")} % if release_date is not None: - on ${release_date} + ${_("on %s") % release_date } % endif - with the subsection "${subsection.display_name_with_default}"

    + ${_("with the subsection")} "${subsection.display_name_with_default}"

    - Delete Draft - Preview - View Live + ${_("Delete Draft")} + ${_("Preview")} + ${_("View Live")}
    -

    Unit Location

    +

    ${_("Unit Location")}

      diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 03aafe0dcb87..8d3ce58b1642 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -1,3 +1,4 @@ +<%! from django.utils.translation import gettext as _ %> <%! from django.core.urlresolvers import reverse %> <%! from django.utils.translation import ugettext as _ %> @@ -5,7 +6,7 @@