Merge pull request #11893 from edx/dan-f/make-cms-activation_invalid-safe

Make CMS activation_invalid template safe by default

cms/templates/activation_invalid.html

-<%! from django.utils.translation import ugettext as _ %>
+<%!
+from openedx.core.djangolib.markup import HTML, Text
+from django.utils.translation import ugettext as _
+%>
+<%page expression_filter="h"/>
 <%inherit file="base.html" />
 
 <%block name="content">
 <div class="wrapper-mast wrapper sr">
   <header class="mast">
-    <h1 class="page-header">${_("{studio_name} Account Activation").format(studio_name=settings.STUDIO_SHORT_NAME)}</h1>
+    <h1 class="page-header">
+      ${_("{studio_name} Account Activation").format(
+        studio_name=Text(settings.STUDIO_SHORT_NAME)
+      )}
+    </h1>
   </header>
 </div>
 
@@ -18,10 +26,14 @@
         <h1 class="title">${_("Your account activation is invalid")}</h1>
         <div class="copy">
           <p>${_("We're sorry. Something went wrong with your activation. Check to make sure the URL you went to was correct, as e-mail programs will sometimes split it into two lines.")}</p>
-          <p>${_("If you still have issues, contact {platform_name} Support. In the meantime, you can also return to {link_start}the {studio_name} homepage.{link_end}").format(
-              platform_name=settings.PLATFORM_NAME, studio_name=settings.STUDIO_NAME,
-              link_start='<a href="/">', link_end="</a>"
-            )}</p>
+          <p>
+            ${_("If you still have issues, contact {platform_name} Support. In the meantime, you can also return to {link_start}the {studio_name} homepage.{link_end}").format(
+              platform_name=Text(settings.PLATFORM_NAME),
+              studio_name=Text(settings.STUDIO_NAME),
+              link_start=HTML('<a href="/">'),
+              link_end=HTML('</a>')
+            )}
+          </p>
         </div>
       </div>
     </div>