', {label: label_trans}),
class: 'revoke'
$revoke_btn.click =>
@modify_member_access member.email, 'revoke', (error) =>
diff --git a/lms/static/coffee/src/instructor_dashboard/send_email.coffee b/lms/static/coffee/src/instructor_dashboard/send_email.coffee
index edf6a07003..772dddad21 100644
--- a/lms/static/coffee/src/instructor_dashboard/send_email.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/send_email.coffee
@@ -30,21 +30,25 @@ class SendEmail
@$btn_send.click =>
if @$subject.val() == ""
alert gettext("Your message must have a subject.")
+
else if @$emailEditor.save()['data'] == ""
alert gettext("Your message cannot be blank.")
+
else
success_message = gettext("Your email was successfully queued for sending.")
send_to = @$send_to.val().toLowerCase()
if send_to == "myself"
- send_to = gettext("yourself")
+ confirm_message = gettext("You are about to send an email titled '<%= subject %>' to yourself. Is this OK?")
else if send_to == "staff"
- send_to = gettext("everyone who is staff or instructor on this course")
+ confirm_message = gettext("You are about to send an email titled '<%= subject %>' to everyone who is staff or instructor on this course. Is this OK?")
else
- send_to = gettext("ALL (everyone who is enrolled in this course as student, staff, or instructor)")
+ confirm_message = gettext("You are about to send an email titled '<%= subject %>' to ALL (everyone who is enrolled in this course as student, staff, or instructor). Is this OK?")
success_message = gettext("Your email was successfully queued for sending. Please note that for large classes, it may take up to an hour (or more, if other courses are simultaneously sending email) to send all emails.")
- subject = gettext(@$subject.val())
- confirm_message = gettext("You are about to send an email titled \"#{subject}\" to #{send_to}. Is this OK?")
- if confirm confirm_message
+
+ subject = @$subject.val()
+ full_confirm_message = _.template(confirm_message, {subject: subject})
+
+ if confirm full_confirm_message
send_data =
action: 'send'
@@ -87,7 +91,7 @@ class SendEmail
console.warn msg
@$task_response.empty()
@$request_response_error.empty()
- @$request_response_error.text gettext(msg)
+ @$request_response_error.text msg
$(".msg-confirm").css({"display":"none"})
display_response: (data_from_server) ->
diff --git a/lms/static/coffee/src/instructor_dashboard/util.coffee b/lms/static/coffee/src/instructor_dashboard/util.coffee
index 14a2f2b8ca..839472ef73 100644
--- a/lms/static/coffee/src/instructor_dashboard/util.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/util.coffee
@@ -42,47 +42,74 @@ create_task_list_table = ($table_tasks, tasks_data) ->
columns = [
id: 'task_type'
field: 'task_type'
- name: 'Task Type'
+ ###
+ Translators: a "Task" is a background process such as grading students or sending email
+ ###
+ name: gettext('Task Type')
minWidth: 102
,
id: 'task_input'
field: 'task_input'
- name: 'Task inputs'
+ ###
+ Translators: a "Task" is a background process such as grading students or sending email
+ ###
+ name: gettext('Task inputs')
minWidth: 150
,
id: 'task_id'
field: 'task_id'
- name: 'Task ID'
+ ###
+ Translators: a "Task" is a background process such as grading students or sending email
+ ###
+ name: gettext('Task ID')
minWidth: 150
,
id: 'requester'
field: 'requester'
- name: 'Requester'
+ ###
+ Translators: a "Requester" is a username that requested a task such as sending email
+ ###
+ name: gettext('Requester')
minWidth: 80
,
id: 'created'
field: 'created'
- name: 'Submitted'
+ ###
+ Translators: A timestamp of when a task (eg, sending email) was submitted appears after this
+ ###
+ name: gettext('Submitted')
minWidth: 120
,
id: 'duration_sec'
field: 'duration_sec'
- name: 'Duration (sec)'
+ ###
+ Translators: The length of a task (eg, sending email) in seconds appears this
+ ###
+ name: gettext('Duration (sec)')
minWidth: 80
,
id: 'task_state'
field: 'task_state'
- name: 'State'
+ ###
+ Translators: The state (eg, "In progress") of a task (eg, sending email) appears after this.
+ ###
+ name: gettext('State')
minWidth: 80
,
id: 'status'
field: 'status'
- name: 'Task Status'
+ ###
+ Translators: a "Task" is a background process such as grading students or sending email
+ ###
+ name: gettext('Task Status')
minWidth: 80
,
id: 'task_message'
field: 'task_message'
- name: 'Task Progress'
+ ###
+ Translators: a "Task" is a background process such as grading students or sending email
+ ###
+ name: gettext('Task Progress')
minWidth: 120
]
diff --git a/lms/templates/instructor/instructor_dashboard_2/membership.html b/lms/templates/instructor/instructor_dashboard_2/membership.html
index 3e4002917c..17b3acd010 100644
--- a/lms/templates/instructor/instructor_dashboard_2/membership.html
+++ b/lms/templates/instructor/instructor_dashboard_2/membership.html
@@ -71,7 +71,7 @@
${_("Note: Users must have an activated {platform_name} account before they can be enrolled as a beta tester.").format(platform_name=settings.PLATFORM_NAME)}
-
+
@@ -84,8 +84,8 @@
-
-
+
+
@@ -95,12 +95,14 @@
+ ## Translators: an "Administration List" is a list, such as Course Staff, that users can be added to.
${_("Administration List Management")}
-
+ ## Translators: an "Administrator Group" is a group, such as Course Staff, that users can be added to.
+
@@ -150,7 +152,7 @@
"privileges.")}"
data-list-endpoint="${ section_data['list_course_role_members_url'] }"
data-modify-endpoint="${ section_data['modify_access_url'] }"
- data-add-button-label="Add ${_("Beta Tester")}"
+ data-add-button-label="${_("Add Beta Tester")}"
>