From 533ef0d20e4e829acd4f2f581bbdf627b0b826e7 Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Mon, 28 Dec 2020 17:11:27 +0500 Subject: [PATCH] PROD-2248 --- .../templates/static_templates/contact.html | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/common/test/test_sites/test_site/templates/static_templates/contact.html b/common/test/test_sites/test_site/templates/static_templates/contact.html index 3cd9120e9a..1eec8a2d29 100644 --- a/common/test/test_sites/test_site/templates/static_templates/contact.html +++ b/common/test/test_sites/test_site/templates/static_templates/contact.html @@ -4,6 +4,8 @@ <%! from django.utils.translation import ugettext as _ from django.urls import reverse + +from openedx.core.djangolib.markup import HTML, Text %> <%block name="title">${_("Contact {platform_name}").format(platform_name=settings.PLATFORM_NAME)} @@ -25,39 +27,40 @@ from django.urls import reverse

${_("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 {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( +

${Text(_('If you have a general question about {platform_name} 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( platform_name=settings.PLATFORM_NAME, - email='{contact_email}'.format(contact_email=settings.CONTACT_EMAIL), - faq_link_start=''.format(url=reverse('faq_edx')), - faq_link_end='', - fb_link_start='', - fb_link_end='' + email=HTML('{contact_email}').format(contact_email=settings.CONTACT_EMAIL), + faq_link_start=HTML('').format(url=reverse('faq_edx')), + faq_link_end=HTML(''), + fb_link_start=HTML(''), + fb_link_end=HTML('') )}

${_("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: {bug_email}.').format( +

${Text(_('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: {bug_email}.')).format( platform_name=settings.PLATFORM_NAME, - tech_email='{tech_support_email}'.format(tech_support_email=settings.TECH_SUPPORT_EMAIL), - bug_email='{bugs_email}'.format(bugs_email=settings.BUGS_EMAIL) + tech_email=HTML('{tech_support_email}').format(tech_support_email=settings.TECH_SUPPORT_EMAIL), + bug_email=HTML('{bugs_email}').format(bugs_email=settings.BUGS_EMAIL) )}

${_("Media")}

-

${_('Please visit our {link_start}media/press page{link_end} for more information. For any media or press inquiries, please email {email}.').format( - link_start=''.format(url=reverse('faq_edx')), - link_end='', - email='{email}'.format(email="press@edx.org"), +

${Text(_('Please visit our {link_start}media/press page{link_end} for more information. For any media or press inquiries, please email {email}.')).format( + link_start=HTML('').format(url=reverse('faq_edx')), + link_end=HTML(''), + email=HTML('{email}').format(email="press@edx.org"), )}

${_("Universities")}

-

${_('If you are a university wishing to collaborate or you have questions about {platform_name}, please email {email}.'.format( +

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

+ )}

${_("Accessibility")}

-

${_('{platform_name} strives to create an innovative online-learning platform that promotes accessibility for everyone, including students with disabilities. We are dedicated to improving the accessibility of the platform and welcome your comments or questions at {email}.'.format(platform_name="EdX", email='{email}'.format(email="accessibility@edx.org")))}

+

${Text(_('{platform_name} strives to create an innovative online-learning platform that promotes accessibility for everyone, including students with disabilities. We are dedicated to improving the accessibility of the platform and welcome your comments or questions at {email}.')).format( + platform_name="EdX", email=HTML('{email}').format(email="accessibility@edx.org"))}