From 34c64155271268204c0376a2272abe2b9b6ed676 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Tue, 23 Dec 2014 11:14:56 -0500
Subject: [PATCH] Use STUDIO_SHORT_NAME for Studio

STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
---
 cms/envs/common.py                            |  5 +++-
 cms/templates/500.html                        |  6 ++---
 cms/templates/activation_active.html          |  4 +--
 cms/templates/activation_complete.html        |  4 +--
 cms/templates/activation_invalid.html         |  2 +-
 cms/templates/checklists.html                 |  2 +-
 .../emails/course_creator_admin_subject.txt   |  2 +-
 .../course_creator_admin_user_pending.txt     |  2 +-
 cms/templates/error.html                      |  4 +--
 cms/templates/export.html                     |  4 +--
 cms/templates/howitworks.html                 | 26 +++++++++----------
 cms/templates/import.html                     |  2 +-
 cms/templates/index.html                      | 12 ++++-----
 cms/templates/login.html                      |  4 +--
 cms/templates/manage_users.html               |  2 +-
 cms/templates/register.html                   | 10 +++----
 cms/templates/settings_advanced.html          |  2 +-
 cms/templates/widgets/sock.html               |  4 +--
 18 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 6050e4e8533..ba3cf61b1f3 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -41,7 +41,10 @@ from dealer.git import git
 from xmodule.modulestore.edit_info import EditInfoMixin
 
 ############################ FEATURE CONFIGURATION #############################
-STUDIO_NAME = "{platform_name} Studio".format(platform_name=PLATFORM_NAME)
+STUDIO_SHORT_NAME = "Studio"
+STUDIO_NAME = "{platform_name} {short_name}".format(
+    platform_name=PLATFORM_NAME, short_name=STUDIO_SHORT_NAME,
+)
 FEATURES = {
     'USE_DJANGO_PIPELINE': True,
 
diff --git a/cms/templates/500.html b/cms/templates/500.html
index 6cffdd40a79..bdf94a2285d 100644
--- a/cms/templates/500.html
+++ b/cms/templates/500.html
@@ -1,6 +1,6 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="base.html" />
-<%block name="title">${_("{studio_name} Server Error").format(studio_name=settings.STUDIO_NAME)}</%block>
+<%block name="title">${_("{studio_name} Server Error").format(studio_name=settings.STUDIO_SHORT_NAME)}</%block>
 <%block name="bodyclass">view-util util-500</%block>
 
 <%block name="content">
@@ -9,13 +9,13 @@
     <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_NAME)
+          studio_name="<em>{studio_name}</em>".format(studio_name=settings.STUDIO_SHORT_NAME)
         )}
       </h1>
     </header>
     <article class="content-primary" role="main">
       <p>
-        ${_("An error occurred in {studio_name} and the page could not be loaded. Please try again in a few moments.").format(studio_name=settings.STUDIO_NAME)}
+        ${_("An error occurred in {studio_name} and the page could not be loaded. Please try again in a few moments.").format(studio_name=settings.STUDIO_SHORT_NAME)}
         ${_("We've logged the error and our staff is currently working to resolve this error as soon as possible.")}
         ${_('If the problem persists, please email us at {email_link}.').format(
               email_link=u'<a href="mailto:{email_address}">{email_address}</a>'.format(
diff --git a/cms/templates/activation_active.html b/cms/templates/activation_active.html
index 0882271a9fc..0ddeb185f95 100644
--- a/cms/templates/activation_active.html
+++ b/cms/templates/activation_active.html
@@ -5,7 +5,7 @@
 <div class="wrapper-mast wrapper sr">
   <header class="mast">
     <h1 class="page-header">
-      ${_("{studio_name} Account Activation").format(studio_name=settings.STUDIO_NAME)}
+      ${_("{studio_name} Account Activation").format(studio_name=settings.STUDIO_SHORT_NAME)}
     </h1>
   </header>
 </div>
@@ -26,7 +26,7 @@
       <ul class="list-actions">
         <li class="action-item">
           <a href="/signin" class="action-primary action-signin">
-            ${_("Sign into {studio_name}").format(platform_name=settings.STUDIO_NAME)}
+            ${_("Sign into {studio_name}").format(platform_name=settings.STUDIO_SHORT_NAME)}
           </a>
         </li>
       </ul>
diff --git a/cms/templates/activation_complete.html b/cms/templates/activation_complete.html
index e2dbad0a3d0..135f15764d6 100644
--- a/cms/templates/activation_complete.html
+++ b/cms/templates/activation_complete.html
@@ -4,7 +4,7 @@
 <%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_NAME)}</h1>
+    <h1 class="page-header">${_("{studio_name} Account Activation").format(studio_name=settings.STUDIO_SHORT_NAME)}</h1>
   </header>
 </div>
 
@@ -24,7 +24,7 @@
       <ul class="list-actions">
         <li class="action-item">
           <a href="/signin" class="action-primary action-signin">
-            ${_("Sign into {studio_name}").format(studio_name=settings.STUDIO_NAME)}
+            ${_("Sign into {studio_name}").format(studio_name=settings.STUDIO_SHORT_NAME)}
           </a>
         </li>
       </ul>
diff --git a/cms/templates/activation_invalid.html b/cms/templates/activation_invalid.html
index 3c3d345732f..585293e75b5 100644
--- a/cms/templates/activation_invalid.html
+++ b/cms/templates/activation_invalid.html
@@ -4,7 +4,7 @@
 <%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_NAME)}</h1>
