Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12357 from edx/ned/registered-trademark

Browse Source 
Add a circle-R to the initial welcome message
This commit is contained in:
Ned Batchelder
2016-05-04 17:41:41 -04:00
parent 8127158e2a 16fbad3f56
commit ff9e9d8bcf
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/test/acceptance/pages/lms/index.py
View File

@@ -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):

11
lms/templates/index.html
View File

@@ -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>