Commit f6a70d49 by Sarina Canelake

Merge pull request #7511 from louyihua/fix-studio-name

Fix error when STUDIO_NAME uses non-ascii characters
parents 41d7d52b 9d3b6528
......@@ -199,6 +199,7 @@ LOGGING = get_logger_config(LOG_DIR,
#theming start:
PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', 'edX')
STUDIO_NAME = ENV_TOKENS.get('STUDIO_NAME', 'edX Studio')
STUDIO_SHORT_NAME = ENV_TOKENS.get('STUDIO_SHORT_NAME', 'Studio')
TENDER_DOMAIN = ENV_TOKENS.get('TENDER_DOMAIN', TENDER_DOMAIN)
TENDER_SUBDOMAIN = ENV_TOKENS.get('TENDER_SUBDOMAIN', TENDER_SUBDOMAIN)
......
......@@ -9,7 +9,7 @@
<header>
<h1 class="title title-1">
${_("The {studio_name} servers encountered an error").format(
studio_name="<em>{studio_name}</em>".format(studio_name=settings.STUDIO_SHORT_NAME)
studio_name=u"<em>{studio_name}</em>".format(studio_name=settings.STUDIO_SHORT_NAME)
)}
</h1>
</header>
......
......@@ -16,7 +16,7 @@
<header>
## "edX Studio" should not be translated
<h1><span class="wrapper-text-welcome">${_("Welcome to {studio_name}").format(
studio_name='</span><span class="logo">{studio_name}</span>'.format(
studio_name=u'</span><span class="logo">{studio_name}</span>'.format(
studio_name=settings.STUDIO_NAME
)
)}</h1>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment