diff --git a/lms/templates/contact.html b/lms/templates/contact.html index c23e74c19a..4b73900806 100644 --- a/lms/templates/contact.html +++ b/lms/templates/contact.html @@ -21,21 +21,34 @@

${_("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 {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='', - fb_link_end='' - )}

+

+ ${_('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='{0}'.format(settings.CONTACT_EMAIL), + faq_link_start=''.format(url=reverse('faq_edx')), + faq_link_end='', + fb_link_start='', + fb_link_end='' + )} +

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

-

${_('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 - )}

+

+ ${_('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='{0}'.format(settings.TECH_SUPPORT_EMAIL), + bug_email='{0}'.format(settings.BUGS_EMAIL), + platform_name=settings.PLATFORM_NAME + )} +

${_("Media")}

${_('Please visit our {link_start}media/press page{link_end} for more information. For any media or press inquiries, please email {email}.').format( @@ -45,7 +58,12 @@ )}

${_("Universities")}

-

${_('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")}

+

+ ${_('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=settings.PLATFORM_NAME + )} +

diff --git a/lms/templates/courseware/courseware-error.html b/lms/templates/courseware/courseware-error.html index 843c7122ab..38754aeeb4 100644 --- a/lms/templates/courseware/courseware-error.html +++ b/lms/templates/courseware/courseware-error.html @@ -13,7 +13,16 @@
-

${_('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)}

+

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

+

+ ${_("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='{0}'.format(settings.TECH_SUPPORT_EMAIL) + )} +

diff --git a/lms/templates/module-error.html b/lms/templates/module-error.html index f43db37dfc..4d2b2a8e95 100644 --- a/lms/templates/module-error.html +++ b/lms/templates/module-error.html @@ -1,8 +1,18 @@ <%! from django.utils.translation import ugettext as _ %>
-

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

-

${_("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(platform_name=settings.PLATFORM_NAME, tech_support_email=settings.TECH_SUPPORT_EMAIL)}

+

+ ${_("There has been an error on the {platform_name} servers").format( + platform_name="{}".format(settings.PLATFORM_NAME) + )} +

+

+ ${_("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="{0}".format(settings.TECH_SUPPORT_EMAIL) + )} +

% if staff_access:

${_("Details")}

diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html index f846dc7ea2..569f6ea722 100644 --- a/lms/templates/signup_modal.html +++ b/lms/templates/signup_modal.html @@ -20,7 +20,11 @@
-

${_('Sign Up for {span_start}{platform_name}{span_end}').format(span_start='', span_end='', platform_name=settings.PLATFORM_NAME)}

+

+ ${_('Sign Up for {platform_name}').format( + platform_name='{}'.format(settings.PLATFORM_NAME) + )} +

@@ -123,17 +127,17 @@
% if settings.REGISTRATION_EXTRA_FIELDS['honor_code'] != 'hidden': % endif
diff --git a/lms/templates/staff_problem_info.html b/lms/templates/staff_problem_info.html index 568db6986c..5b34569d98 100644 --- a/lms/templates/staff_problem_info.html +++ b/lms/templates/staff_problem_info.html @@ -35,7 +35,7 @@ ${block_content} - ${_('Optional tag (eg "done" or "broken"):  ')} + ${_('Optional tag (eg "done" or "broken"):') + '  '}
diff --git a/lms/templates/static_templates/server-down.html b/lms/templates/static_templates/server-down.html index da0299a359..528e76ed94 100644 --- a/lms/templates/static_templates/server-down.html +++ b/lms/templates/static_templates/server-down.html @@ -2,6 +2,14 @@ <%inherit file="../main.html" />
-

${_("Currently the {platform_name} servers are down").format(platform_name=settings.PLATFORM_NAME)}

-

${_("Our staff is currently working to get the site back up as soon as possible. Please email us at {tech_support_email} to report any problems or downtime.").format(settings.TECH_SUPPORT_EMAIL)}

+

+ ${_("Currently the {platform_name} servers are down").format( + platform_name="{}".format(settings.PLATFORM_NAME) + )} +

+

+ ${_("Our staff is currently working to get the site back up as soon as possible. " + "Please email us at {tech_support_email} to report any problems or downtime.").format( + tech_support_email="{0}".format(settings.TECH_SUPPORT_EMAIL) + )}

diff --git a/lms/templates/static_templates/server-error.html b/lms/templates/static_templates/server-error.html index 8b48a0480f..ee0fd2db92 100644 --- a/lms/templates/static_templates/server-error.html +++ b/lms/templates/static_templates/server-error.html @@ -2,8 +2,8 @@ <%inherit file="../main.html" />
-

${_(u"There has been a 500 error on the {platform_name} servers").format( - platform_name=settings.PLATFORM_NAME +

${_(u"There has been a 500 error on the {platform_name} servers").format( + platform_name="{}".format(platform_name=settings.PLATFORM_NAME) )}

${_(u'Please wait a few seconds and then reload the page. If the problem persists, please email us at {email}.').format( email=u'{email}'.format( diff --git a/lms/templates/static_templates/server-overloaded.html b/lms/templates/static_templates/server-overloaded.html index 05a25f228c..76593ecb0f 100644 --- a/lms/templates/static_templates/server-overloaded.html +++ b/lms/templates/static_templates/server-overloaded.html @@ -2,6 +2,15 @@ <%inherit file="../main.html" />

-

${_("Currently the {platform_name} servers are overloaded").format(platform_name=settings.PLATFORM_NAME)}

-

${_("Our staff is currently working to get the site back up 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)}

+

+ ${_("Currently the {platform_name} servers are overloaded").format( + platform_name="{}".format(platform_name=settings.PLATFORM_NAME) + )} +

+

+ ${_("Our staff is currently working to get the site back up as soon as possible. " + "Please email us at {tech_support_email} to report any problems or downtime.").format( + tech_support_email="{0}".format(tech_support_email=settings.TECH_SUPPORT_EMAIL) + )} +

diff --git a/lms/templates/verify_student/midcourse_reverify_dash.html b/lms/templates/verify_student/midcourse_reverify_dash.html index 44aceb928e..3bed7ef7d3 100644 --- a/lms/templates/verify_student/midcourse_reverify_dash.html +++ b/lms/templates/verify_student/midcourse_reverify_dash.html @@ -25,8 +25,7 @@

${item.course_name} (${item.course_number})

${_('Re-verify by {date}').format(date="" + item.date + "")}

-

- ${_("Re-verify for {course_number}").format(course_number=${item.course_number})}

+

Re-verify for ${item.course_number}

% endfor @@ -43,8 +42,7 @@

${item.course_name} (${item.course_number})

${_('Re-verify by {date}').format(date="" + item.date + "")}

-

- ${_("Re-verify for {course_number}").format(course_number=${item.course_number})}

+

Re-verify for ${item.course_number}

% endfor @@ -96,13 +94,13 @@ % endif % if reverifications["must_reverify"]: -

${_("Don't want to re-verify right now? ") + "{a_start}{text}{a_end}".format( +

${_("Don't want to re-verify right now?") + u" {a_start}{text}{a_end}".format( text=_("Return to where you left off"), a_start=''.format(url=referer), a_end="", )}

% else: -

${"{a_start}{text}{a_end}".format( +

${u"{a_start}{text}{a_end}".format( text=_("Return to where you left off"), a_start=''.format(url=referer), a_end="",