+    <h1 class="page-header">${_("{studio_name} Account Activation").format(studio_name=settings.STUDIO_SHORT_NAME)}</h1>
   </header>
 </div>
 
diff --git a/cms/templates/checklists.html b/cms/templates/checklists.html
index e721c634295..db59bd7e2ad 100644
--- a/cms/templates/checklists.html
+++ b/cms/templates/checklists.html
@@ -54,7 +54,7 @@
       </div>
 
       <div class="bit">
-        <h3 class="title title-3">${_("{studio_name} checklists").format(studio_name=settings.STUDIO_NAME)}</h3>
+        <h3 class="title title-3">${_("{studio_name} checklists").format(studio_name=settings.STUDIO_SHORT_NAME)}</h3>
         <nav class="nav-page checklists-current">
           <ol>
             % for checklist in checklists:
diff --git a/cms/templates/emails/course_creator_admin_subject.txt b/cms/templates/emails/course_creator_admin_subject.txt
index 5af6bc77ba4..007263708ad 100644
--- a/cms/templates/emails/course_creator_admin_subject.txt
+++ b/cms/templates/emails/course_creator_admin_subject.txt
@@ -1,4 +1,4 @@
 <%! from django.utils.translation import ugettext as _ %>
 ${_("{email} has requested {studio_name} course creator privileges on edge").format(
-    email=user_email, studio_name=settings.STUDIO_NAME,
+    email=user_email, studio_name=settings.STUDIO_SHORT_NAME,
 )}
\ No newline at end of file
diff --git a/cms/templates/emails/course_creator_admin_user_pending.txt b/cms/templates/emails/course_creator_admin_user_pending.txt
index 3f7633dd83d..a26591e6d57 100644
--- a/cms/templates/emails/course_creator_admin_user_pending.txt
+++ b/cms/templates/emails/course_creator_admin_user_pending.txt
@@ -1,6 +1,6 @@
 <%! from django.utils.translation import ugettext as _ %>
 ${_("User '{user}' with e-mail {email} has requested {studio_name} course creator privileges on edge.").format(
-    user=user_name, email=user_email, studio_name=settings.STUDIO_NAME,
+    user=user_name, email=user_email, studio_name=settings.STUDIO_SHORT_NAME,
 )}
 ${_("To grant or deny this request, use the course creator admin table.")}
 
diff --git a/cms/templates/error.html b/cms/templates/error.html
index 04238aba17e..2b183f1c53d 100644
--- a/cms/templates/error.html
+++ b/cms/templates/error.html
@@ -15,14 +15,14 @@
     % if error == '404':
       <h1>${_("The Page You Requested Page Cannot be Found")}</h1>
       <p class="description">${_("We're sorry. We couldn't find the {studio_name} page you're looking for. You may want to return to the {studio_name} Dashboard and try again. If you are still having problems accessing things, please feel free to {link_start}contact {studio_name} support{link_end} for further help.").format(
-          studio_name=settings.STUDIO_NAME,
+          studio_name=settings.STUDIO_SHORT_NAME,
           link_start='<a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="{title}">'.format(title=_("Use our feedback tool, Tender, to share your feedback")),
           link_end='</a>',
         )}</p>
     % elif error == '500':
       <h1>${_("The Server Encountered an Error")}</h1>
       <p class="description">${_("We're sorry. There was a problem with the server while trying to process your last request. You may want to return to the {studio_name} Dashboard or try this request again. If you are still having problems accessing things, please feel free to {link_start}contact {studio_name} support{link_end} for further help.").format(
-          studio_name=settings.STUDIO_NAME,
+          studio_name=settings.STUDIO_SHORT_NAME,
           link_start='<a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="{title}">'.format(title=_("Use our feedback tool, Tender, to share your feedback")),
           link_end='</a>',
         )}</p>
diff --git a/cms/templates/export.html b/cms/templates/export.html
index b39e7395bea..019dc3ac6b1 100644
--- a/cms/templates/export.html
+++ b/cms/templates/export.html
@@ -41,7 +41,7 @@
         <div class="copy">
           ## Translators: ".tar.gz" is a file extension, and should not be translated
           <p>${_("You can export courses and edit them outside of {studio_name}. The exported file is a .tar.gz file (that is, a .tar file compressed with GNU Zip) that contains the course structure and content. You can also re-import courses that you've exported.").format(
-            studio_name=settings.STUDIO_NAME, em_start='<strong>', em_end="</strong>"
+            studio_name=settings.STUDIO_SHORT_NAME, em_start='<strong>', em_end="</strong>"
           )}</p>
           <p>${_("{em_start}Caution:{em_end} When you export a course, information such as MATLAB API keys, LTI passports, annotation secret token strings, and annotation storage URLs are included in the exported data. If you share your exported files, you may also be sharing sensitive or license-specific information.").format(em_start='<strong>', em_end="</strong>")}</p>
         </div>
@@ -90,7 +90,7 @@
       <div class="bit">
         <h3 class="title-3">${_("Why export a course?")}</h3>
         <p>${_("You may want to edit the XML in your course directly, outside of {studio_name}. You may want to create a backup copy of your course. Or, you may want to create a copy of your course that you can later import into another course instance and customize.").format(
-            studio_name=settings.STUDIO_NAME,
+            studio_name=settings.STUDIO_SHORT_NAME,
           )}</p>
       </div>
 
diff --git a/cms/templates/howitworks.html b/cms/templates/howitworks.html
index 5f2dfb049bf..b567e1846aa 100644
--- a/cms/templates/howitworks.html
+++ b/cms/templates/howitworks.html
@@ -21,7 +21,7 @@
         )
       )}</h1>
       <p class="tagline">${_("{studio_name} helps manage your online courses, so you can focus on teaching them").format(
-        studio_name=settings.STUDIO_NAME
+        studio_name=settings.STUDIO_SHORT_NAME
       )}</p>
     </header>
   </section>
@@ -30,14 +30,14 @@
 <div class="wrapper-content-features wrapper">
   <section class="content content-features">
     <header>
-      <h2 class="sr">${_("{studio_name}'s Many Features").format(studio_name=settings.STUDIO_NAME)}</h2>
+      <h2 class="sr">${_("{studio_name}'s Many Features").format(studio_name=settings.STUDIO_SHORT_NAME)}</h2>
     </header>
 
     <ol class="list-features">
       <li class="feature">
         <figure class="img zoom">
           <a rel="modal" href="#hiw-feature1">
-            <img src="${static.url("images/thumb-hiw-feature1.png")}" alt="${_('{studio_name} Helps You Keep Your Courses Organized').format(studio_name=settings.STUDIO_NAME)}" />
+            <img src="${static.url("images/thumb-hiw-feature1.png")}" alt="${_('{studio_name} Helps You Keep Your Courses Organized').format(studio_name=settings.STUDIO_SHORT_NAME)}" />
             <figcaption class="sr">${_("{studio_name} Helps You Keep Your Courses Organized").format(studio_name=settings.STUDIO_NAME)}</figcaption>
             <span class="action-zoom">
               <i class="icon-zoom-in"></i>
