Merge pull request #6309 from edx/db/edx-studio-as-format-string

Replace "edX Studio" with "{studio_name}"

cms/envs/common.py

@@ -41,7 +41,12 @@ from dealer.git import git
 from xmodule.modulestore.edit_info import EditInfoMixin
 
 ############################ FEATURE CONFIGURATION #############################
-
+STUDIO_SHORT_NAME = "Studio"
+STUDIO_NAME = "{platform_name} {short_name}".format(
+    platform_name=PLATFORM_NAME, short_name=STUDIO_SHORT_NAME,
+)
+# Note that if you redefine STUDIO_SHORT_NAME in another settings file,
+# you'll also need to redefine STUDIO_NAME -- it won't automatically inherit.
 FEATURES = {
     'USE_DJANGO_PIPELINE': True,
 

cms/static/js/sock.js

@@ -3,12 +3,22 @@ require(["domReady", "jquery", "jquery.smoothScroll"],
         var toggleSock = function (e) {
             e.preventDefault();
 
-            var $btnLabel = $(this).find('.copy');
+            var $btnShowSockLabel = $(this).find('.copy-show');
+            var $btnHideSockLabel = $(this).find('.copy-hide');
             var $sock = $('.wrapper-sock');
             var $sockContent = $sock.find('.wrapper-inner');
 
-            $sock.toggleClass('is-shown');
-            $sockContent.toggle('fast');
+            if ($sock.hasClass('is-shown')) {
+                $sock.removeClass('is-shown');
+                $sockContent.hide('fast');
+                $btnHideSockLabel.removeClass("is-shown").addClass("is-hidden");
+                $btnShowSockLabel.removeClass("is-hidden").addClass("is-shown");
+            } else {
+                $sock.addClass('is-shown');
+                $sockContent.show('fast');
+                $btnHideSockLabel.removeClass("is-hidden").addClass("is-shown");
+                $btnShowSockLabel.removeClass("is-shown").addClass("is-hidden");
+            }
 
             $.smoothScroll({
                 offset: -200,
@@ -17,12 +27,6 @@ require(["domReady", "jquery", "jquery.smoothScroll"],
                 scrollElement: null,
                 scrollTarget: $sock
             });
-
-            if ($sock.hasClass('is-shown')) {
-                $btnLabel.text(gettext('Hide Studio Help'));
-            } else {
-                $btnLabel.text(gettext('Looking for Help with Studio?'));
-            }
         };
 
         domReady(function () {

cms/templates/500.html

 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="base.html" />
-<%block name="title">${_("Studio Server Error")}</%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">
 <div class="wrapper-content wrapper">
   <section class="content">
     <header>
-      <h1 class="title title-1">${_("The <em>Studio</em> servers encountered an error")}</h1>
+      <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)
+        )}
+      </h1>
     </header>
     <article class="content-primary" role="main">
       <p>
-        ${_("An error occurred in Studio and the page could not be loaded. Please try again in a few moments.")}
+        ${_("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(

cms/templates/activation_active.html

@@ -4,7 +4,9 @@
 <%block name="content">
 <div class="wrapper-mast wrapper sr">
   <header class="mast">
-    <h1 class="page-header">${_("Studio Account Activation")}</h1>
+    <h1 class="page-header">
+      ${_("{studio_name} Account Activation").format(studio_name=settings.STUDIO_SHORT_NAME)}
+    </h1>
   </header>
 </div>
 
@@ -17,13 +19,15 @@
       <div class="msg">
         <h2 class="title">${_("Your account is already active")}</h2>
         <div class="copy">
-          <p>${_("This account, set up using {0}, has already been activated. Please sign in to start working within edX Studio.".format(user.email))}</p>
+          <p>${_("This account, set up using {email}, has already been activated. Please sign in to start working within {studio_name}.".format(email=user.email, studio_name=settings.STUDIO_NAME))}</p>
         </div>
       </div>
 
       <ul class="list-actions">
         <li class="action-item">
-          <a href="/signin" class="action-primary action-signin">${_("Sign into Studio")}</a>
+          <a href="/signin" class="action-primary action-signin">
+            ${_("Sign into {studio_name}").format(platform_name=settings.STUDIO_SHORT_NAME)}
+          </a>
         </li>
       </ul>
     </div>

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 Account Activation")}</h1>
+    <h1 class="page-header">${_("{studio_name} Account Activation").format(studio_name=settings.STUDIO_SHORT_NAME)}</h1>
   </header>
 </div>
 
@@ -17,13 +17,15 @@
       <div class="msg">
         <h1 class="title">${_("Your account activation is complete!")}</h1>
         <div class="copy">
-          <p>${_("Thank you for activating your account. You may now sign in and start using edX Studio to author courses.")}</p>
+          <p>${_("Thank you for activating your account. You may now sign in and start using {studio_name} to author courses.").format(studio_name=settings.STUDIO_NAME)}</p>
         </div>
       </div>
 
       <ul class="list-actions">
         <li class="action-item">
-          <a href="/signin" class="action-primary action-signin">${_("Sign into Studio")}</a>
+          <a href="/signin" class="action-primary action-signin">
+            ${_("Sign into {studio_name}").format(studio_name=settings.STUDIO_SHORT_NAME)}
+          </a>
         </li>
       </ul>
     </div>

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 Account Activation")}</h1>
+    <h1 class="page-header">${_("{studio_name} Account Activation").format(studio_name=settings.STUDIO_SHORT_NAME)}</h1>
   </header>
 </div>
 
@@ -18,7 +18,8 @@
         <h1 class="title">${_("Your account activation is invalid")}</h1>
         <div class="copy">
           <p>${_("We're sorry. Something went wrong with your activation. Check to make sure the URL you went to was correct — e-mail programs will sometimes split it into two lines.")}</p>
-          <p>${_("If you still have issues, contact edX Support. In the meantime, you can also return to {link_start}the Studio homepage.{link_end}").format(
+          <p>${_("If you still have issues, contact {platform_name} Support. In the meantime, you can also return to {link_start}the {studio_name} homepage.{link_end}").format(
+              platform_name=settings.PLATFORM_NAME, studio_name=settings.STUDIO_NAME,
               link_start='<a href="/">', link_end="</a>"
             )}</p>
         </div>

cms/templates/asset_index.html

@@ -63,7 +63,7 @@
 
                 <p>${_("To add files to use in your course, click {em_start}Upload New File{em_end}. Then follow the prompts to upload a file from your computer.").format(em_start='<strong>', em_end="</strong>")}</p>
 
-                <p>${_("{em_start}Caution{em_end}: edX recommends that you limit the file size to {em_start}10 MB{em_end}. In addition, do not upload video or audio files. You should use a third party service to host multimedia files.").format(em_start='<strong>', em_end="</strong>")}</p>
+                <p>${_("{em_start}Caution{em_end}: {platform_name} recommends that you limit the file size to {em_start}10 MB{em_end}. In addition, do not upload video or audio files. You should use a third party service to host multimedia files.").format(em_start='<strong>', em_end="</strong>", platform_name=settings.PLATFORM_NAME)}</p>
 
             	<p>${_("The course image, textbook chapters, and files that appear on your Course Handouts sidebar also appear in this list.")}</p>
             </div>

cms/templates/base.html

@@ -22,7 +22,7 @@
         <% ctx_loc = context_course.location %>
         ${context_course.display_name_with_default | h} |
         % endif
-        edX Studio
+        ${settings.STUDIO_NAME}
     </title>
 
     <meta name="viewport" content="width=device-width,initial-scale=1">

cms/templates/checklists.html

@@ -54,7 +54,7 @@
       </div>
 
       <div class="bit">
-        <h3 class="title title-3">${_("Studio checklists")}</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:

cms/templates/emails/activation_email.txt

 <%! from django.utils.translation import ugettext as _ %>
 
-${_("Thank you for signing up for edX Studio! To activate your account, please copy and paste this address into your web browser's address bar:")}
+${_("Thank you for signing up for {studio_name}! To activate your account, please copy and paste this address into your web browser's address bar:").format(studio_name=settings.STUDIO_NAME)}
 
 % if is_secure:
   https://${ site }/activate/${ key }
@@ -8,4 +8,4 @@ ${_("Thank you for signing up for edX Studio! To activate your account, please c
   http://${ site }/activate/${ key }
 % endif
 
-${_("If you didn't request this, you don't need to do anything; you won't receive any more email from us. Please do not reply to this e-mail; if you require assistance, check the help section of the edX web site.")}
+${_("If you didn't request this, you don't need to do anything; you won't receive any more email from us. Please do not reply to this e-mail; if you require assistance, check the help section of the {studio_name} web site.").format(studio_name=settings.STUDIO_NAME)}

cms/templates/emails/activation_email_subject.txt

 <%! from django.utils.translation import ugettext as _ %>
-${_("Your account for edX Studio")}
+${_("Your account for {studio_name}").format(studio_name=settings.STUDIO_NAME)}

cms/templates/emails/course_creator_admin_subject.txt

 <%! from django.utils.translation import ugettext as _ %>
-${_("{email} has requested Studio course creator privileges on edge").format(email=user_email)}
\ No newline at end of file
+${_("{email} has requested {studio_name} course creator privileges on edge").format(
+    email=user_email, studio_name=settings.STUDIO_SHORT_NAME,
+)}
\ No newline at end of file

cms/templates/emails/course_creator_admin_user_pending.txt

 <%! from django.utils.translation import ugettext as _ %>
-${_("User '{user}' with e-mail {email} has requested Studio course creator privileges on edge.").format(user=user_name, email=user_email)}
+${_("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_SHORT_NAME,
+)}
 ${_("To grant or deny this request, use the course creator admin table.")}
 
 % if is_secure:

cms/templates/emails/course_creator_denied.txt

 <%! from django.utils.translation import ugettext as _ %>
 
-${_("Your request for course creation rights to edX Studio have been denied. If you believe this was in error, please contact: ")}
-
-${ studio_request_email }
+${_("Your request for course creation rights to {studio_name} have been denied. If you believe this was in error, please contact {email}").format(studio_name=settings.STUDIO_NAME, email=studio_request_email)}

cms/templates/emails/course_creator_granted.txt

 <%! from django.utils.translation import ugettext as _ %>
 
-${_("Your request for course creation rights to edX Studio have been granted. To create your first course, visit:")}
-
-% if is_secure:
-https://${ site }
-% else:
-http://${ site }
-% endif
+${_("Your request for course creation rights to {studio_name} have been granted. To create your first course, visit\n\n{url}").format(
+  studio_name=settings.STUDIO_NAME,
+  url="{scheme}://{site}".format(scheme="https" if is_secure else "http", site=site),
+)}

cms/templates/emails/course_creator_revoked.txt

 <%! from django.utils.translation import ugettext as _ %>
 
-${_("Your course creation rights to edX Studio have been revoked. If you believe this was in error, please contact: ")}
-
-${ studio_request_email }
+${_("Your course creation rights to {studio_name} have been revoked. If you believe this was in error, please contact {email}").format(studio_name=settings.STUDIO_NAME, email=studio_request_email)}

cms/templates/emails/course_creator_subject.txt

 <%! from django.utils.translation import ugettext as _ %>
-${_("Your course creator status for edX Studio")}
+${_("Your course creator status for {studio_name}").format(studio_name=settings.STUDIO_NAME)}

cms/templates/error.html

@@ -14,13 +14,15 @@
   <article class="error-prompt">
     % 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 page you're looking for. You may want to return to the Studio Dashboard and try again. If you are still having problems accessing things, please feel free to {link_start}contact Studio support{link_end} for further help.").format(
+      <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_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 Dashboard or try this request again. If you are still having problems accessing things, please feel free to {link_start}contact Studio support{link_end} for further help.").format(
+      <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_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>

cms/templates/export.html

@@ -40,7 +40,9 @@
         <h2 class="title">${_("About Exporting Courses")}</h2>
         <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. 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(em_start='<strong>', em_end="</strong>")}</p>
+          <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_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>
       </div>
@@ -87,7 +89,9 @@
     <aside class="content-supplementary" role="complementary">
       <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. 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.")}</p>
+        <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_SHORT_NAME,
+          )}</p>
       </div>
 
       <div class="bit">

cms/templates/howitworks.html

@@ -15,8 +15,14 @@
   <section class="content content-header">
     <header>
       ## "edX Studio" should not be translated
-      <h1><span class="wrapper-text-welcome">${_('Welcome to')}</span><span class="logo">edX Studio</span></h1>
-      <p class="tagline">${_("Studio helps manage your online courses, so you can focus on teaching them")}</p>
+      <h1><span class="wrapper-text-welcome">${_("Welcome to {studio_name}").format(
+        studio_name='</span><span class="logo">{studio_name}</span>'.format(
+          studio_name=settings.STUDIO_NAME
+        )
+      )}</h1>
+      <p class="tagline">${_("{studio_name} helps manage your online courses, so you can focus on teaching them").format(
+        studio_name=settings.STUDIO_SHORT_NAME
+      )}</p>
     </header>
   </section>
 </div>
@@ -24,15 +30,15 @@
 <div class="wrapper-content-features wrapper">
   <section class="content content-features">
     <header>
-      <h2 class="sr">${_("Studio's Many Features")}</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 Helps You Keep Your Courses Organized')}" />
-            <figcaption class="sr">${_("Studio Helps You Keep Your Courses Organized")}</figcaption>
+            <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>
             </span>
@@ -41,12 +47,12 @@
 
         <div class="copy">
           <h3>${_("Keeping Your Course Organized")}</h3>
-          <p>${_("The backbone of your course is how it is organized. Studio offers an <strong>Outline</strong> editor, providing a simple hierarchy and easy drag and drop to help you and your students stay organized.")}</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 uses a simple hierarchy of <strong>sections</strong> and <strong>subsections</strong> to organize your content.")}</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">
@@ -75,7 +81,7 @@
 
         <div class="copy">
           <h3>${_("Learning is More than Just Lectures")}</h3>
-          <p>${_("Studio 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.")} </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">
@@ -99,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 Gives You Simple, Fast, and Incremental Publishing. With Friends.')}" />
-            <figcaption class="sr">${_("Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.")}</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>
@@ -109,7 +115,7 @@
 
         <div class="copy">
           <h3>${_("Simple, Fast, and Incremental Publishing. With Friends.")}</h3>
-          <p>${_("Studio 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.")}</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">
@@ -119,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 takes care of the rest. Build your course incrementally.")}</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">
@@ -136,15 +142,15 @@
 <div class="wrapper-content-cta wrapper">
   <section class="content content-cta">
     <header>
-      <h2 class="sr">${_("Sign Up for Studio Today!")}</h2>
+      <h2 class="sr">${_("Sign Up for {studio_name} Today!").format(studio_name=settings.STUDIO_SHORT_NAME)}</h2>
     </header>
 
     <ul class="list-actions">
       <li class="action-item">
-        <a href="${reverse('signup')}" class="action action-primary">${_("Sign Up &amp; Start Making an edX Course")}</a>
+        <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 Account? Sign In")}</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>
@@ -180,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 will publish it to your students for you.")}</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">