From 16fbad3f56abe6234ee07c4bc253c19c7fe31274 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Wed, 4 May 2016 11:09:42 -0400
Subject: [PATCH] Add a circle-R to the initial welcome message

---
 common/test/acceptance/pages/lms/index.py |  2 +-
 lms/templates/index.html                  | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/test/acceptance/pages/lms/index.py b/common/test/acceptance/pages/lms/index.py
index cd0ce4b9e1..7c9633f02f 100644
--- a/common/test/acceptance/pages/lms/index.py
+++ b/common/test/acceptance/pages/lms/index.py
@@ -29,7 +29,7 @@ class IndexPage(PageObject):
         Returns a browser query object representing the video modal element
         """
         element = self.q(css=BANNER_SELECTOR)
-        return element.visible and element.text[0] == "Welcome to the Open edX platform!"
+        return element.visible and element.text[0].startswith("Welcome to the Open edX")
 
     @property
     def banner_element(self):
diff --git a/lms/templates/index.html b/lms/templates/index.html
index d34d9eae44..c69f78a26d 100644
--- a/lms/templates/index.html
+++ b/lms/templates/index.html
@@ -1,8 +1,11 @@
+<%page expression_filter="h"/>
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
 <%!
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
+
+from openedx.core.djangolib.markup import Text, HTML
 %>
 
 <main id="main" aria-label="Content" tabindex="-1">
@@ -12,11 +15,11 @@ from django.core.urlresolvers import reverse
           <div class="title">
             <div class="heading-group">
               % if homepage_overlay_html:
-                ${homepage_overlay_html}
+                ${homepage_overlay_html|n}
               % else:
-                  ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information.
-                  <h1>${_("Welcome to the Open edX platform!")}</h1>
-                  ## Translators: 'Open edX' is a brand, please keep this untranslated. See http://openedx.org for more information.
+                  ## Translators: 'Open edX' is a registered trademark, please keep this untranslated. See http://open.edx.org for more information.
+                  <h1>${Text(_(u"Welcome to the Open edX{registered_trademark} platform!")).format(registered_trademark=HTML("<sup style='font-size: 65%'>&reg;</sup>"))}</h1>
+                  ## Translators: 'Open edX' is a registered trademark, please keep this untranslated. See http://open.edx.org for more information.
                   <p>${_("It works! This is the default homepage for this Open edX instance.")}</p>
               % endif
             </div>