Commit 7e99daac by Christina Roberts Committed by GitHub

Merge pull request #14921 from edx/christina/choose-one

Change "Choose one" to "Select a group type".
parents bd2025d6 5e14a356
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
// Get the selected user partition (only allowed to select one). // Get the selected user partition (only allowed to select one).
partitionId = parseInt(element.find('.partition-visibility select').val(), 10); partitionId = parseInt(element.find('.partition-visibility select').val(), 10);
// "All Learners and Staff" is selected (or "Choose one", which is only shown when // "All Learners and Staff" is selected (or "Select a group type", which is only shown when
// current visibility is "All Learners and Staff" at the time the dialog is opened). // current visibility is "All Learners and Staff" at the time the dialog is opened).
if (partitionId === -1) { if (partitionId === -1) {
return {}; return {};
......
...@@ -67,7 +67,7 @@ is_staff_locked = ancestor_has_staff_lock(xblock) ...@@ -67,7 +67,7 @@ is_staff_locked = ancestor_has_staff_lock(xblock)
<select> <select>
<option value="-1" selected ="selected"> <option value="-1" selected ="selected">
% if selected_partition_index == -1: % if selected_partition_index == -1:
${_('Choose one')} ${_('Select a group type')}
% else: % else:
${_('All Learners and Staff')} ${_('All Learners and Staff')}
% endif % endif
......
...@@ -319,7 +319,7 @@ class EditContainerTest(NestedVerticalTest): ...@@ -319,7 +319,7 @@ class EditContainerTest(NestedVerticalTest):
class BaseGroupConfigurationsTest(ContainerBase): class BaseGroupConfigurationsTest(ContainerBase):
ALL_LEARNERS_AND_STAFF = ComponentVisibilityEditorView.ALL_LEARNERS_AND_STAFF ALL_LEARNERS_AND_STAFF = ComponentVisibilityEditorView.ALL_LEARNERS_AND_STAFF
CHOOSE_ONE = "Choose one" CHOOSE_ONE = "Select a group type"
CONTENT_GROUP_PARTITION = ComponentVisibilityEditorView.CONTENT_GROUP_PARTITION CONTENT_GROUP_PARTITION = ComponentVisibilityEditorView.CONTENT_GROUP_PARTITION
ENROLLMENT_TRACK_PARTITION = ComponentVisibilityEditorView.ENROLLMENT_TRACK_PARTITION ENROLLMENT_TRACK_PARTITION = ComponentVisibilityEditorView.ENROLLMENT_TRACK_PARTITION
MISSING_GROUP_LABEL = 'Deleted Group\nThis group no longer exists. Choose another group or make this component visible to All Learners and Staff.' MISSING_GROUP_LABEL = 'Deleted Group\nThis group no longer exists. Choose another group or make this component visible to All Learners and Staff.'
...@@ -405,7 +405,7 @@ class BaseGroupConfigurationsTest(ContainerBase): ...@@ -405,7 +405,7 @@ class BaseGroupConfigurationsTest(ContainerBase):
visibility_editor.select_groups_in_partition_scheme(partition_label, groups) visibility_editor.select_groups_in_partition_scheme(partition_label, groups)
# Re-open the modal and inspect its selected inputs. If no groups were selected, # Re-open the modal and inspect its selected inputs. If no groups were selected,
# "All Learners" should be selected partitions scheme, and we show "Choose one" in the select. # "All Learners" should be selected partitions scheme, and we show "Select a group type" in the select.
if not groups: if not groups:
partition_label = self.CHOOSE_ONE partition_label = self.CHOOSE_ONE
visibility_editor = self.edit_component_visibility(component) visibility_editor = self.edit_component_visibility(component)
......
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