Commit 9d3b6528 by louyihua

Fix error when STUDIO_NAME uses non-ascii characters

The replacement strings need to be unicode, so that when STUDIO_NAME contains non-ascii characters python can handle it correctly without raising exceptions.
Also, the value of STUDIO_SHORT_NAME can be read from cms.env.json.
parent dad4b673
...@@ -199,6 +199,7 @@ LOGGING = get_logger_config(LOG_DIR, ...@@ -199,6 +199,7 @@ LOGGING = get_logger_config(LOG_DIR,
#theming start: #theming start:
PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', 'edX') PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', 'edX')
STUDIO_NAME = ENV_TOKENS.get('STUDIO_NAME', 'edX Studio') 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_DOMAIN = ENV_TOKENS.get('TENDER_DOMAIN', TENDER_DOMAIN)
TENDER_SUBDOMAIN = ENV_TOKENS.get('TENDER_SUBDOMAIN', TENDER_SUBDOMAIN) TENDER_SUBDOMAIN = ENV_TOKENS.get('TENDER_SUBDOMAIN', TENDER_SUBDOMAIN)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<header> <header>
<h1 class="title title-1"> <h1 class="title title-1">
${_("The {studio_name} servers encountered an error").format( ${_("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> </h1>
</header> </header>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<header> <header>
## "edX Studio" should not be translated ## "edX Studio" should not be translated
<h1><span class="wrapper-text-welcome">${_("Welcome to {studio_name}").format( <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 studio_name=settings.STUDIO_NAME
) )
)}</h1> )}</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