Skip to content

E
edx-platform
Commit bca6274e by Andy Armstrong
Options

Miscellaneous text updates

parent 798342e1
Showing with 24 additions and 26 deletions
cms/lib/xblock/test/test_authoring_mixin.py
......@@ -73,11 +73,11 @@ class AuthoringMixinTestCase(ModuleStoreTestCase):
self.assertIn(string, html)
def test_html_no_partition(self):
self.verify_visibility_view_contains(self.video, 'You have not set up any groups to manage visibility with.')
self.verify_visibility_view_contains(self.video, 'No content groups exist')
def test_html_empty_partition(self):
self.create_content_groups([])
self.verify_visibility_view_contains(self.video, 'You have not set up any groups to manage visibility with.')
self.verify_visibility_view_contains(self.video, 'No content groups exist')
def test_html_populated_partition(self):
self.create_content_groups(self.pet_groups)
......@@ -85,12 +85,12 @@ class AuthoringMixinTestCase(ModuleStoreTestCase):
def test_html_no_partition_staff_locked(self):
self.set_staff_only(self.vertical)
self.verify_visibility_view_contains(self.video, ['You have not set up any groups to manage visibility with.'])
self.verify_visibility_view_contains(self.video, ['No content groups exist'])
def test_html_empty_partition_staff_locked(self):
self.create_content_groups([])
self.set_staff_only(self.vertical)
self.verify_visibility_view_contains(self.video, 'You have not set up any groups to manage visibility with.')
self.verify_visibility_view_contains(self.video, 'No content groups exist')
def test_html_populated_partition_staff_locked(self):
self.create_content_groups(self.pet_groups)
......
cms/templates/js/publish-xblock.underscore
......@@ -80,7 +80,7 @@ var visibleToStaffOnly = visibilityState === 'staff_only';
<% if (hasContentGroupComponents) { %>
<p class="note-visibility">
<i class="icon fa fa-eye" aria-hidden="true"></i>
<span class="note-copy"><%= gettext("Some content in this unit is only visible to particular groups") %></span>
<span class="note-copy"><%= gettext("Some content in this unit is visible only to particular content groups") %></span>
</p>
<% } %>
<ul class="actions-inline">
......
cms/templates/visibility_editor.html
......@@ -15,14 +15,14 @@ is_staff_locked = ancestor_has_staff_lock(xblock)
<div class="modal-section visibility-summary">
% if len(groups) == 0:
<div class="is-not-configured has-actions">
<h4 class="title">${_('You have not set up any groups to manage visibility with.')}</h4>
<h4 class="title">${_('No content groups exist')}</h4>
<div class="copy">
<p>${_('Groups are a way for you to organize content in your course with a particular student experience in mind. They are commonly used to facilitate content and pedagogical experiments as well as provide different tracks of content.')}</p>
<p>${_('Use content groups to give groups of students access to a specific set of course content. Create one or more content groups, and make specific components visible to them.')}</p>
</div>
<div class="actions">
<a href="${manage_groups_url}" class="action action-primary action-settings">${_('Manage groups in this course')}</a>
<a href="${manage_groups_url}" class="action action-primary action-settings">${_('Manage content groups')}</a>
</div>
</div>
% elif is_staff_locked:
......@@ -46,7 +46,7 @@ is_staff_locked = ancestor_has_staff_lock(xblock)
<form class="visibility-controls-form" method="post" action="">
<div class="modal-section visibility-controls">
<h3 class="modal-section-title">${_('Set visibility to:')}</h3>
<h3 class="modal-section-title">${_('Make visible to:')}</h3>
<div class="modal-section-content">
......
common/test/acceptance/tests/discussion/test_cohort_management.py
......@@ -112,8 +112,7 @@ class CohortConfigurationTest(UniqueCourseTest, CohortTestMixin):
self.cohort_management_page.select_cohort(self.manual_cohort_name)
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 cohorts. Create a content group",
"Warning:\nNo content groups exist. 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())
......
common/test/acceptance/tests/lms/test_lms_user_preview.py
......@@ -229,7 +229,7 @@ class StaffDebugTest(CourseWithoutContentGroupsTest):
class CourseWithContentGroupsTest(StaffViewTest):
"""
Verifies that changing the "previewing as" selector works properly for content groups.
Verifies that changing the "View this course as" selector works properly for content groups.
"""
def setUp(self):
......
common/test/acceptance/tests/studio/test_studio_container.py
......@@ -301,7 +301,7 @@ class EditVisibilityModalTest(ContainerBase):
MISSING_GROUP_LABEL = 'Deleted Content Group\nContent group no longer exists. Please choose another or allow access to All Students and staff'
VALIDATION_ERROR_LABEL = 'This component has validation issues.'
VALIDATION_ERROR_MESSAGE = 'Error:\nThis component refers to deleted or invalid content groups.'
GROUP_VISIBILITY_MESSAGE = 'Some content in this unit is only visible to particular groups'
GROUP_VISIBILITY_MESSAGE = 'Some content in this unit is visible only to particular content groups'
def setUp(self):
super(EditVisibilityModalTest, self).setUp()
......@@ -429,7 +429,7 @@ class EditVisibilityModalTest(ContainerBase):
When I go to the container page for that unit
And I open the visibility editor modal for that unit's component
Then the default visibility selection should be 'All Students and Staff'
And the container page should not display 'Some content in this unit is only visible to particular groups'
And the container page should not display the content visibility warning
"""
self.verify_selected_labels(self.edit_component_visibility(self.html_component), [self.VISIBILITY_LABEL_ALL])
self.verify_visibility_set(self.html_component, False)
......@@ -442,12 +442,12 @@ class EditVisibilityModalTest(ContainerBase):
And I open the visibility editor modal for that unit's component
And I select 'Dogs'
And I save the modal
Then the container page should display 'Some content in this unit is only visible to particular groups'
Then the container page should display the content visibility warning
And I re-open the visibility editor modal for that unit's component
And I select 'All Students and Staff'
And I save the modal
Then the visibility selection should be 'All Students and Staff'
And the container page should not display 'Some content in this unit is only visible to particular groups'
And the container page should not display the content visibility warning
"""
self.select_and_verify_saved(self.html_component, ['Dogs'])
self.verify_visibility_set(self.html_component, True)
......@@ -463,7 +463,7 @@ class EditVisibilityModalTest(ContainerBase):
And I select 'Dogs'
And I save the modal
Then the visibility selection should be 'Dogs' and 'Specific Content Groups'
And the container page should display 'Some content in this unit is only visible to particular groups'
And the container page should display the content visibility warning
"""
self.select_and_verify_saved(self.html_component, ['Dogs'])
self.verify_visibility_set(self.html_component, True)
......@@ -477,7 +477,7 @@ class EditVisibilityModalTest(ContainerBase):
And I select 'Dogs' and 'Cats'
And I save the modal
Then the visibility selection should be 'Dogs', 'Cats', and 'Specific Content Groups'
And the container page should display 'Some content in this unit is only visible to particular groups'
And the container page should display the content visibility warning
"""
self.select_and_verify_saved(self.html_component, ['Dogs', 'Cats'])
self.verify_visibility_set(self.html_component, True)
......@@ -492,7 +492,7 @@ class EditVisibilityModalTest(ContainerBase):
And I select 'Specific Content Groups'
And I save the modal
Then the visibility selection should be 'All Students and Staff'
And the container page should not display 'Some content in this unit is only visible to particular groups'
And the container page should not display the content visibility warning
"""
self.select_and_verify_saved(
self.html_component, [self.VISIBILITY_LABEL_SPECIFIC], expected_labels=[self.VISIBILITY_LABEL_ALL]
......@@ -509,12 +509,12 @@ class EditVisibilityModalTest(ContainerBase):
Then I should see a validation error message on that unit's component
And I open the visibility editor modal for that unit's component
Then I should see that I have selected multiple deleted groups
And the container page should display 'Some content in this unit is only visible to particular groups'
And the container page should display the content visibility warning
And I de-select the missing groups
And I save the modal
Then the visibility selection should be 'All Students and Staff'
And I should not see any validation errors on the component
And the container page should not display 'Some content in this unit is only visible to particular groups'
And the container page should not display the content visibility warning
"""
self.update_component(self.html_component, {'group_access': {0: [2, 3]}})
self.verify_component_validation_error(self.html_component)
......@@ -533,12 +533,12 @@ class EditVisibilityModalTest(ContainerBase):
Then I should see a validation error message on that unit's component
And I open the visibility editor modal for that unit's component
Then I should see that I have selected multiple deleted groups
And the container page should display 'Some content in this unit is only visible to particular groups'
And the container page should display the content visibility warning
And I de-select the missing groups
And I save the modal
Then the visibility selection should be the names of the valid groups.
And I should not see any validation errors on the component
And the container page should display 'Some content in this unit is only visible to particular groups'
And the container page should display the content visibility warning
"""
self.update_component(self.html_component, {'group_access': {0: [0, 1, 2, 3]}})
self.verify_component_validation_error(self.html_component)
......
lms/static/js/spec/groups/views/cohorts_spec.js
......@@ -693,7 +693,6 @@ 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 cohorts.');
expect(message).toContain('Create a content group');
expect(
cohortsView.$('.msg-inline a').attr('href'),
......
lms/templates/courseware/course_navigation.html
......@@ -35,7 +35,7 @@ def url_class(is_active):
<ol class="preview-actions">
<li class="action-preview">
<form action="#" class="action-preview-form" method="post">
<label for="action-preview-select" class="action-preview-label">${_("previewing as:")}</label>
<label for="action-preview-select" class="action-preview-label">${_("View this course as:")}</label>
<select class="action-preview-select" id="action-preview-select" name="select">
<option value="staff" ${"selected" if not is_student_masquerade else ""}>${_("Staff")}</option>
<option value="student" ${"selected" if is_student_masquerade and not masquerade_group_id else ""}>${_("Student")}</option>
......
lms/templates/instructor/instructor_dashboard_2/cohort-form.underscore
......@@ -96,7 +96,7 @@
<%=
interpolate(
// Translators: Any text between %(screen_reader_start)s and %(screen_reader_end)s is only read by screen readers and never shown in the browser.
'%(screen_reader_start)sWarning:%(screen_reader_end)s No content groups exist. Create a content group to associate with cohorts.',
'%(screen_reader_start)sWarning:%(screen_reader_end)s No content groups exist.',
{
screen_reader_start: '<span class="sr">',
screen_reader_end: '</span>'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment