diff --git a/lms/djangoapps/static_template_view/tests/test_views.py b/lms/djangoapps/static_template_view/tests/test_views.py index 749fcd4abf363ad958e8103c4e72b9d7ca29b495..5b10380b97142de8ea348d3e91b6fad182a4e915 100644 --- a/lms/djangoapps/static_template_view/tests/test_views.py +++ b/lms/djangoapps/static_template_view/tests/test_views.py @@ -71,8 +71,6 @@ class MarketingSiteViewTests(TestCase): resp = self.client.get(url) self.assertEqual(resp.status_code, 200) self.assertEqual(resp['Content-Type'], 'text/html') - resp = self.client.get(url) - self.assertContains(resp, settings.TECH_SUPPORT_EMAIL) def test_500(self): """ @@ -92,4 +90,3 @@ class MarketingSiteViewTests(TestCase): ), status_code=500 ) - self.assertContains(resp, settings.TECH_SUPPORT_EMAIL, status_code=500) diff --git a/lms/templates/courseware/error-message.html b/lms/templates/courseware/error-message.html index 3f88d93d1009108fbe8600a227b0cfbdc2286643..dc7497448796b2aefcc893a112b796d52c869284 100644 --- a/lms/templates/courseware/error-message.html +++ b/lms/templates/courseware/error-message.html @@ -8,4 +8,5 @@ from openedx.core.djangolib.markup import HTML, Text <% tech_support_email=HTML('<a href=\"mailto:{tech_support_email}\">{tech_support_email}</a>').format(tech_support_email=static.get_tech_support_email_address()) %> -<p>${Text(_("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=tech_support_email)}</p> +<p>${Text(_("We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible."))}</p> + diff --git a/lms/templates/static_templates/404.html b/lms/templates/static_templates/404.html index 28c01904bbd95ae448164425510684607ebfa8aa..6e0ad2268b98e931c3c699d850a3e2634c71d81c 100644 --- a/lms/templates/static_templates/404.html +++ b/lms/templates/static_templates/404.html @@ -18,10 +18,9 @@ from openedx.core.djangolib.markup import HTML, Text % if page_content: ${page_content} % else: - ${Text(_('The page that you were looking for was not found. Go back to the {link_start}homepage{link_end} or let us know about any pages that may have been moved at {email}.')).format( + ${Text(_('The page that you were looking for was not found. Go back to the {link_start}homepage{link_end} .')).format( link_start=HTML('<a href="/">'), - link_end=HTML('</a>'), - email=HTML('<a href="mailto:{email}">{email}</a>').format(email=Text(static.get_tech_support_email_address())) + link_end=HTML('</a>') )} % endif </%block> diff --git a/lms/templates/static_templates/server-down.html b/lms/templates/static_templates/server-down.html index 982bb1ea1935eb31514762b468f0c06485e68520..1bfb1b27bb601f968369f4e49c846f9fd749b60c 100644 --- a/lms/templates/static_templates/server-down.html +++ b/lms/templates/static_templates/server-down.html @@ -24,10 +24,7 @@ from openedx.core.djangolib.markup import HTML, Text % if page_content: ${page_content} % else: - ${Text(_("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=HTML('<a href="mailto:{0}">{0}</a>').format(Text(static.get_tech_support_email_address())) - )} + ${Text(_("Our staff is currently working to get the site back up as soon as possible. "))} % endif </%block> </p> diff --git a/lms/templates/static_templates/server-error.html b/lms/templates/static_templates/server-error.html index 4a022d931b6a77f5bc664d9d494aece5efa4396b..89e7b99b7a6127308c0960b2ff02536681547b23 100644 --- a/lms/templates/static_templates/server-error.html +++ b/lms/templates/static_templates/server-error.html @@ -24,11 +24,7 @@ from openedx.core.djangolib.markup import HTML, Text % if page_content: ${page_content} % else: - ${Text(_('Please wait a few seconds and then reload the page. If the problem persists, please email us at {email}.')).format( - email=HTML('<a href="mailto:{email}">{email}</a>').format( - email=Text(static.get_tech_support_email_address()) - ) - )} + ${Text(_('Please wait a few seconds and then reload the page.'))} % endif </%block> </p> diff --git a/lms/templates/static_templates/server-overloaded.html b/lms/templates/static_templates/server-overloaded.html index 0b5d9c00bb10546b86ba185999252aec7d559d14..4511e6b4df991760e313cfcbd96cc292d2b0f2d1 100644 --- a/lms/templates/static_templates/server-overloaded.html +++ b/lms/templates/static_templates/server-overloaded.html @@ -20,14 +20,11 @@ from openedx.core.djangolib.markup import HTML, Text </%block> </h1> <p> - <%block name="pagecontent"> + <%block name="pagecontent"> % if page_content: ${page_content} % else: - ${Text(_("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=HTML('<a href="mailto:{0}">{0}</a>').format(tech_support_email=Text(static.get_tech_support_email_address())) - )} + ${Text(_("Our staff is currently working to get the site back up as soon as possible. "))} % endif </%block> </p>