@@ -47,12 +47,12 @@
 
         <div class="copy">
           <h3>${_("Keeping Your Course Organized")}</h3>
-          <p>${_("The backbone of your course is how it is organized. {studio_name} offers an <strong>Outline</strong> editor, providing a simple hierarchy and easy drag and drop to help you and your students stay organized.").format(studio_name=settings.STUDIO_NAME)}</p>
+          <p>${_("The backbone of your course is how it is organized. {studio_name} offers an <strong>Outline</strong> editor, providing a simple hierarchy and easy drag and drop to help you and your students stay organized.").format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
 
           <ul class="list-proofpoints">
             <li class="proofpoint">
               <h4 class="title">${_("Simple Organization For Content")}</h4>
-              <p>${_("{studio_name} uses a simple hierarchy of <strong>sections</strong> and <strong>subsections</strong> to organize your content.").format(studio_name=settings.STUDIO_NAME)}</p>
+              <p>${_("{studio_name} uses a simple hierarchy of <strong>sections</strong> and <strong>subsections</strong> to organize your content.").format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
             </li>
 
             <li class="proofpoint">
@@ -81,7 +81,7 @@
 
         <div class="copy">
           <h3>${_("Learning is More than Just Lectures")}</h3>
-          <p>${_("{studio_name} lets you weave your content together in a way that reinforces learning. Insert videos, discussions, and a wide variety of exercises with just a few clicks.").format(studio_name=settings.STUDIO_NAME)} </p>
+          <p>${_("{studio_name} lets you weave your content together in a way that reinforces learning. Insert videos, discussions, and a wide variety of exercises with just a few clicks.").format(studio_name=settings.STUDIO_SHORT_NAME)} </p>
 
           <ul class="list-proofpoints">
             <li class="proofpoint">
@@ -105,8 +105,8 @@
       <li class="feature">
         <figure class="img zoom">
           <a rel="modal" href="#hiw-feature3">
-            <img src="${static.url("images/thumb-hiw-feature3.png")}" alt="${_('{studio_name} Gives You Simple, Fast, and Incremental Publishing. With Friends.').format(studio_name=settings.STUDIO_NAME)}" />
-            <figcaption class="sr">${_("{studio_name} Gives You Simple, Fast, and Incremental Publishing. With Friends.").format(studio_name=settings.STUDIO_NAME)}</figcaption>
+            <img src="${static.url("images/thumb-hiw-feature3.png")}" alt="${_('{studio_name} Gives You Simple, Fast, and Incremental Publishing. With Friends.').format(studio_name=settings.STUDIO_SHORT_NAME)}" />
+            <figcaption class="sr">${_("{studio_name} Gives You Simple, Fast, and Incremental Publishing. With Friends.").format(studio_name=settings.STUDIO_SHORT_NAME)}</figcaption>
             <span class="action-zoom">
               <i class="icon-zoom-in"></i>
             </span>
@@ -115,7 +115,7 @@
 
         <div class="copy">
           <h3>${_("Simple, Fast, and Incremental Publishing. With Friends.")}</h3>
-          <p>${_("{studio_name} works like web applications you already know, yet understands how you build curriculum. Instant publishing to the web when you want it, incremental release when it makes sense. And with co-authors, you can have a whole team building a course, together.").format(studio_name=settings.STUDIO_NAME)}</p>
+          <p>${_("{studio_name} works like web applications you already know, yet understands how you build curriculum. Instant publishing to the web when you want it, incremental release when it makes sense. And with co-authors, you can have a whole team building a course, together.").format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
 
           <ul class="list-proofpoints">
             <li class="proofpoint">
@@ -125,7 +125,7 @@
 
             <li class="proofpoint">
               <h4 class="title">${_("Release-On Date Publishing")}</h4>
-              <p>${_("When you've finished a <strong>section</strong>, pick when you want it to go live and {studio_name} takes care of the rest. Build your course incrementally.").format(studio_name=settings.STUDIO_NAME)}</p>
+              <p>${_("When you've finished a <strong>section</strong>, pick when you want it to go live and {studio_name} takes care of the rest. Build your course incrementally.").format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
             </li>
 
             <li class="proofpoint">
@@ -142,7 +142,7 @@
 <div class="wrapper-content-cta wrapper">
   <section class="content content-cta">
     <header>
-      <h2 class="sr">${_("Sign Up for {studio_name} Today!").format(studio_name=settings.STUDIO_NAME)}</h2>
+      <h2 class="sr">${_("Sign Up for {studio_name} Today!").format(studio_name=settings.STUDIO_SHORT_NAME)}</h2>
     </header>
 
     <ul class="list-actions">
@@ -150,7 +150,7 @@
         <a href="${reverse('signup')}" class="action action-primary">${_("Sign Up &amp; Start Making an {platform_name} Course").format(platform_name=settings.PLATFORM_NAME)}</a>
       </li>
       <li class="action-item">
-        <a href="${reverse('login')}" class="action action-secondary">${_("Already have a {studio_name} Account? Sign In").format(studio_name=settings.STUDIO_NAME)}</a>
+        <a href="${reverse('login')}" class="action action-secondary">${_("Already have a {studio_name} Account? Sign In").format(studio_name=settings.STUDIO_SHORT_NAME)}</a>
       </li>
     </ul>
   </section>
@@ -186,7 +186,7 @@
   <h3 class="title">${_("Publishing on Date")}</h3>
   <figure>
     <img src="${static.url("images/hiw-feature3.png")}" alt="" />
-    <figcaption class="description">${_("Simply set the date of a section or subsection, and {studio_name} will publish it to your students for you.").format(studio_name=settings.STUDIO_NAME)}</figcaption>
+    <figcaption class="description">${_("Simply set the date of a section or subsection, and {studio_name} will publish it to your students for you.").format(studio_name=settings.STUDIO_SHORT_NAME)}</figcaption>
   </figure>
 
   <a href="" rel="view" class="action action-modal-close">
diff --git a/cms/templates/import.html b/cms/templates/import.html
index 3b9065bcca0..3212493dcaf 100644
--- a/cms/templates/import.html
+++ b/cms/templates/import.html
@@ -130,7 +130,7 @@
     <aside class="content-supplementary" role="complementary">
       <div class="bit">
         <h3 class="title-3">${_("Why import a course?")}</h3>
-        <p>${_("You may want to run a new version of an existing course, or replace an existing course altogether. Or, you may have developed a course outside {studio_name}.").format(studio_name=settings.STUDIO_NAME)}</p>
+        <p>${_("You may want to run a new version of an existing course, or replace an existing course altogether. Or, you may have developed a course outside {studio_name}.").format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
       </div>
 
       <div class="bit">
diff --git a/cms/templates/index.html b/cms/templates/index.html
index 3d32953456a..26cc5f23313 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -44,12 +44,12 @@
 
         %if len(courses) > 0:
         <div class="copy">
-          <p>${_("Here are all of the courses you currently have access to in {studio_name}:").format(studio_name=settings.STUDIO_NAME)}</p>
+          <p>${_("Here are all of the courses you currently have access to in {studio_name}:").format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
         </div>
 
         %else:
         <div class="copy">
-          <p>${_("You currently aren't associated with any {studio_name} Courses.").format(studio_name=settings.STUDIO_NAME)}</p>
+          <p>${_("You currently aren't associated with any {studio_name} Courses.").format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
         </div>
         %endif
       </div>
@@ -252,9 +252,9 @@
       <div class="notice notice-incontext notice-instruction notice-instruction-nocourses list-notices">
         <div class="notice-item">
           <div class="msg">
-            <h3 class="title">${_("Are you staff on an existing {studio_name} course?").format(studio_name=settings.STUDIO_NAME)}</h3>
+            <h3 class="title">${_("Are you staff on an existing {studio_name} course?").format(studio_name=settings.STUDIO_SHORT_NAME)}</h3>
             <div class="copy">
-              <p>${_('You will need to be added to the course in {studio_name} by the course creator. Please get in touch with the course creator or administrator for the specific course you are helping to author.').format(studio_name=settings.STUDIO_NAME)}</p>
+              <p>${_('You will need to be added to the course in {studio_name} by the course creator. Please get in touch with the course creator or administrator for the specific course you are helping to author.').format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
             </div>
           </div>
         </div>
@@ -283,7 +283,7 @@
       %if course_creator_status == "unrequested":
       <div class="wrapper wrapper-creationrights">
         <h3 class="title">
-          <a href="#instruction-creationrights" class="ui-toggle-control show-creationrights"><span class="label">${_('Becoming a Course Creator in {studio_name}').format(studio_name=settings.STUDIO_NAME)}</span> <i class="icon-remove-sign"></i></a>
+          <a href="#instruction-creationrights" class="ui-toggle-control show-creationrights"><span class="label">${_('Becoming a Course Creator in {studio_name}').format(studio_name=settings.STUDIO_SHORT_NAME)}</span> <i class="icon-remove-sign"></i></a>
         </h3>
 
         <div class="notice notice-incontext notice-instruction notice-instruction-creationrights ui-toggle-target" id="instruction-creationrights">
@@ -367,7 +367,7 @@
     <aside class="content-supplementary" role="complementary">
       <div class="bit">
         <h3 class="title title-3">${_('New to {studio_name}?').format(studio_name=settings.STUDIO_NAME)}</h3>
-        <p>${_('Click Help in the upper-right corner to get more information about the {studio_name} page you are viewing. You can also use the links at the bottom of the page to access our continously updated documentation and other {studio_name} resources.').format(studio_name=settings.STUDIO_NAME)}</p>
+        <p>${_('Click Help in the upper-right corner to get more information about the {studio_name} page you are viewing. You can also use the links at the bottom of the page to access our continously updated documentation and other {studio_name} resources.').format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
 
         <ol class="list-actions">
           <li class="action-item">
diff --git a/cms/templates/login.html b/cms/templates/login.html
index cb03ee7fc69..14d4be996be 100644
--- a/cms/templates/login.html
+++ b/cms/templates/login.html
@@ -13,7 +13,7 @@ from django.utils.translation import ugettext as _
   <section class="content">
     <header>
       <h1 class="title title-1">${_("Sign In to {studio_name}").format(studio_name=settings.STUDIO_NAME)}</h1>
-      <a href="${reverse('signup')}" class="action action-signin">${_("Don't have a {studio_name} Account? Sign up!").format(studio_name=settings.STUDIO_NAME)}</a>
+      <a href="${reverse('signup')}" class="action action-signin">${_("Don't have a {studio_name} Account? Sign up!").format(studio_name=settings.STUDIO_SHORT_NAME)}</a>
     </header>
 
     <article class="content-primary" role="main">
@@ -46,7 +46,7 @@ from django.utils.translation import ugettext as _
     </article>
 
     <aside class="content-supplementary" role="complementary">
-      <h2 class="sr">${_("{studio_name} Support").format(studio_name=settings.STUDIO_NAME)}</h2>
+      <h2 class="sr">${_("{studio_name} Support").format(studio_name=settings.STUDIO_SHORT_NAME)}</h2>
 
       <div class="bit">
         <h3 class="title-3">${_("Need Help?")}</h3>
diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html
index 0dde0cef5d8..4cdabeba6cb 100644
--- a/cms/templates/manage_users.html
+++ b/cms/templates/manage_users.html
@@ -130,7 +130,7 @@
         <div class="msg">
           <h3 class="title">${_('Add Team Members to This Course')}</h3>
           <div class="copy">
-            <p>${_('Adding team members makes course authoring collaborative. Users must be signed up for {studio_name} and have an active account.').format(studio_name=settings.STUDIO_NAME)}</p>
+            <p>${_('Adding team members makes course authoring collaborative. Users must be signed up for {studio_name} and have an active account.').format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
           </div>
         </div>
 
diff --git a/cms/templates/register.html b/cms/templates/register.html
index 358a9a90a30..404aae3b734 100644
--- a/cms/templates/register.html
+++ b/cms/templates/register.html
@@ -12,7 +12,7 @@
   <section class="content">
     <header>
       <h1 class="title title-1">${_("Sign Up for {studio_name}").format(studio_name=settings.STUDIO_NAME)}</h1>
-      <a href="${reverse('login')}" class="action action-signin">${_("Already have a {studio_name} Account? Sign in").format(studio_name=settings.STUDIO_NAME)}</a>
+      <a href="${reverse('login')}" class="action action-signin">${_("Already have a {studio_name} Account? Sign in").format(studio_name=settings.STUDIO_SHORT_NAME)}</a>
     </header>
 
     <p class="introduction">${_("Ready to start creating online courses? Sign up below and start creating your first {platform_name} course today.").format(platform_name=settings.PLATFORM_NAME)}</p>
@@ -78,19 +78,19 @@
     </article>
 
     <aside class="content-supplementary" role="complementary">
-      <h2 class="sr">${_("Common {studio_name} Questions").format(studio_name=settings.STUDIO_NAME)}</h2>
+      <h2 class="sr">${_("Common {studio_name} Questions").format(studio_name=settings.STUDIO_SHORT_NAME)}</h2>
 
       <div class="bit">
-        <h3 class="title-3">${_("Who is {studio_name} for?").format(studio_name=settings.STUDIO_NAME)}</h3>
+        <h3 class="title-3">${_("Who is {studio_name} for?").format(studio_name=settings.STUDIO_SHORT_NAME)}</h3>
         <p>${_("{studio_name} is for anyone that wants to create online courses that leverage the global {platform_name} platform. Our users are often faculty members, teaching assistants and course staff, and members of instructional technology groups.").format(
-          studio_name=settings.STUDIO_NAME, platform_name=settings.PLATFORM_NAME,
+          studio_name=settings.STUDIO_SHORT_NAME, platform_name=settings.PLATFORM_NAME,
         )}</p>
       </div>
 
       <div class="bit">
         <h3 class="title-3">${_("How technically savvy do I need to be to create courses in {studio_name}?")}</h3>
         <p>${_("{studio_name} is designed to be easy to use by almost anyone familiar with common web-based authoring environments (Wordpress, Moodle, etc.). No programming knowledge is required, but for some of the more advanced features, a technical background would be helpful. As always, we are here to help, so don't hesitate to dive right in.").format(
-          studio_name=settings.STUDIO_NAME,
+          studio_name=settings.STUDIO_SHORT_NAME,
         )}</p>
       </div>
 
diff --git a/cms/templates/settings_advanced.html b/cms/templates/settings_advanced.html
index 41b8165224f..4fdedc42a03 100644
--- a/cms/templates/settings_advanced.html
+++ b/cms/templates/settings_advanced.html
@@ -74,7 +74,7 @@
         <h3 class="title-3">${_("What do advanced settings do?")}</h3>
         <p>${_("Advanced settings control specific course functionality. On this page, you can edit manual policies, which are JSON-based key and value pairs that control specific course settings.")}</p>
 
-        <p>${_("Any policies you modify here override all other information you've defined elsewhere in {studio_name}. Do not edit policies unless you are familiar with both their purpose and syntax.").format(studio_name=settings.STUDIO_NAME)}</p>
+        <p>${_("Any policies you modify here override all other information you've defined elsewhere in {studio_name}. Do not edit policies unless you are familiar with both their purpose and syntax.").format(studio_name=settings.STUDIO_SHORT_NAME)}</p>
 
         <p>${_("{em_start}Note:{em_end} When you enter strings as policy values, ensure that you use double quotation marks (&quot;) around the string. Do not use single quotation marks (&apos;).").format(em_start='<strong>', em_end="</strong>")}</p>
       </div>
diff --git a/cms/templates/widgets/sock.html b/cms/templates/widgets/sock.html
index e4f477e8c41..60b1703abff 100644
--- a/cms/templates/widgets/sock.html
+++ b/cms/templates/widgets/sock.html
@@ -5,8 +5,8 @@
   <ul class="list-actions list-cta">
     <li class="action-item">
       <a href="#sock" class="cta cta-show-sock"><i class="icon-question-sign"></i>
-        <span class="copy-show is-shown">${_("Looking for help with {studio_name}?").format(studio_name=settings.STUDIO_NAME)}</span>
-        <span class="copy-hide is-hidden">${_("Hide {studio_name} Help").format(studio_name=settings.STUDIO_NAME)}</span>
+        <span class="copy-show is-shown">${_("Looking for help with {studio_name}?").format(studio_name=settings.STUDIO_SHORT_NAME)}</span>
+        <span class="copy-hide is-hidden">${_("Hide {studio_name} Help").format(studio_name=settings.STUDIO_SHORT_NAME)}</span>
       </a>
     </li>
   </ul>
-- 
GitLab