diff --git a/lms/templates/admin_dashboard.html b/lms/templates/admin_dashboard.html index b9676faa16..5314881233 100644 --- a/lms/templates/admin_dashboard.html +++ b/lms/templates/admin_dashboard.html @@ -8,7 +8,7 @@
-

${_("edX-wide Summary")}

+

${_("{platform_name}-wide Summary").format(platform_name=settings.PLATFORM_NAME)}

% for key in results["scalars"]: diff --git a/lms/templates/combinedopenended/openended/open_ended.html b/lms/templates/combinedopenended/openended/open_ended.html index d4e622d4bd..15b3be1303 100644 --- a/lms/templates/combinedopenended/openended/open_ended.html +++ b/lms/templates/combinedopenended/openended/open_ended.html @@ -10,7 +10,7 @@
% if state == 'initial': - ${_(Unanswered)} + ${_("Unanswered")} % elif state == 'assessing': ${_("Submitted for grading.")} % if eta_message is not None: diff --git a/lms/templates/contact.html b/lms/templates/contact.html index ba6f8cc720..cb35aca359 100644 --- a/lms/templates/contact.html +++ b/lms/templates/contact.html @@ -21,8 +21,9 @@

${_("We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.")}

${_("General Inquiries and Feedback")}

-

${_('If you have a general question about edX please email {email}. To see if your question has already been answered, visit our {faq_link_start}FAQ page{faq_link_end}. You can also join the discussion on our {fb_link_start}facebook page{fb_link_end}. Though we may not have a chance to respond to every email, we take all feedback into consideration.').format( - email='info@edx.org', +

${_('If you have a general question about {platform_name} please email {contact_email}. To see if your question has already been answered, visit our {faq_link_start}FAQ page{faq_link_end}. You can also join the discussion on our {fb_link_start}facebook page{fb_link_end}. Though we may not have a chance to respond to every email, we take all feedback into consideration.').format( + platform_name=settings.PLATFORM_NAME, + contact_email=settings.CONTACT_EMAIL, faq_link_start=''.format(url=reverse('faq_edx')), faq_link_end='', fb_link_start=''. @@ -30,9 +31,10 @@ )}

${_("Technical Inquiries and Feedback")}

-

${_('If you have suggestions/feedback about the overall edX platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at {tech_email}. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: {bug_email}.').format( - tech_email='technical@edx.org', - bug_email='bugs@edx.org' +

${_('If you have suggestions/feedback about the overall {platform_name} platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at {tech_email}. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: {bugs_email}.').format( + tech_email=settings.TECH_SUPPORT_EMAIL, + bug_email=settings.BUGS_EMAIL, + platform_name=settings.PLATFORM_NAME )}

${_("Media")}

@@ -43,7 +45,7 @@ )}

${_("Universities")}

-

${_('If you are a university wishing to Collaborate or with questions about edX, please email {email}.'.format(email='university@edx.org')}

+

${_('If you are a university wishing to collaborate with or if you have questions about {platform_name}, please email {email}.'.format(email='university@edx.org', platform_name="edX")}

diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html index b086c8f2d9..b1bc715e9a 100644 --- a/lms/templates/courseware/course_about.html +++ b/lms/templates/courseware/course_about.html @@ -66,7 +66,7 @@ -<%block name="title">${_("About {course_number}").format(course_number=course.number)} +<%block name="title">${_("About {course.number}").format(course=course)}
@@ -87,13 +87,13 @@ %if show_courseware_link: %endif - ${_("You are registered for this course {course_number}").format(course_number=course.number)} + ${_("You are registered for this course {course.number}").format(course=course)} %if show_courseware_link: ${_("View Courseware")} %endif %else: - ${_("Register for {course_number}").format(course_number=course.number)} + ${_("Register for {course.number}").format(course=course)}
%endif diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index 0b20634d19..1f1d96a0df 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -17,7 +17,7 @@ % endif % if self.stanford_theme_enabled(): -

${_("Explore free courses from Stanford University.")}

+

${_("Explore free courses from {university_name}.").format(university_name="Stanford University")}

% else:

${_("Explore free courses from leading universities.")}

% endif diff --git a/lms/templates/courseware/courseware-error.html b/lms/templates/courseware/courseware-error.html index 3c61afd5d9..f0f7969026 100644 --- a/lms/templates/courseware/courseware-error.html +++ b/lms/templates/courseware/courseware-error.html @@ -2,8 +2,8 @@ <%inherit file="/main.html" /> <%namespace name='static' file='../static_content.html'/> <%block name="bodyclass">courseware -## "edX" should *not* be translated -<%block name="title">${_("Courseware")} - edX +## Translators: "edX" should *not* be translated +<%block name="title">${_("Courseware")} - ${settings.PLATFORM_NAME} <%block name="headextra"> <%static:css group='course'/> @@ -13,7 +13,7 @@
-

${_('There has been an error on the {span_start}edX{span_end} servers').format(span_start='', span_end='')}

-

${_("We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at {email} to report any problems or downtime.").format(email='technical@edx.org')}

+

${_('There has been an error on the {span_start}{platform_name}{span_end} servers').format(platform_name=settings.PLATFORM_NAME, span_start='', span_end='')}

+

${_("We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at '{tech_support_email}' to report any problems or downtime.").format(tech_support_email=settings.TECH_SUPPORT_EMAIL)}

diff --git a/lms/templates/courseware/info.html b/lms/templates/courseware/info.html index 62eae827c7..4bb961428e 100644 --- a/lms/templates/courseware/info.html +++ b/lms/templates/courseware/info.html @@ -7,7 +7,7 @@ <%static:css group='course'/> -<%block name="title">${course.number} ${_("Course Info")} +<%block name="title">${_("{course.number} Course Info").format(course=course)} <%include file="/courseware/course_navigation.html" args="active_page='info'" /> <%! diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html index e09e4e3350..b71f9a95ce 100644 --- a/lms/templates/courseware/instructor_dashboard.html +++ b/lms/templates/courseware/instructor_dashboard.html @@ -227,12 +227,12 @@ function goto( mode)

${_("Student-specific grade inspection and adjustment")}

- ${_("Specify the edX email address or username of a student here:")} + ${_("Specify the {platform_name} email address or username of a student here:").format(platform_name=settings.PLATFORM_NAME)}

${_("Click this, and a link to student's progress page will appear below:")} - +

${_("Specify a particular problem in the course here by its url:")} @@ -247,9 +247,9 @@ function goto( mode)

${_("Then select an action:")} - + %if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'): - + %endif

diff --git a/lms/templates/courseware/syllabus.html b/lms/templates/courseware/syllabus.html index c908b65661..f9b5455273 100644 --- a/lms/templates/courseware/syllabus.html +++ b/lms/templates/courseware/syllabus.html @@ -6,7 +6,7 @@ <%static:css group='course'/> -<%block name="title">${_("{course_number} Course Info").format(course_number=course.number)} +<%block name="title">${_("{course.number} Course Info").format(course=course)} <%include file="/courseware/course_navigation.html" args="active_page='syllabus'" /> <%! @@ -16,7 +16,7 @@
-

${_("Syllabus ")}

+

${_("Syllabus")}

% if user.is_authenticated(): ${get_course_syllabus_section(course, 'syllabus')} % else: diff --git a/lms/templates/courseware/welcome-back.html b/lms/templates/courseware/welcome-back.html index f7a34cb421..a622fe3c57 100644 --- a/lms/templates/courseware/welcome-back.html +++ b/lms/templates/courseware/welcome-back.html @@ -1,9 +1,9 @@ <%! from django.utils.translation import ugettext as _ %>

${chapter_module.display_name_with_default}

-

${_("You were most recently in {section_link}. If you're done with that, choose another section on the left.").format( - section_link='{section_name}'.format( - url=prev_section_url - section_name=prev_section.display_name_with_default, - ) - )}

+

${_("You were most recently in {section_link}. If you\'re done with that, choose another section on the left.").format( + section_link='{section_name}'.format( + url=prev_section_url, + section_name=prev_section.display_name_with_default, + ) + )}

diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 3faef44a75..6356b64209 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -50,15 +50,11 @@ {"new_email" : new_email, "password" : new_password}, function(data) { if (data.success) { -<<<<<<< HEAD - $("#change_email_title").html("${_('Please verify your new email')}")); - $("#change_email_form").html("

${_('You'll receive a confirmation in your in-box. Please click the link in the email to confirm the email change.')}

"); -======= $("#change_email_title").html("Please verify your new email"); $("#change_email_form").html("

You'll receive a confirmation in your " + "in-box. Please click the link in the " + "email to confirm the email change.

"); ->>>>>>> a187bc7... fix registration + $("#change_email_form").html("

${_('You\'ll receive a confirmation in your in-box. Please click the link in the email to confirm the email change.')}

"); } else { $("#change_email_error").html(data.error).stop().css("display", "block"); } @@ -144,11 +140,11 @@ % if course.id in show_courseware_links_for: - ${_( + ${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')} % else:
- ${_( + ${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')}
% endif @@ -205,7 +201,7 @@ ${_("Your registration for the Pearson exam has been rejected. Please {link_start}see your registration status details{link_end}.").format( link_start=''.format(url=testcenter_register_target), link_end='')} - ${_("Otherwise {link_start}contact edX at {email}{link_end} for further help.').format( + ${_("Otherwise {link_start}contact edX at {email}{link_end} for further help.").format( link_start=''.format(email="exam-help@edx.org", about=get_course_about_section(course, 'university'), number=course.number), link_end='', email="exam-help@edx.org", @@ -405,7 +401,7 @@
-

${_("To uphold the credibility of {platform} certificates, all name changes will be logged and recorded.".format(platform=settings.PLATFORM_NAME)}

+

${_("To uphold the credibility of {platform} certificates, all name changes will be logged and recorded.").format(platform=settings.PLATFORM_NAME)}


diff --git a/lms/templates/discussion/_single_thread.html b/lms/templates/discussion/_single_thread.html index 11763b1803..6c7e52d4d6 100644 --- a/lms/templates/discussion/_single_thread.html +++ b/lms/templates/discussion/_single_thread.html @@ -8,7 +8,7 @@
%if thread['group_id']: -
${_("This post visible only to group %s.") % cohort_dictionary[thread['group_id']]}
+
${_("This post visible only to group {group}.").format(group=cohort_dictionary[thread['group_id']])}
%endif + ${thread['votes']['up_count']} diff --git a/lms/templates/footer.html b/lms/templates/footer.html index 80772ed9f3..9c94e5751e 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -39,7 +39,7 @@
-

${_("EdX is a non-profit created by founding partners Harvard and MIT whose mission is to bring the best of higher education to students of all ages anywhere in the world, wherever there is Internet access. EdX's free online MOOCs are interactive and subjects include computer science, public health, and artificial intelligence.")}

+

${_("{platform_name} is a non-profit created by founding partners {Harvard} and {MIT} whose mission is to bring the best of higher education to students of all ages anywhere in the world, wherever there is Internet access. {platform_name}'s free online MOOCs are interactive and subjects include computer science, public health, and artificial intelligence.").format(platform_name="EdX", Harvard="Harvard", MIT="MIT")}

@@ -74,7 +74,7 @@ -

${_("© 2013 edX, some rights reserved.")}

+

${_("© 2013 {platform_name}, some rights reserved.").format(platform_name=settings.PLATFORM_NAME)}

- % endfor
${s['new_name']|h} ${s['email']|h} ${s['rationale']|h}${_("[Confirm]")} + [${_("Confirm")}] ${_("[Reject]")}
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html index 74166b528e..589d12666d 100644 --- a/lms/templates/navigation.html +++ b/lms/templates/navigation.html @@ -44,7 +44,7 @@ site_status_msg = get_site_status_msg(course_id)

<%block name="navigation_logo"> - ${_('edX home')} + ${_('{settings.PLATFORM_NAME} home')}

@@ -70,7 +70,7 @@ site_status_msg = get_site_status_msg(course_id)
  • - ${_("More options dropdown")} ▾ + ${_("More options dropdown")} ▾
      <%block name="navigation_dropdown_menu_links" >
    • ${_("Help")}
      • diff --git a/lms/templates/open_ended_problems/open_ended_problems.html b/lms/templates/open_ended_problems/open_ended_problems.html index 2905373b04..56b269d8b7 100644 --- a/lms/templates/open_ended_problems/open_ended_problems.html +++ b/lms/templates/open_ended_problems/open_ended_problems.html @@ -26,15 +26,15 @@ %else: - - - - + + + + %for problem in problem_list:
      ${_("Problem Name")}${_("Status")}${_("Grader Type")}${_("ETA")}${_("Problem Name")}${_("Status")}${_("Grader Type")}${_("ETA")}
      - ${problem['problem_name']} + ${problem['problem_name']} ${problem['state']} diff --git a/lms/templates/peer_grading/peer_grading.html b/lms/templates/peer_grading/peer_grading.html index 8e32e7a285..f423de1c6b 100644 --- a/lms/templates/peer_grading/peer_grading.html +++ b/lms/templates/peer_grading/peer_grading.html @@ -14,12 +14,12 @@
      - - - - - - + + + + + + %for problem in problem_list: @@ -34,7 +34,7 @@ % if problem['due']: ${problem['due']} % else: - ${_("No due date")} + ${_("No due date")} % endif
      ${_("Problem Name")}${_("Due date")}${_("Graded")}${_("Available")}${_("Required")}${_("Progress")}${_("Problem Name")}${_("Due date")}${_("Graded")}${_("Available")}${_("Required")}${_("Progress")}
      diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html index 6b00135b46..d99e14c706 100644 --- a/lms/templates/peer_grading/peer_grading_problem.html +++ b/lms/templates/peer_grading/peer_grading_problem.html @@ -70,22 +70,22 @@

      ${_("Ready to grade!")}

      -

      ${_(" You have finished learning to grade, which means that you are now ready to start grading.")}

      +

      ${_("You have finished learning to grade, which means that you are now ready to start grading.")}

      ${_("Learning to grade")}

      -

      ${_(" You have not yet finished learning to grade this problem.")}

      -

      ${_(" You will now be shown a series of instructor-scored essays, and will be asked to score them yourself.")}

      -

      ${_(" Once you can score the essays similarly to an instructor, you will be ready to grade your peers.")}

      +

      ${_("You have not yet finished learning to grade this problem.")}

      +

      ${_("You will now be shown a series of instructor-scored essays, and will be asked to score them yourself.")}

      +

      ${_("Once you can score the essays similarly to an instructor, you will be ready to grade your peers.")}

      -

      ${_(" Are you sure that you want to flag this submission?")}

      +

      ${_("Are you sure that you want to flag this submission?")}

      ${_("You are about to flag a submission. You should only flag a submission that contains explicit or offensive content. If the submission is not addressed to the question or is incorrect, you should give it a score of zero and accompanying feedback instead of flagging it.")}

      diff --git a/lms/templates/register.html b/lms/templates/register.html index 41b38d19ec..0e16bea345 100644 --- a/lms/templates/register.html +++ b/lms/templates/register.html @@ -96,7 +96,7 @@
      diff --git a/lms/templates/registration/password_reset_confirm.html b/lms/templates/registration/password_reset_confirm.html index 3ca40fd45d..6a568545d1 100644 --- a/lms/templates/registration/password_reset_confirm.html +++ b/lms/templates/registration/password_reset_confirm.html @@ -5,7 +5,7 @@ - ${_("Reset Your edX Password")} + ${_("Reset Your {platform_name} Password").format(platform_name=settings.PLATFORM_NAME)} {% compressed_css 'application' %} @@ -53,7 +53,7 @@
      -

      ${_("Reset Your edX Password")}

      +

      ${_("Reset Your {platform_name} Password").format(platform_name=settings.PLATFORM_NAME)}

      @@ -66,8 +66,7 @@ {% csrf_token %}
      - + %for name, field in lms_fields: %endfor diff --git a/lms/templates/static_templates/about.html b/lms/templates/static_templates/about.html index 4261fc6081..fbaaf4e816 100644 --- a/lms/templates/static_templates/about.html +++ b/lms/templates/static_templates/about.html @@ -4,7 +4,7 @@ <%inherit file="../main.html" /> -<%block name="title">${_("About edX")} +<%block name="title">${_("About {edX}").format(edX="edX")}
      @@ -50,9 +50,9 @@
      -

      ${_("Massachusetts Institute of Technology")}

      -

      ${_("The Massachusetts Institute of Technology — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.")}

      -

      ${_("MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.")}

      +

      ${_("{massachusetts_institute_of_technology}").format(massachusetts_institute_of_technology="Massachusetts Institute of Technology")}

      +

      ${_("The {massachusetts_institute_of_technology} — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; {Sloan} School of Management; and Science.").format(massachusetts_institute_of_technology="Massachusetts Institute of Technology", Sloan="Sloan")}

      +

      ${_("{MIT}'s commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.")}

      ${_("Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.")}

      diff --git a/lms/templates/static_templates/contact.html b/lms/templates/static_templates/contact.html index c7cd122c86..dcdc953f86 100644 --- a/lms/templates/static_templates/contact.html +++ b/lms/templates/static_templates/contact.html @@ -4,7 +4,7 @@ <%inherit file="../main.html" /> -<%block name="title">${_("Contact edX")} +<%block name="title">${_("Contact {platform_name}").format(platform_name=settings.PLATFORM_NAME)}
      diff --git a/lms/templates/static_templates/copyright.html b/lms/templates/static_templates/copyright.html index 4b10cff174..b60b06b568 100644 --- a/lms/templates/static_templates/copyright.html +++ b/lms/templates/static_templates/copyright.html @@ -12,14 +12,14 @@

      ${_("Videos and Exercises")}

      -

      ${_(" Copyright © 2012 MIT. All rights reserved. In order to further MIT's goal of making education accessible and affordable to the world, MIT is planning to make MITx course content available under open source licenses.")}

      +

      ${_(" Copyright © 2012 {MIT}. All rights reserved. In order to further {MIT}'s goal of making education accessible and affordable to the world, {MIT} is planning to make {MITx} course content available under open source licenses.").format(MIT="MIT", MITx="MITx")}

      ${_("Textbook")}

      -

      ${_(" Copyright © 2005 Elsevier Inc. All Rights Reserved. Used with permission. While our goal is to build courses with as much free and open content as possible, we apologize that we do not have the ability to do so entirely. ")}

      +

      ${_(" Copyright © 2005 {elsevier}. All Rights Reserved. Used with permission. While our goal is to build courses with as much free and open content as possible, we apologize that we do not have the ability to do so entirely. ").format(elsevier="Elsevier Inc")}

      ${_("Student-generated content")}

      ${_("Copyright © 2012. All Rights Reserved. Due to privacy concerns, we do not know what portion of these will be released under open licenses.")}

      -

      ${_("MIT and MITx are trademarks of the Massachusetts Institute of Technology, and may not be used without permission.")}

      +

      ${_("{MIT} and {MITx} are trademarks of the {MIT_long}, and may not be used without permission.").format(MIT="MIT", MITx="MITx", MIT_long="Massachusetts Institute of Technology")}

      diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html index 56dec83d64..ea3e0e4725 100644 --- a/lms/templates/static_templates/faq.html +++ b/lms/templates/static_templates/faq.html @@ -20,42 +20,78 @@

      ${_("Organization")}

      -

      ${_("What is edX?")}

      -

      ${_('edX is a not-for-profit enterprise of its founding partners, the Massachusetts Institute of Technology (MIT) and Harvard University that offers online learning to on-campus students and to millions of people around the world. To do so, edX is building an open-source online learning platform and hosts an online web portal at www.edx.org for online education.')}

      -

      ${_("EdX currently offers HarvardX, MITx and BerkeleyX classes online for free. Beginning in fall 2013, edX will offer WellesleyX , GeorgetownX and the University of Texas System classes online for free. The UT System includes nine universities and six health institutions. In 2014, edX will further expand its consortium, including several international schools, when it begins offering courses from École Polytechnique Fédérale de Lausanne, McGill University, University of Toronto, Australian National University, Delft University of Technology, and Rice University. The edX institutions aim to extend their collective reach to build a global community of online students. Along with offering online courses, the three universities undertake research on how students learn and how technology can transform learning both on-campus and online throughout the world.")}

      +

      ${_("What is {edX}?").format(edX="edX")}

      +

      ${_('{edX} is a not-for-profit enterprise of its founding partners, the {MIT_long} ({MIT}) and {harvard_u} that offers online learning to on-campus students and to millions of people around the world. To do so, {edX} is building an open-source online learning platform and hosts an online web portal at www.edx.org for online education.').format(edX="edX", MIT_long="Massachusetts Institute of Technology", MIT="MIT", harvard_u="Harvard University")}

      +

      ${_("{EdX} currently offers {HarvardX}, {MITx} and {BerkeleyX} classes online for free. Beginning in fall 2013, {edX} will offer {WellesleyX} , {GeorgetownX} and the {UTexas} classes online for free. The {UT} System includes nine universities and six health institutions. In 2014, {edX} will further expand its consortium, including several international schools, when it begins offering courses from {EPFL}, {McGill}, {Toronto}, {ANU}, {Delft}, and {Rice}. The {edX} institutions aim to extend their collective reach to build a global community of online students. Along with offering online courses, the three universities undertake research on how students learn and how technology can transform learning both on-campus and online throughout the world.").format( + EdX="EdX", + edX="edX", + HarvardX="HarvardX", + MITx="MITx", + BerkeleyX="BerkeleyX", + WellesleyX="WellesleyX", + GeorgetownX="GeorgetownX", + UTexas="University of Texas System", + UT="UT", + EPFL="École Polytechnique Fédérale de Lausanne", + McGill="McGill University", + Toronto="University of Toronto", + ANU="Australian National University", + Delft="Delft University of Technology", + Rice="Rice University", + )} +

      -

      ${_("Will edX be adding additional X Universities?")}

      -

      ${_("More than 200 institutions from around the world have expressed interest in collaborating with edX since Harvard and MIT announced its creation in May. EdX is focused above all on quality and developing the best not-for-profit model for online education. In addition to providing online courses on the edX platform, the \"X University\" Consortium will be a forum in which members can share experiences around online learning. Harvard, MIT, UC Berkeley, the University of Texas system and the other consortium members will work collaboratively to establish the \"X University\" Consortium, whose membership will expand to include additional \"X Universities.\" As noted above, edX's newest consortium members include Wellesley, Georgetown, École Polytechnique Fédérale de Lausanne, McGill University, University of Toronto, Australian National University, Delft University of Technology, and Rice University. Each member of the consortium will offer courses on the edX platform as an \"X University\". The gathering of many universities' educational content together on one site will enable learners worldwide to access the offered course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.")}

      -

      ${_("edX will actively explore the addition of other institutions from around the world to the edX platform, and looks forward to adding more \"X Universities\".")}

      +

      ${_("Will {edX} be adding additional X Universities?").format(edX="edX")}

      +

      ${_("More than 200 institutions from around the world have expressed interest in collaborating with {edX} since {Harvard} and {MIT} announced its creation in May. {EdX} is focused above all on quality and developing the best not-for-profit model for online education. In addition to providing online courses on the {edX} platform, the {x_consortium} will be a forum in which members can share experiences around online learning. {Harvard}, {MIT}, {Berkeley}, the {UTexas} and the other {consortium} members will work collaboratively to establish the {\"X_University\" Consortium}, whose membership will expand to include additional \"{X_Universities}.\" As noted above, {edX}'s newest {consortium} members include {Wellesley}, {Georgetown}, {EPFL}, {McGill}, {Toronto}, {ANU}, {Delft}, and {Rice}. Each member of the {consortium} will offer courses on the {edX} platform as an \"{X_University}\". The gathering of many universities' educational content together on one site will enable learners worldwide to access the offered course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.").format( + EdX="EdX", + edX="edX", + Harvard="Harvard", + MIT="MIT", + x_consortium="\"X_University\" Consortium", + consortium="consortium", + X_Universities="X Universities", + X_University="X University", + Berkeley="UC Berkeley", + Wellesley="Wellesley", + Georgetown="Georgetown", + UTexas="University of Texas System", + EPFL="École Polytechnique Fédérale de Lausanne", + McGill="McGill University", + Toronto="University of Toronto", + ANU="Australian National University", + Delft="Delft University of Technology", + Rice="Rice University", + )}

      +

      ${_("{edX} will actively explore the addition of other institutions from around the world to the {edX} platform, and looks forward to adding more \"{X Universities}\".").format(edX="edX", X_Universities="X Universities")} +

      ${_("Students")}

      -

      ${_("Who can take edX courses? Will there be an admissions process?")}

      -

      ${_("EdX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.")}

      +

      ${_("Who can take {edX} courses? Will there be an admissions process?").format(edX="edX")}

      +

      ${_("{EdX} will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.").format(EdX="EdX")}

      ${_("Will certificates be awarded?")}

      ${_("Yes. Online learners who demonstrate mastery of subjects can earn a certificate " - "of mastery. Certificates will be issued at the discretion of edX and the underlying " - "X University that offered the course under the name of the underlying \"X " - "University\" from where the course originated, i.e. HarvardX, MITx or BerkeleyX. " + "of mastery. Certificates will be issued at the discretion of {edX} and the underlying " + "{X_University} that offered the course under the name of the underlying \"{X_University}\" from where the course originated, i.e. {HarvardX}, {MITx} or {BerkeleyX}. " "For the courses in Fall 2012, those certificates will be free. There is a plan to " - "charge a modest fee for certificates in the future. Note: At this time, edX is " + "charge a modest fee for certificates in the future. Note: At this time, {edX} is " "holding certificates for learners connected with Cuba, Iran, Syria and Sudan " - "pending confirmation that the issuance is in compliance with U.S. embargoes.")}

      + "pending confirmation that the issuance is in compliance with U.S. embargoes.").format(edX="edX", X_University="X University", HarvardX="HarvardX", MITx="MITx", BerkeleyX="BerkeleyX")}

      ${_("What will the scope of the online courses be? How many? Which faculty?")}

      -

      ${_('Our goal is to offer a wide variety of courses across disciplines. There are currently {link_start}fifteen{link_end} offered on the edX platform.').format(link_start='', link_end='')}

      +

      ${_('Our goal is to offer a wide variety of courses across disciplines. There are currently {link_start}fifteen{link_end} offered on the {edX} platform.').format(link_start='', link_end='', edX="edX")}

      ${_("Who is the learner? Domestic or international? Age range?")}

      -

      ${_("Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don't have a target group of potential learners, as the goal is to make these courses available to anyone in the world - from any demographic - who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for MITx's first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years-old.")}

      +

      ${_("Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don't have a target group of potential learners, as the goal is to make these courses available to anyone in the world - from any demographic - who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for {MITx}'s first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years-old.").format(MITx="MITx")}

      ${_("Will participating universities' standards apply to all courses offered on the edX platform?")}

      @@ -63,28 +99,28 @@

      ${_("How do you intend to test whether this approach is improving learning?")}

      -

      ${_("Edx institutions have assembled faculty members who will collect and analyze data to assess results and the impact edX is having on learning.")}

      +

      ${_("{EdX} institutions have assembled faculty members who will collect and analyze data to assess results and the impact {edX} is having on learning.").format(EdX="EdX", edX="edX")}

      -

      ${_("How may I apply to study with edX?")}

      -

      ${_('Simply complete the online {link_start}signup form{link_end}. Enrolling will create your unique student record in the edX database, allow you to register for classes, and to receive a certificate on successful completion.').format(link_start='', link_end='')}

      +

      ${_("How may I apply to study with {edX}?")}

      +

      ${_('Simply complete the online {link_start}signup form{link_end}. Enrolling will create your unique student record in the {edX} database, allow you to register for classes, and to receive a certificate on successful completion.').format(link_start='', link_end='', edX="edX")}

      -

      ${_("How may another university participate in edX? ")}

      -

      ${_('If you are from a university interested in discussing edX, please email {email}').format(email='university@edx.org')}

      +

      ${_("How may another university participate in {edX}? ").format(edX="edX")}

      +

      ${_('If you are from a university interested in discussing {edX}, please email {email}').format(email='university@edx.org', edX="edX")}

      ${_("Technology Platform")}

      -

      ${_("What technology will edX use?")}

      -

      ${_("The edX open-source online learning platform will feature interactive learning designed specifically for the web. Features will include: self-paced learning, online discussion groups, wiki-based collaborative learning, assessment of learning as a student progresses through a course, and online laboratories and other interactive learning tools. The platform will also serve as a laboratory from which data will be gathered to better understand how students learn. Because it is open source, the platform will be continuously improved by a worldwide community of collaborators, with new features added as needs arise.")}

      -

      ${_("The first version of the technology was used in the first MITx course, 6.002x Circuits and Electronics, which launched in Spring, 2012.")}

      +

      ${_("What technology will {edX} use?").format(edX="edX")}

      +

      ${_("The {edX} open-source online learning platform will feature interactive learning designed specifically for the web. Features will include: self-paced learning, online discussion groups, wiki-based collaborative learning, assessment of learning as a student progresses through a course, and online laboratories and other interactive learning tools. The platform will also serve as a laboratory from which data will be gathered to better understand how students learn. Because it is open source, the platform will be continuously improved by a worldwide community of collaborators, with new features added as needs arise.").format(edX="edX")}

      +

      ${_("The first version of the technology was used in the first {MITx} course, 6.002x Circuits and Electronics, which launched in Spring, 2012.").format(MITx="MITx")}

      ${_("How is this different from what other universities are doing online?")}

      -

      ${_("EdX is a not-for-profit enterprise built upon the shared educational missions of its founding partners, Harvard University and MIT. The edX platform will be available as open source. Also, a primary goal of edX is to improve teaching and learning on campus by experimenting with blended models of learning and by supporting faculty in conducting significant research on how students learn.")}

      +

      ${_("{EdX} is a not-for-profit enterprise built upon the shared educational missions of its founding partners, {Harvard_long} and {MIT}. The {edX} platform will be available as open source. Also, a primary goal of {edX} is to improve teaching and learning on campus by experimenting with blended models of learning and by supporting faculty in conducting significant research on how students learn.").format(edX="edX", EdX="EdX", Harvard_long="Harvard University", MIT="MIT")}

      diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html index 7af712f570..b2743f892f 100644 --- a/lms/templates/static_templates/help.html +++ b/lms/templates/static_templates/help.html @@ -4,7 +4,7 @@ <%namespace name='static' file='../static_content.html'/> -<%block name="title">${_("edX Help")} +<%block name="title">${_("{edX} Help").format(edX="edX")} <%block name="js_extra"> @@ -17,17 +17,17 @@
      -

      ${_("edX Basics")}

      +

      ${_("{edX} Basics").format(edX="edX")}

      ${_("How do I sign up to take a class?")}

      -

      ${_("Simply create an edX account (it's free) and then register for the course of your choice (also free). Follow the prompts on the edX website.")}

      +

      ${_("Simply create an {edX} account (it's free) and then register for the course of your choice (also free). Follow the prompts on the {edX} website.").format(edX="edX")}

      ${_("What does it cost to take a class? Is this really free?")}

      -

      ${_("EdX courses are free for everyone. All you need is an Internet connection.")}

      +

      ${_("{EdX} courses are free for everyone. All you need is an Internet connection.").format(EdX="EdX")}

      @@ -37,21 +37,21 @@
      -

      ${_("Who can take an edX course?")}

      +

      ${_("Who can take an {edX} course?").format(edX="edX")}

      -

      ${_("You, your mom, your little brother, your grandfather -- anyone with Internet access can take an edX course. Free.")}

      +

      ${_("You, your mom, your little brother, your grandfather -- anyone with Internet access can take an {edX} course. Free.").format(edX="edX")}

      ${_("Are the courses only offered in English?")}

      -

      ${_("Some edX courses include a translation of the lecture in the text bar to the right of the video. Some have the specific option of requesting a course in other languages. Please check your course to determine foreign language options.")}

      +

      ${_("Some {edX} courses include a translation of the lecture in the text bar to the right of the video. Some have the specific option of requesting a course in other languages. Please check your course to determine foreign language options.").format(edX="edX")}

      ${_("When will there be more courses on other subjects?")}

      -

      ${_("We are continually reviewing and creating courses to add to the edX platform. Please check the website for future course announcements. You can also \"friend\" edX on Facebook - you\'ll receive updates and announcements.")}

      +

      ${_("We are continually reviewing and creating courses to add to the {edX} platform. Please check the website for future course announcements. You can also \"friend\" {edX} on Facebook - you\'ll receive updates and announcements.").format(edX="edX")}

      @@ -75,7 +75,7 @@

      ${_("What happens if I have to quit a course? Are there any penalties? Will I be able to take another course in the future?")}

      -

      ${_("You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.")}

      +

      ${_("You may unregister from an {edX} course at anytime, there are absolutely no penalties associated with incomplete {edX} studies, and you may register for the same course (provided we are still offering it) at a later time.").format(edX="edX")}

      @@ -91,7 +91,7 @@

      ${_("What should I do before I take a course (prerequisites)?")}

      -

      ${_("Each course is different - some have prerequisites, and some don\'t. Take a look at your specific course/'s recommended prerequisites. If you do not have a particular prerequisite, you may still take the course.")}

      +

      ${_("Each course is different - some have prerequisites, and some don\'t. Take a look at your specific course\'s recommended prerequisites. If you do not have a particular prerequisite, you may still take the course.")}

      @@ -103,7 +103,7 @@

      ${_(" Can I download the book for my course?")}

      -

      ${_("EdX book content may only be viewed within the browser, and downloading it violates copyright laws. If you need or want a hard copy of the book, we recommend that you purchase a copy.")}

      +

      ${_("{EdX} book content may only be viewed within the browser, and downloading it violates copyright laws. If you need or want a hard copy of the book, we recommend that you purchase a copy.").format(EdX="EdX")}

      @@ -113,33 +113,33 @@
      -

      ${_("How do I log in to take an edX class?")}

      +

      ${_("How do I log in to take an {edX} class?").format(edX="edX")}

      -

      ${_("Once you sign up for a course and activate your account, click on the \"Log In\" button on the edx.org home page. You will need to type in your email address and edX password each time you log in.")}

      +

      ${_("Once you sign up for a course and activate your account, click on the \"Log In\" button on the edx.org home page. You will need to type in your email address and {edX} password each time you log in.").format(edX="edX")}

      ${_("What time is the class?")}

      -

      ${_("EdX classes take place at your convenience. Prefer to sleep in and study late? No worries. Videos and problem sets are available 24 hours a day, which means you can watch video and complete work whenever you have spare time. You simply log in to your course via the Internet and work through the course material, one week at a time.")}

      +

      ${_("{EdX} classes take place at your convenience. Prefer to sleep in and study late? No worries. Videos and problem sets are available 24 hours a day, which means you can watch video and complete work whenever you have spare time. You simply log in to your course via the Internet and work through the course material, one week at a time.").format(EdX="EdX")}

      ${_("If I miss a week, how does this affect my grade?")}

      -

      ${_("It is certainly possible to pass an edX course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.")}

      +

      ${_("It is certainly possible to pass an {edX} course if you miss a week; however, coursework is progressive, so you should review and study what you may have missed. You can check your progress dashboard in the course to see your course average along the way if you have any concerns.").format(edX="edX")}

      ${_("How can I meet/find other students?")}

      -

      ${_("All edX courses have Discussion Forums where you can chat with and help each other within the framework of the Honor Code.")}

      +

      ${_("All {edX} courses have Discussion Forums where you can chat with and help each other within the framework of the Honor Code.").format(edX="edX")}

      ${_("How can I talk to professors, fellows and teaching assistants?")}

      -

      ${_("The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don\'t have to wait in line or rearrange your schedule to fit your professor'\s - just post your questions. The response isn\'t always immediate, but it\'s usually pretty darned quick.")}

      +

      ${_("The Discussion Forums are the best place to reach out to the {edX} teaching team for your class, and you don\'t have to wait in line or rearrange your schedule to fit your professor'\s - just post your questions. The response isn\'t always immediate, but it\'s usually pretty darned quick.").format(edX="edX")}

      @@ -152,7 +152,7 @@

      ${_("Can I re-take a course?")}

      -

      ${_("Good news: there are unlimited \"mulligans\" in edX. You may re-take edX courses as often as you wish. Your performance in any particular offering of a course will not effect your standing in future offerings of any edX course, including future offerings of the same course.")}

      +

      ${_("Good news: there are unlimited \"mulligans\" in {edX}. You may re-take {edX} courses as often as you wish. Your performance in any particular offering of a course will not effect your standing in future offerings of any {edX} course, including future offerings of the same course.").format(edX="edX")}

      @@ -170,7 +170,7 @@

      ${_("Will the same courses be offered again in the future?")}

      -

      ${_("Existing edX courses will be re-offered, and more courses added.")}

      +

      ${_("Existing {edX} courses will be re-offered, and more courses added.").format(edX="edX")}

      @@ -180,30 +180,22 @@

      ${_("Certificates & Credits")}

      -

      ${_("Will I get a certificate for taking an edX course?")}

      +

      ${_("Will I get a certificate for taking an {edX} course?").format(edX="edX")}

      -

      ${_("Online learners who receive a passing grade for a course will receive a certificate " - "of mastery at the discretion of edX and the underlying X University that offered " - "the course. For example, a certificate of mastery for MITx\'s 6.002x Circuits & " - "Electronics will come from edX and MITx.")}

      -

      ${_("If you passed the course, your certificate of mastery will be delivered online " - "through edx.org. So be sure to check your email in the weeks following the final " - "grading - you will be able to download and print your certificate. Note: At this " - "time, edX is holding certificates for learners connected with Cuba, Iran, Syria " - "and Sudan pending confirmation that the issuance is in compliance with U.S. " - "embargoes.")}

      +

      ${_("Online learners who receive a passing grade for a course will receive a certificate of mastery at the discretion of {edX} and the underlying {X} University that offered the course. For example, a certificate of mastery for {MITx}\'s 6.002x Circuits & Electronics will come from {edX} and {MITx}.").format(edX="edX", X="X", MITx="MITx")}

      +

      ${_("If you passed the course, your certificate of mastery will be delivered online through edx.org. So be sure to check your email in the weeks following the final grading - you will be able to download and print your certificate. Note: At this time, {edX} is holding certificates for learners connected with Cuba, Iran, Syria and Sudan pending confirmation that the issuance is in compliance with U.S. embargoes.").format(edX="edX")}

      -

      ${_("How are edX certificates delivered?")}

      +

      ${_("How are {edX} certificates delivered?").format(edX="edX")}

      -

      ${_("EdX certificates are delivered online through edx.org. So be sure to check your email in the weeks following the final grading - you will be able to download and print your certificate.")}

      +

      ${_("{EdX} certificates are delivered online through edx.org. So be sure to check your email in the weeks following the final grading - you will be able to download and print your certificate.").format(edX="edX")}

      ${_("What is the difference between a proctored certificate and an honor code certificate?")}

      -

      ${_("A proctored certificate is given to students who take and pass an exam under proctored conditions. An honor-code certificate is given to students who have completed all of the necessary online coursework associated with a course and have signed the edX honor code .")}

      +

      ${_("A proctored certificate is given to students who take and pass an exam under proctored conditions. An honor-code certificate is given to students who have completed all of the necessary online coursework associated with a course and have signed the {edX} honor code .").format(edX="edX")}

      @@ -221,23 +213,23 @@

      ${_("How can I talk to professors, fellows and teaching assistants?")}

      -

      ${_("The Discussion Forums are the best place to reach out to the edX teaching team for your class, and you don\'t have to wait in line or rearrange your schedule to fit your professor\'s - just post your questions. The response isn/'t always immediate, but it/'s usually pretty darned quick.")}

      +

      ${_("The Discussion Forums are the best place to reach out to the {edX} teaching team for your class, and you don\'t have to wait in line or rearrange your schedule to fit your professor\'s - just post your questions. The response isn\'t always immediate, but it\'s usually pretty darned quick.").format(edX="edX")}

      -

      ${_("The only certificates distributed with grades by edX were for the initial prototype course.")}

      +

      ${_("The only certificates distributed with grades by {edX} were for the initial prototype course.").format(edX="edX")}

      -

      ${_("You may unregister from an edX course at anytime, there are absolutely no penalties associated with incomplete edX studies, and you may register for the same course (provided we are still offering it) at a later time.")}

      +

      ${_("You may unregister from an {edX} course at anytime, there are absolutely no penalties associated with incomplete {edX} studies, and you may register for the same course (provided we are still offering it) at a later time.").format(edX="edX")}

      -

      ${_("Will my university accept my edX coursework for credit?")}

      +

      ${_("Will my university accept my {edX} coursework for credit?").format(edX="edX")}

      -

      ${_("Each educational institution makes its own decision regarding whether to accept edX coursework for credit. Check with your university for its policy.")}

      +

      ${_("Each educational institution makes its own decision regarding whether to accept {edX} coursework for credit. Check with your university for its policy.").format(edX="edX")}

      -

      ${_("I lost my edX certificate - can you resend it to me?")}

      +

      ${_("I lost my {edX} certificate - can you resend it to me?").format(edX="edX")}

      ${_("Please log back in to your account to find certificates from the same profile page where they were originally posted. You will be able to re-print your certificate from there.")}

      @@ -249,13 +241,13 @@

      ${_("What\'s open source?")}

      -

      ${_("Open source is a philosophy that generally refers to making software freely available for use or modification as users see fit. In exchange for use of the software, users generally add their contributions to the software, making it a public collaboration. The edX platform will be made available as open source code in order to allow world talent to improve and share it on an ongoing basis.")}

      +

      ${_("Open source is a philosophy that generally refers to making software freely available for use or modification as users see fit. In exchange for use of the software, users generally add their contributions to the software, making it a public collaboration. The {edX} platform will be made available as open source code in order to allow world talent to improve and share it on an ongoing basis.").format(edX="edX")}

      ${_("When/how can I get the open-source platform technology?")}

      -

      ${_("We are still building the edX technology platform and will be making announcements in the future about its availability.")}

      +

      ${_("We are still building the {edX} technology platform and will be making announcements in the future about its availability.").format(edX="edX")}

      @@ -265,7 +257,7 @@

      ${_("My username is taken.")}

      -

      ${_("Now/'s your chance to be creative: please try a different, more unique username - for example, try adding a random number to the end.")}

      +

      ${_("Now\'s your chance to be creative: please try a different, more unique username - for example, try adding a random number to the end.")}

      @@ -277,7 +269,7 @@

      ${_("I am having login problems (password/email unrecognized).")}

      -

      ${_("Please check your browser/'s settings to make sure that you have the current version of Firefox or Chrome, and then try logging in again. If you find access impossible, you may simply create a new account using an alternate email address - the old, unused account will disappear later.")}

      +

      ${_("Please check your browser\'s settings to make sure that you have the current version of Firefox or Chrome, and then try logging in again. If you find access impossible, you may simply create a new account using an alternate email address - the old, unused account will disappear later.")}

      @@ -296,7 +288,7 @@

      ${_("Can I delete my account?")}

      -

      ${_("There/'s no need to delete you account. An old, unused edX account with no course completions associated with it will disappear.")}

      +

      ${_("There\'s no need to delete you account. An old, unused {edX} account with no course completions associated with it will disappear.").format(edX="edX")}

      @@ -312,9 +304,9 @@
      -

      ${_("How can I help edX?")}

      +

      ${_("How can I help {edX}?").format(edX="edX")}

      -

      ${_("You may not realize it, but just by taking a course you are helping edX. That/'s because the edX platform has been specifically designed to not only teach, but also gather data about learning. EdX will utilize this data to find out how to improve education online and on-campus.")}

      +

      ${_("You may not realize it, but just by taking a course you are helping {edX}. That\'s because the {edX} platform has been specifically designed to not only teach, but also gather data about learning. {EdX} will utilize this data to find out how to improve education online and on-campus.").format(edX="edX", EdX="EdX")}

      @@ -323,10 +315,10 @@ diff --git a/lms/templates/static_templates/honor.html b/lms/templates/static_templates/honor.html index 7424102592..baa01ec323 100644 --- a/lms/templates/static_templates/honor.html +++ b/lms/templates/static_templates/honor.html @@ -13,22 +13,22 @@

      ${_("Collaboration Policy")}

      -

      ${_("By enrolling in a course on edX, you are joining a special worldwide community of learners. The aspiration of edX is to provide anyone in the world who has the motivation and ability to engage coursework from the Massachusetts Institute of Technology, Harvard University and the University of California, Berkeley the opportunity to attain the best MIT, Harvard and UC Berkeley-based educational experience that internet technology enables. You are part of the community who will help edX achieve this goal.")}

      -

      ${_("EdX depends upon your motivation to learn the material and to do so with honesty. In order to participate in edX, you must agree to the Honor Code below and any additional terms specific to a class. This Honor Code, and any additional terms, will be posted on each class website.")}

      +

      ${_("By enrolling in a course on {edX}, you are joining a special worldwide community of learners. The aspiration of {edX} is to provide anyone in the world who has the motivation and ability to engage coursework from the {MIT_long}, {Harvard_long} and the {Berkeley_long} the opportunity to attain the best {MIT}, {Harvard} and {Berkeley}-based educational experience that internet technology enables. You are part of the community who will help {edX} achieve this goal.").format(edX="edX", MIT_long="Massachusetts Institute of Technology", Harvard_long="Harvard University", Berkeley_long="University of California, Berkeley", MIT="MIT", Harvard="Harvard", Berkeley="UC Berkeley")}

      +

      ${_("{EdX} depends upon your motivation to learn the material and to do so with honesty. In order to participate in {edX}, you must agree to the Honor Code below and any additional terms specific to a class. This Honor Code, and any additional terms, will be posted on each class website.").format(edX="edX", EdX="EdX")}

      -

      ${_("edX Honor Code Pledge")}

      -

      ${_("By enrolling in an edX course, I agree that I will:")}

      +

      ${_("{edX} Honor Code Pledge").format(edX="edX")}

      +

      ${_("By enrolling in an {edX} course, I agree that I will:").format(edX="edX")}

      • ${_("Complete all mid-terms and final exams with my own work and only my own work. I will not submit the work of any other person.")}
      • ${_("Maintain only one user account and not let anyone else use my username and/or password.")}
      • ${_("Not engage in any activity that would dishonestly improve my results, or improve or hurt the results of others.")}
      • ${_("Not post answers to problems that are being used to assess student performance.")}
      -

      ${_("Unless otherwise indicated by the instructor of an edX course, learners on edX are encouraged to:")}

      +

      ${_("Unless otherwise indicated by the instructor of an {edX} course, learners on {edX} are encouraged to:").format(edX="edX")}

      • ${_("Collaborate with others on the lecture videos, exercises, homework and labs.")}
      • ${_("Discuss with others general concepts and materials in each course.")}
        • -
      • ${_("Present ideas and written work to fellow edX learners or others for comment or criticism.")}
        • +
      • ${_("Present ideas and written work to fellow {edX} learners or others for comment or criticism.").format(edX="edX")}
      diff --git a/lms/templates/static_templates/media-kit.html b/lms/templates/static_templates/media-kit.html index 3c7ef00c38..9b77d679ee 100644 --- a/lms/templates/static_templates/media-kit.html +++ b/lms/templates/static_templates/media-kit.html @@ -2,27 +2,27 @@ <%namespace name='static' file='../static_content.html'/> <%inherit file="../main.html" /> -<%block name="title">${_("edX Media Kit")} +<%block name="title">${_("{edX} Media Kit").format(edX="edX")}
      -

      ${_("edX Media Kit")}

      +

      ${_("{edX} Media Kit").format(edX="edX")}

      -

      ${_("Welcome to the edX Media Kit")}

      +

      ${_("Welcome to the {edX} Media Kit").format(edX="edX")}

      -

      ${_("Need images for a news story? Feel free to download high-resolution versions of the photos below by clicking on the thumbnail. Please credit edX in your use.")}

      -

      ${_("We\'ve included visual guidelines on how to use the edX logo within the download zip which also includes Adobe Illustrator and eps versions of the logo. ")}

      -

      ${_("For more information about edX, please contact Dan O'Connell Associate Director of Communications via oconnell@edx.org.")}

      +

      ${_("Need images for a news story? Feel free to download high-resolution versions of the photos below by clicking on the thumbnail. Please credit {edX} in your use.").format(edX="edX")}

      +

      ${_("We\'ve included visual guidelines on how to use the {edX} logo within the download zip which also includes Adobe Illustrator and eps versions of the logo. ").format(edX="edX")}

      +

      ${_("For more information about {edX}, please contact {dan_oconnell}, Associate Director of Communications via oconnell@edx.org.").format(dan_oconnell="Dan O'Connell", edX="edX")}

      ${_('edX Fields')}
      ${_('{platform_name} Fields').format(platform_name=settings.PLATFORM_NAME)}
      ${name}
      ${field | h}