diff --git a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee b/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
index f761882fec..b55bec5e01 100644
--- a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
+++ b/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
@@ -328,7 +328,7 @@ browser and pasting the output. When that file changes, this one should be rege
<% }); %>
- Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort group.
+ Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort.
<% } %>
diff --git a/common/static/js/src/string_utils.js b/common/static/js/src/string_utils.js
index 232b36f02e..dc48dcb01d 100644
--- a/common/static/js/src/string_utils.js
+++ b/common/static/js/src/string_utils.js
@@ -32,8 +32,8 @@
* Example usages:
* interpolate_text('{title} ({count})', {title: expectedTitle, count: expectedCount}
* interpolate_text(
- * ngettext("{numUsersAdded} student has been added to this cohort group",
- * "{numUsersAdded} students have been added to this cohort group", numUsersAdded),
+ * ngettext("{numUsersAdded} student has been added to this cohort",
+ * "{numUsersAdded} students have been added to this cohort", numUsersAdded),
* {numUsersAdded: numUsersAdded}
* );
*
diff --git a/common/test/acceptance/pages/lms/instructor_dashboard.py b/common/test/acceptance/pages/lms/instructor_dashboard.py
index e709118720..d12e6a6328 100644
--- a/common/test/acceptance/pages/lms/instructor_dashboard.py
+++ b/common/test/acceptance/pages/lms/instructor_dashboard.py
@@ -104,7 +104,7 @@ class MembershipPageCohortManagementSection(PageObject):
def _get_cohort_options(self):
"""
- Returns the available options in the cohort dropdown, including the initial "Select a cohort group".
+ Returns the available options in the cohort dropdown, including the initial "Select a cohort".
"""
return self.q(css=self._bounded_selector("#cohort-select option"))
@@ -122,7 +122,7 @@ class MembershipPageCohortManagementSection(PageObject):
def get_cohorts(self):
"""
- Returns, as a list, the names of the available cohorts in the drop-down, filtering out "Select a cohort group".
+ Returns, as a list, the names of the available cohorts in the drop-down, filtering out "Select a cohort".
"""
return [
self._cohort_name(opt.text)
@@ -227,7 +227,7 @@ class MembershipPageCohortManagementSection(PageObject):
def set_cohort_associated_content_group(self, content_group=None, select_settings=True):
"""
Sets the content group associated with the cohort currently being edited.
- If content_group is None, un-links the cohort group from any content group.
+ If content_group is None, un-links the cohort from any content group.
Presses Save to update the cohort's settings.
"""
if select_settings:
diff --git a/common/test/acceptance/tests/discussion/helpers.py b/common/test/acceptance/tests/discussion/helpers.py
index 41f83624d9..46cdba1155 100644
--- a/common/test/acceptance/tests/discussion/helpers.py
+++ b/common/test/acceptance/tests/discussion/helpers.py
@@ -41,7 +41,7 @@ class CohortTestMixin(object):
def setup_cohort_config(self, course_fixture, auto_cohort_groups=None):
"""
Sets up the course to use cohorting with the given list of auto_cohort_groups.
- If auto_cohort_groups is None, no auto cohort groups are set.
+ If auto_cohort_groups is None, no auto cohorts are set.
"""
course_fixture._update_xblock(course_fixture._course_location, {
"metadata": {
@@ -67,7 +67,7 @@ class CohortTestMixin(object):
def add_manual_cohort(self, course_fixture, cohort_name):
"""
- Adds a cohort group by name, returning the ID for the group.
+ Adds a cohort by name, returning its ID.
"""
url = LMS_BASE_URL + "/courses/" + course_fixture._course_key + '/cohorts/'
data = json.dumps({"name": cohort_name})
@@ -77,7 +77,7 @@ class CohortTestMixin(object):
def add_user_to_cohort(self, course_fixture, username, cohort_id):
"""
- Adds a user to the specified cohort group.
+ Adds a user to the specified cohort.
"""
url = LMS_BASE_URL + "/courses/" + course_fixture._course_key + "/cohorts/{}/add".format(cohort_id)
data = {"users": username}
diff --git a/common/test/acceptance/tests/discussion/test_cohort_management.py b/common/test/acceptance/tests/discussion/test_cohort_management.py
index 5390bac698..76cd69c62d 100644
--- a/common/test/acceptance/tests/discussion/test_cohort_management.py
+++ b/common/test/acceptance/tests/discussion/test_cohort_management.py
@@ -89,12 +89,12 @@ class CohortConfigurationTest(UniqueCourseTest, CohortTestMixin):
"""
self.verify_cohort_description(
self.manual_cohort_name,
- 'Students are added to this cohort group only when you provide '
+ 'Students are added to this cohort only when you provide '
'their email addresses or usernames on this page',
)
self.verify_cohort_description(
self.auto_cohort_name,
- 'Students are added to this cohort group automatically',
+ 'Students are added to this cohort automatically',
)
def test_no_content_groups(self):
@@ -104,7 +104,7 @@ class CohortConfigurationTest(UniqueCourseTest, CohortTestMixin):
Given I have a course with a cohort defined but no content groups
When I view the cohort in the instructor dashboard and select settings
- Then the cohort group is not linked to a content group
+ Then the cohort is not linked to a content group
And there is text stating that no content groups are defined
And I cannot select the radio button to enable content group association
And there is a link I can select to open Group settings in Studio
@@ -113,7 +113,7 @@ class CohortConfigurationTest(UniqueCourseTest, CohortTestMixin):
self.assertIsNone(self.cohort_management_page.get_cohort_associated_content_group())
self.assertEqual(
"Warning:\nNo content groups exist. "
- "Create a content group to associate with cohort groups. Create a content group",
+ "Create a content group to associate with cohorts. Create a content group",
self.cohort_management_page.get_cohort_related_content_group_message()
)
self.assertFalse(self.cohort_management_page.select_content_group_radio_button())
@@ -167,7 +167,7 @@ class CohortConfigurationTest(UniqueCourseTest, CohortTestMixin):
confirmation_messages = self.cohort_management_page.get_cohort_confirmation_messages()
self.assertEqual(
[
- "2 students have been added to this cohort group",
+ "2 students have been added to this cohort",
"1 student was removed from " + self.manual_cohort_name
],
confirmation_messages
@@ -235,8 +235,8 @@ class CohortConfigurationTest(UniqueCourseTest, CohortTestMixin):
self.assertEqual(
[
- "0 students have been added to this cohort group",
- "1 student was already in the cohort group"
+ "0 students have been added to this cohort",
+ "1 student was already in the cohort"
],
self.cohort_management_page.get_cohort_confirmation_messages()
)
@@ -359,7 +359,7 @@ class CohortConfigurationTest(UniqueCourseTest, CohortTestMixin):
"Your file '{}' has been uploaded. Allow a few minutes for processing.".format(filename)
)
- # student_user is moved from manual cohort group to auto cohort group
+ # student_user is moved from manual cohort to auto cohort
self.assertEqual(
self.event_collection.find({
"name": "edx.cohort.user_added",
@@ -378,7 +378,7 @@ class CohortConfigurationTest(UniqueCourseTest, CohortTestMixin):
}).count(),
1
)
- # instructor_user (previously unassigned) is added to manual cohort group
+ # instructor_user (previously unassigned) is added to manual cohort
self.assertEqual(
self.event_collection.find({
"name": "edx.cohort.user_added",
@@ -388,7 +388,7 @@ class CohortConfigurationTest(UniqueCourseTest, CohortTestMixin):
}).count(),
1
)
- # unicode_student_user (previously unassigned) is added to manual cohort group
+ # unicode_student_user (previously unassigned) is added to manual cohort
self.assertEqual(
self.event_collection.find({
"name": "edx.cohort.user_added",
@@ -467,7 +467,7 @@ class CohortConfigurationTest(UniqueCourseTest, CohortTestMixin):
class CohortContentGroupAssociationTest(UniqueCourseTest, CohortTestMixin):
"""
- Tests for linking between content groups and cohort groups in the instructor dashboard.
+ Tests for linking between content groups and cohort in the instructor dashboard.
"""
def setUp(self):
@@ -515,7 +515,7 @@ class CohortContentGroupAssociationTest(UniqueCourseTest, CohortTestMixin):
Given I have a course with a cohort defined and content groups defined
When I view the cohort in the instructor dashboard and select settings
- Then the cohort group is not linked to a content group
+ Then the cohort is not linked to a content group
And there is no text stating that content groups are undefined
And the content groups are listed in the selector
"""
@@ -622,7 +622,7 @@ class CohortContentGroupAssociationTest(UniqueCourseTest, CohortTestMixin):
)
self.cohort_management_page.set_cohort_associated_content_group("Pears")
confirmation_messages = self.cohort_management_page.get_cohort_settings_messages()
- self.assertEqual(["Saved cohort group."], confirmation_messages)
+ self.assertEqual(["Saved cohort"], confirmation_messages)
self.assertIsNone(self.cohort_management_page.get_cohort_related_content_group_message())
self.assertEquals(["Bananas", "Pears"], self.cohort_management_page.get_all_content_groups())
@@ -652,7 +652,7 @@ class CohortContentGroupAssociationTest(UniqueCourseTest, CohortTestMixin):
Then refreshes the page and selects the cohort.
"""
confirmation_messages = self.cohort_management_page.get_cohort_settings_messages()
- self.assertEqual(["Saved cohort group."], confirmation_messages)
+ self.assertEqual(["Saved cohort"], confirmation_messages)
self.browser.refresh()
self.cohort_management_page.wait_for_page()
self.cohort_management_page.select_cohort(cohort_name)
diff --git a/common/test/acceptance/tests/discussion/test_cohorts.py b/common/test/acceptance/tests/discussion/test_cohorts.py
index 0fed9573a6..3c567a15b9 100644
--- a/common/test/acceptance/tests/discussion/test_cohorts.py
+++ b/common/test/acceptance/tests/discussion/test_cohorts.py
@@ -36,10 +36,10 @@ class CohortedDiscussionTestMixin(BaseDiscussionMixin, CohortTestMixin):
"""
def setup_cohorts(self):
"""
- Sets up the course to use cohorting with a single defined cohort group.
+ Sets up the course to use cohorting with a single defined cohort.
"""
self.setup_cohort_config(self.course_fixture)
- self.cohort_1_name = "Cohort Group 1"
+ self.cohort_1_name = "Cohort 1"
self.cohort_1_id = self.add_manual_cohort(self.course_fixture, self.cohort_1_name)
def test_cohort_visibility_label(self):
diff --git a/lms/djangoapps/instructor_task/tasks_helper.py b/lms/djangoapps/instructor_task/tasks_helper.py
index 4ed4e9000f..698a51a836 100644
--- a/lms/djangoapps/instructor_task/tasks_helper.py
+++ b/lms/djangoapps/instructor_task/tasks_helper.py
@@ -551,7 +551,7 @@ def upload_grades_csv(_xmodule_instance_args, _entry_id, course_id, _task_input,
task_progress = TaskProgress(action_name, enrolled_students.count(), start_time)
course = get_course_by_id(course_id)
- cohorts_header = ['Cohort Group Name'] if course.is_cohorted else []
+ cohorts_header = ['Cohort Name'] if course.is_cohorted else []
partition_service = LmsPartitionService(user=None, course_id=course_id)
partitions = partition_service.course_partitions
diff --git a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
index 7002a0a69e..84b3d53855 100644
--- a/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
+++ b/lms/djangoapps/instructor_task/tests/test_tasks_helper.py
@@ -75,7 +75,7 @@ class TestInstructorGradeReport(TestReportMixin, InstructorTaskCourseTestCase):
report_csv_filename = report_store.links_for(course_id)[0][0]
with open(report_store.path_to(course_id, report_csv_filename)) as csv_file:
for row in unicodecsv.DictReader(csv_file):
- cohort_groups_in_csv.append(row['Cohort Group Name'])
+ cohort_groups_in_csv.append(row['Cohort Name'])
self.assertEqual(cohort_groups_in_csv, expected_cohort_groups)
@@ -97,12 +97,12 @@ class TestInstructorGradeReport(TestReportMixin, InstructorTaskCourseTestCase):
def test_unicode_cohort_data_in_grading(self):
"""
- Test that cohort groups can contain unicode characters.
+ Test that cohorts can contain unicode characters.
"""
cohort_groups = [u'ÞrÖfessÖr X', u'MàgnëtÖ']
course = CourseFactory.create(cohort_config={'cohorted': True})
- # Create users and manually assign cohort groups
+ # Create users and manually assign cohorts
user1 = UserFactory.create(username='user1')
user2 = UserFactory.create(username='user2')
CourseEnrollment.enroll(user1, course.id)
diff --git a/lms/static/js/groups/views/cohort_editor.js b/lms/static/js/groups/views/cohort_editor.js
index da243bcc8d..9d3485e185 100644
--- a/lms/static/js/groups/views/cohort_editor.js
+++ b/lms/static/js/groups/views/cohort_editor.js
@@ -54,7 +54,7 @@ var edx = edx || {};
event.preventDefault();
cohortFormView.saveForm()
.done(function() {
- cohortFormView.showMessage(gettext('Saved cohort group.'));
+ cohortFormView.showMessage(gettext('Saved cohort'));
});
},
@@ -145,8 +145,8 @@ var edx = edx || {};
numPresent = modifiedUsers.present.length;
if (numUsersAdded > 0 || numPresent > 0) {
title = interpolate_text(
- ngettext("{numUsersAdded} student has been added to this cohort group",
- "{numUsersAdded} students have been added to this cohort group", numUsersAdded),
+ ngettext("{numUsersAdded} student has been added to this cohort",
+ "{numUsersAdded} students have been added to this cohort", numUsersAdded),
{numUsersAdded: numUsersAdded}
);
@@ -174,8 +174,8 @@ var edx = edx || {};
if (numPresent > 0) {
details.push(
interpolate_text(
- ngettext("{numPresent} student was already in the cohort group",
- "{numPresent} students were already in the cohort group", numPresent),
+ ngettext("{numPresent} student was already in the cohort",
+ "{numPresent} students were already in the cohort", numPresent),
{numPresent: numPresent}
)
);
diff --git a/lms/static/js/groups/views/cohort_form.js b/lms/static/js/groups/views/cohort_form.js
index 6152cedcad..ed9d23decd 100644
--- a/lms/static/js/groups/views/cohort_form.js
+++ b/lms/static/js/groups/views/cohort_form.js
@@ -93,7 +93,7 @@ var edx = edx || {};
var errorMessages;
errorMessages = [];
if (!fieldData.name) {
- errorMessages.push(gettext('You must specify a name for the cohort group'));
+ errorMessages.push(gettext('You must specify a name for the cohort'));
}
if (this.hasAssociatedContentGroup() && fieldData.group_id === null) {
if (this.$('.input-cohort-group-association').val() === 'None') {
@@ -125,8 +125,7 @@ var edx = edx || {};
errorMessages = this.validate(fieldData);
if (errorMessages.length > 0) {
showErrorMessage(
- isUpdate ? gettext("The cohort group cannot be saved")
- : gettext("The cohort group cannot be added"),
+ isUpdate ? gettext("The cohort cannot be saved") : gettext("The cohort cannot be added"),
errorMessages
);
saveOperation.reject();
diff --git a/lms/static/js/groups/views/cohorts.js b/lms/static/js/groups/views/cohorts.js
index 516d592492..4fb202dd28 100644
--- a/lms/static/js/groups/views/cohorts.js
+++ b/lms/static/js/groups/views/cohorts.js
@@ -78,8 +78,8 @@ var edx = edx || {};
additionalCohortControlElement.addClass(hiddenClass);
this.showNotification({
type: 'warning',
- title: gettext('You currently have no cohort groups configured'),
- actionText: gettext('Add Cohort Group'),
+ title: gettext('You currently have no cohorts configured'),
+ actionText: gettext('Add Cohort'),
actionClass: 'action-create',
actionIconClass: 'fa-plus'
});
@@ -182,7 +182,7 @@ var edx = edx || {};
self.showNotification({
type: 'confirmation',
title: interpolate_text(
- gettext('The {cohortGroupName} cohort group has been created. You can manually add students to this group below.'),
+ gettext('The {cohortGroupName} cohort has been created. You can manually add students to this cohort below.'),
{cohortGroupName: newCohort.get('name')}
)
});
@@ -212,7 +212,7 @@ var edx = edx || {};
if (!this.fileUploaderView) {
this.fileUploaderView = new FileUploaderView({
el: uploadElement,
- title: gettext("Assign students to cohort groups by uploading a CSV file."),
+ title: gettext("Assign students to cohorts by uploading a CSV file."),
inputLabel: gettext("Choose a .csv file"),
inputTip: gettext("Only properly formatted .csv files will be accepted."),
submitButtonText: gettext("Upload File and Assign Students"),
diff --git a/lms/static/js/spec/groups/views/cohorts_spec.js b/lms/static/js/spec/groups/views/cohorts_spec.js
index 652c42316e..a4859aab45 100644
--- a/lms/static/js/spec/groups/views/cohorts_spec.js
+++ b/lms/static/js/spec/groups/views/cohorts_spec.js
@@ -153,10 +153,10 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
var requestCount = requests.length,
form, expectedTitle;
if (action === 'add') {
- expectedTitle = 'The cohort group cannot be added';
+ expectedTitle = 'The cohort cannot be added';
form = getAddModal();
} else {
- expectedTitle = 'The cohort group cannot be saved';
+ expectedTitle = 'The cohort cannot be saved';
form = cohortsView.$('.cohort-management-settings-form');
}
form.find('.action-save').click();
@@ -181,9 +181,9 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
it("shows an error if no cohorts are defined", function() {
createCohortsView(this, {cohorts: []});
verifyMessage(
- 'You currently have no cohort groups configured',
+ 'You currently have no cohorts configured',
'warning',
- 'Add Cohort Group'
+ 'Add Cohort'
);
// If no cohorts have been created, can't upload a CSV file.
@@ -210,7 +210,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
expect(cohortsView.$(fileUploadFormCss).length).toBe(0);
uploadCsvToggle = cohortsView.$('.toggle-cohort-management-secondary');
expect(uploadCsvToggle.text()).
- toContain('Assign students to cohort groups by uploading a CSV file');
+ toContain('Assign students to cohorts by uploading a CSV file');
uploadCsvToggle.click();
// After toggle is clicked, it should be hidden.
expect(uploadCsvToggle).toHaveClass('is-hidden');
@@ -294,8 +294,8 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
{ cohorts: createMockCohort(defaultCohortName) }
);
verifyMessage(
- 'The ' + defaultCohortName + ' cohort group has been created.' +
- ' You can manually add students to this group below.',
+ 'The ' + defaultCohortName + ' cohort has been created.' +
+ ' You can manually add students to this cohort below.',
'confirmation'
);
verifyHeader(1, defaultCohortName, 0);
@@ -316,7 +316,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
createCohortsView(this, {selectCohort: 1});
cohortsView.$('.action-create').click();
cohortsView.$('.cohort-name').val(' ');
- saveFormAndExpectErrors('add', ['You must specify a name for the cohort group']);
+ saveFormAndExpectErrors('add', ['You must specify a name for the cohort']);
});
it("shows a message saving when choosing to have content groups but not selecting one", function() {
@@ -333,7 +333,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
cohortsView.$('.cohort-name').val('');
cohortsView.$('.radio-yes').prop('checked', true).change();
saveFormAndExpectErrors('add', [
- 'You must specify a name for the cohort group',
+ 'You must specify a name for the cohort',
'You did not select a cohorted content group'
]);
});
@@ -373,9 +373,9 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
expect(cohortsView.$('.cohort-management-nav')).toHaveClass('is-disabled');
cohortsView.$('.action-cancel').click();
verifyMessage(
- 'You currently have no cohort groups configured',
+ 'You currently have no cohorts configured',
'warning',
- 'Add Cohort Group'
+ 'Add Cohort'
);
});
@@ -385,7 +385,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
// First try to save a blank name to create a message
cohortsView.$('.action-create').click();
cohortsView.$('.cohort-name').val('');
- saveFormAndExpectErrors('add', ['You must specify a name for the cohort group']);
+ saveFormAndExpectErrors('add', ['You must specify a name for the cohort']);
// Now switch to a different cohort
cohortsView.$('.cohort-select').val('2').change();
@@ -399,7 +399,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
// First try to save a blank name to create a message
cohortsView.$('.action-create').click();
cohortsView.$('.cohort-name').val('');
- saveFormAndExpectErrors('add', ['You must specify a name for the cohort group']);
+ saveFormAndExpectErrors('add', ['You must specify a name for the cohort']);
// Now cancel the form
cohortsView.$('.action-cancel').click();
@@ -441,7 +441,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
respondToAdd({ added: ['student@sample.com'] });
respondToRefresh(catLoversUpdatedCount, dogLoversInitialCount);
verifyHeader(1, 'Cat Lovers', catLoversUpdatedCount);
- verifyMessage('1 student has been added to this cohort group', 'confirmation');
+ verifyMessage('1 student has been added to this cohort', 'confirmation');
expect(getStudentInput().val()).toBe('');
});
@@ -508,19 +508,19 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
);
respondToAdd({
changed: [
- {email: 'moved1@sample.com', name: 'moved1', previous_cohort: 'group 2', username: 'moved1'},
- {email: 'moved2@sample.com', name: 'moved2', previous_cohort: 'group 2', username: 'moved2'},
- {email: 'moved3@sample.com', name: 'moved3', previous_cohort: 'group 3', username: 'moved3'}
+ {email: 'moved1@sample.com', name: 'moved1', previous_cohort: 'cohort 2', username: 'moved1'},
+ {email: 'moved2@sample.com', name: 'moved2', previous_cohort: 'cohort 2', username: 'moved2'},
+ {email: 'moved3@sample.com', name: 'moved3', previous_cohort: 'cohort 3', username: 'moved3'}
],
present: ['alreadypresent@sample.com']
});
respondToRefresh();
- verifyDetailedMessage('3 students have been added to this cohort group', 'confirmation',
+ verifyDetailedMessage('3 students have been added to this cohort', 'confirmation',
[
- "2 students were removed from group 2",
- "1 student was removed from group 3",
- "1 student was already in the cohort group"
+ "2 students were removed from cohort 2",
+ "1 student was removed from cohort 3",
+ "1 student was already in the cohort"
]
);
expect(getStudentInput().val()).toBe('');
@@ -546,7 +546,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
addStudents('student@sample.com');
respondToAdd({ added: ['student@sample.com'] });
respondToRefresh(catLoversInitialCount + 1, dogLoversInitialCount);
- verifyMessage('1 student has been added to this cohort group', 'confirmation');
+ verifyMessage('1 student has been added to this cohort', 'confirmation');
});
});
@@ -602,7 +602,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
requests,
createMockCohort('Cat Lovers', 1, catLoversInitialCount, 0, 0)
);
- verifyMessage('Saved cohort group.', 'confirmation');
+ verifyMessage('Saved cohort', 'confirmation');
});
it("can clear selected content group", function () {
@@ -630,7 +630,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
requests,
createMockCohort('Cat Lovers', 1, catLoversInitialCount, 0, 0)
);
- verifyMessage('Saved cohort group.', 'confirmation');
+ verifyMessage('Saved cohort', 'confirmation');
});
it("shows a message saving when choosing to have content groups but not selecting one", function() {
@@ -662,7 +662,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
requests,
createMockCohort('Cat Lovers', 1, catLoversInitialCount, 0, 0)
);
- verifyMessage('Saved cohort group.', 'confirmation');
+ verifyMessage('Saved cohort', 'confirmation');
// Verify that the deleted content group and associated message have been removed
expect(cohortsView.$('option.option-unavailable').text().trim()).toBe('');
@@ -693,7 +693,7 @@ define(['backbone', 'jquery', 'js/common_helpers/ajax_helpers', 'js/common_helpe
expect(cohortsView.$('.radio-yes').prop('disabled')).toBeTruthy();
message = cohortsView.$('.msg-inline').text().trim();
expect(message).toContain('Warning: No content groups exist.');
- expect(message).toContain('Create a content group to associate with cohort groups.');
+ expect(message).toContain('Create a content group to associate with cohorts.');
expect(message).toContain('Create a content group');
expect(
cohortsView.$('.msg-inline a').attr('href'),
diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss
index 2fa3016600..a70993de8f 100644
--- a/lms/static/sass/course/instructor/_instructor_2.scss
+++ b/lms/static/sass/course/instructor/_instructor_2.scss
@@ -540,7 +540,7 @@
}
}
- // create or edit cohort group
+ // create or edit cohort
.cohort-management-settings,
.cohort-management-edit {
@extend %cohort-management-form;
@@ -567,7 +567,7 @@
}
}
- // cohort group
+ // cohort
.cohort-management-group-header {
padding: $baseline;
border-bottom: ($baseline/10) solid $gray-l4;
diff --git a/lms/templates/courseware/legacy_instructor_dashboard.html b/lms/templates/courseware/legacy_instructor_dashboard.html
index 87a3d716b7..9fbe0b3fff 100644
--- a/lms/templates/courseware/legacy_instructor_dashboard.html
+++ b/lms/templates/courseware/legacy_instructor_dashboard.html
@@ -373,7 +373,7 @@ function goto( mode)
%if modeflag.get('Manage Groups'):
%if instructor_access:
%if course.is_cohorted:
-
${_("To manage beta tester roles and cohort groups, visit the Membership section of the Instructor Dashboard.")}
+
${_("To manage beta tester roles and cohorts, visit the Membership section of the Instructor Dashboard.")}
%else:
${_("To manage beta tester roles, visit the Membership section of the Instructor Dashboard.")}
- ${_("Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort group.")}
+ ${_("Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort.")}
<% if (cohort.get('assignment_type') == "none") { %>
- <%- gettext("Students are added to this cohort group only when you provide their email addresses or usernames on this page.") %>
+ <%- gettext("Students are added to this cohort only when you provide their email addresses or usernames on this page.") %>
<%= gettext("What does this mean?") %>
<% } else { %>
- <%- gettext("Students are added to this cohort group automatically.") %>
+ <%- gettext("Students are added to this cohort automatically.") %>
<%- gettext("What does this mean?") %>
<% } %>