From 0f07bad3edab53d218daafb0ecfe2905b6d9ea37 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Thu, 9 Oct 2014 10:34:40 -0400 Subject: [PATCH 1/2] Some strings were missing i18n calls --- cms/templates/index.html | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/cms/templates/index.html b/cms/templates/index.html index 056c669d98..f258fe3819 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -134,7 +134,7 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) { %if allow_course_reruns and rerun_creator_status and len(in_process_course_actions) > 0:
-

Courses Being Processed

+

${_("Courses Being Processed")}

-
This re-run processing status:
+ ## Translators: This string will be followed by another string that indicates the current status of the course, such as "Configuring as re-run" +
${_("The status of this course is:")}
- Configuring as re-run + ## Translators: This is a status message, used to inform the user of what the system is doing. This status means that the user has requested to re-run an existing course, and the system is currently in the process of duplicating and configuring the existing course so that it can be re-run. + ${_("Configuring as re-run")}
-

${_('The new course will be added to your course list in 5-10 minutes. Return to this page or refresh it to update the course list. The new course will need some manual configuration.')}

+

${_('The new course will be added to your course list in 5-10 minutes. Return to this page or {link_start}refresh it{link_end} to update the course list. The new course will need some manual configuration.').format( + link_start='', + link_end='', + )}

%endif @@ -385,28 +390,36 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) { ${_("Getting Started with edX Studio")}
  • - ${_('Request help with edX Studio')} + ${_("Request help with edX Studio")}
    • % if course_creator_status=='disallowed_for_this_site' and settings.FEATURES.get('STUDIO_REQUEST_EMAIL',''):
    -

    ${_('Can I create courses in Studio?')}

    -

    ${_('In order to create courses in Studio, you must')} ${_("contact edX staff to help you create a course")}

    +

    ${_("Can I create courses in Studio?")}

    +

    ${_("In order to create courses in Studio, you must {link_start}contact edX staff to help you create a course{link_end}.").format( + link_start=''.format(email=settings.FEATURES.get('STUDIO_REQUEST_EMAIL','')), + link_end="", + )}

    % endif % if course_creator_status == "unrequested":
    -

    ${_('Can I create courses in Studio?')}

    +

    ${_("Can I create courses in Studio?")}

    ${_('In order to create courses in Studio, you must have course creator privileges to create your own course.')}

    % elif course_creator_status == "denied":
    -

    ${_('Can I create courses in Studio?')}

    -

    ${_('Your request to author courses in studio has been denied. Please')} ${_('contact edX Staff with further questions')}

    +

    ${_("Can I create courses in Studio?")}

    +

    ${_("Your request to author courses in Studio has been denied. Please {link_start}contact edX Staff with further questions{link_end}.").format( + link_start=''.format( + url="http://help.edge.edx.org/discussion/new", + ), + link_end="", + )}

    % endif @@ -423,7 +436,7 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) {
    -

    ${_('We need to verify your email address')}

    +

    ${_("We need to verify your email address")}

    ${_('Almost there! In order to complete your sign up we need you to verify your email address (%(email)s). An activation message and next steps should be waiting for you there.') % dict(email=user.email)}

    @@ -438,7 +451,7 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) {
    1. - Request help with your Studio account + ${_("Request help with your Studio account")}
    From eba03512d5d349b1474ab2361ef816ddc91b72ca Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 14 Oct 2014 16:41:29 -0400 Subject: [PATCH 2/2] Replace course status message --- cms/templates/index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cms/templates/index.html b/cms/templates/index.html index f258fe3819..aabe52c799 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -160,8 +160,7 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) {
    - ## Translators: This string will be followed by another string that indicates the current status of the course, such as "Configuring as re-run" -
    ${_("The status of this course is:")}
    +
    ${_("This course run is currently being created.")}
    ## Translators: This is a status message, used to inform the user of what the system is doing. This status means that the user has requested to re-run an existing course, and the system is currently in the process of duplicating and configuring the existing course so that it can be re-run.