Serious configuration error detected, please notify server administrator.
To operate properly, Moodle requires that administrator changes PHP settings.
session.auto_start must be set to off.
This setting is controlled by editing php.ini, Apache/IIS
configuration or .htaccess file on the server.
You are about to delete a block that appears elsewhere.
Original block location: {$a->location}
Display on page types: {$a->pagetype}
Are you sure you want to continue?
'; $string['hideblock'] = 'Hide {$a} block'; diff --git a/lang/en/courseformat.php b/lang/en/courseformat.php index d7f1bca111c..41e5e4400b2 100644 --- a/lang/en/courseformat.php +++ b/lang/en/courseformat.php @@ -33,15 +33,15 @@ $string['bulkcancel'] = 'Close bulk edit'; $string['bulkselection'] = '{$a} selected'; $string['bulkselection_plural'] = '{$a} selected'; $string['cmavailability'] = 'Activity availability'; -$string['cmdelete_info'] = 'This will delete "{$a->name}" and any user data it contains'; +$string['cmdelete_info'] = 'This will delete {$a->name} and any user data it contains.'; $string['cmdelete_title'] = 'Delete activity?'; $string['cmsdelete'] = 'Delete activities'; -$string['cmsdelete_info'] = 'This will delete {$a->count} activities and any user data they contain'; +$string['cmsdelete_info'] = 'This will delete {$a->count} activities and any user data they contain.'; $string['cmsdelete_title'] = 'Delete selected activities?'; $string['cmsduplicate'] = 'Duplicate activities'; $string['cmsmove'] = 'Move activities'; $string['cmmove_title'] = 'Move activity'; -$string['cmmove_info'] = 'Move "{$a}" activity after'; +$string['cmmove_info'] = 'Move {$a} after'; $string['cmsmove_title'] = 'Move selected activities'; $string['cmsmove_info'] = 'Move {$a} activities after'; $string['courseindex'] = 'Course index'; @@ -49,12 +49,12 @@ $string['nobulkaction'] = 'No bulk actions available'; $string['preference:coursesectionspreferences'] = 'Section user preferences for course {$a}'; $string['privacy:metadata:preference:coursesectionspreferences'] = 'Section user preferences like collapsed and expanded.'; $string['sectionavailability_title'] = 'Section availability'; -$string['sectiondelete_info'] = 'This will delete "{$a->name}" and all the activities it contains.'; +$string['sectiondelete_info'] = 'This will delete {$a->name} and all the activities it contains.'; $string['sectiondelete_title'] = 'Delete section?'; $string['sectionsavailability'] = 'Sections availability'; $string['sectionsavailability_title'] = 'Sections availability'; $string['sectionsdelete'] = 'Delete sections'; -$string['sectionmove_info'] = 'Move "{$a}" after'; +$string['sectionmove_info'] = 'Move {$a} after'; $string['sectionmove_title'] = 'Move section'; $string['sectionsdelete_info'] = 'This will delete {$a->count} sections and all the activities they contain.'; $string['sectionsdelete_title'] = 'Delete selected sections?'; diff --git a/lang/en/enrol.php b/lang/en/enrol.php index 3d2b5854dfd..f3243be8736 100644 --- a/lang/en/enrol.php +++ b/lang/en/enrol.php @@ -84,7 +84,7 @@ $string['errorthresholdlow'] = 'Notification threshold must be at least 1 day.'; $string['errorwithbulkoperation'] = 'There was an error while processing your bulk enrolment change.'; $string['eventuserenrolmentcreated'] = 'User enrolled in course'; $string['eventuserenrolmentdeleted'] = 'User unenrolled from course'; -$string['eventuserenrolmentupdated'] = 'User unenrolment updated'; +$string['eventuserenrolmentupdated'] = 'User enrolment updated'; $string['expirynotify'] = 'Notify before enrolment expires'; $string['expirynotify_help'] = 'This setting determines whether enrolment expiry notification messages are sent.'; $string['expirynotifyall'] = 'Enroller and enrolled user'; diff --git a/lang/en/error.php b/lang/en/error.php index 73aa93130b4..a2593a71218 100644 --- a/lang/en/error.php +++ b/lang/en/error.php @@ -240,7 +240,7 @@ $string['duplicateparaminsql'] = 'ERROR: duplicate parameter name in query'; $string['duplicaterolename'] = 'There is already a role with this name!'; $string['duplicateroleshortname'] = 'There is already a role with this short name!'; $string['duplicateusername'] = 'Duplicate username - skipping record'; -$string['editedpagenotfound'] = 'Could not determine the current page. Please try refreshing the page and repeating the operation.'; +$string['editedpagenotfound'] = 'The system couldn\'t determine the page you are on. Please refresh the page and try again.'; $string['emailfail'] = 'Emailing failed'; $string['encryption_encryptfailed'] = 'Encryption failed'; $string['encryption_decryptfailed'] = 'Decryption failed'; diff --git a/lang/en/group.php b/lang/en/group.php index 645b8e55f21..d6dd0656154 100644 --- a/lang/en/group.php +++ b/lang/en/group.php @@ -174,14 +174,8 @@ $string['nummembers'] = 'Members per group'; $string['mygroups'] = 'My groups'; $string['othergroups'] = 'Other groups'; $string['overview'] = 'Overview'; -$string['participation'] = 'Allow activity participation'; -$string['participation_help'] = 'If enabled, members can select this group when participating in an activity using Separate Groups -or Visible Groups mode. - -This setting is only applicable if the Group visibility is set to "Visible to all" or "Visible to members". Participation is -disabled otherwise. - -This setting cannot be edited once a group has members.'; +$string['participation'] = 'Show group in dropdown menu for activities in group mode'; +$string['participation_help'] = 'Should group members be able to select this group for activities in separate or visible groups mode? (Only applicable if group membership is visible to everyone or only visible to members.)'; $string['potentialmembers'] = 'Potential members: {$a}'; $string['potentialmembs'] = 'Potential members'; $string['printerfriendly'] = 'Printer-friendly display'; @@ -206,25 +200,19 @@ $string['toomanygroups'] = 'Insufficient users to populate this number of groups $string['usercount'] = 'User count'; $string['usercounttotal'] = 'User count ({$a})'; $string['usergroupmembership'] = 'Selected user\'s membership:'; -$string['visibility'] = 'Group visibility'; -$string['visibility_help'] = 'Controls the visibility of membership to this group. +$string['visibility'] = 'Group membership visibility'; +$string['visibility_help'] = '* Visible to everyone - all course participants can view who is in the group +* Only visible to members - course participants not in the group can’t view the group or its members +* Only see own membership - a user can see they are in the group but can’t view other group members +* Hidden - only teachers can view the group and its members -If "Visible to all" is set, all users can see when a user is a member of this group (default). +Users with the view hidden groups capability can always view group membership. -If "Visible to members" is set, only members of this group can see when another user is a member. - -If "See own membership" is set, users can see that they are in this group, but cannot see that other users are members of the group. - -If "Membership is hidden" is set, users cannot see that they or anyone else are members of the group. - -Users with moodle/course:viewhiddengroups will always be able to see group membership. - -This setting cannot be edited once a group has members. -'; -$string['visibilityall'] = 'Visible to all'; -$string['visibilitymembers'] = 'Visible to members'; -$string['visibilityown'] = 'See own membership'; -$string['visibilitynone'] = 'Membership is hidden'; +Note that you can\'t change this setting if the group has members.'; +$string['visibilityall'] = 'Visible to everyone'; +$string['visibilitymembers'] = 'Only visible to members'; +$string['visibilityown'] = 'Only see own membership'; +$string['visibilitynone'] = 'Hidden'; $string['memberofgroup'] = 'Group member of: {$a}'; // Deprecated since Moodle 3.11. diff --git a/lang/en/question.php b/lang/en/question.php index c0e008ad19b..0c140328404 100644 --- a/lang/en/question.php +++ b/lang/en/question.php @@ -460,10 +460,10 @@ $string['settingsformultipletries'] = 'Multiple tries'; $string['showhidden'] = 'Also show old questions'; $string['showmarkandmax'] = 'Show mark and max'; $string['showmaxmarkonly'] = 'Show max mark only'; -$string['showquestiontext'] = 'Show question text in the question list'; -$string['showquestiontext_full'] = 'Full display'; +$string['showquestiontext'] = 'Show question text in the question list?'; +$string['showquestiontext_full'] = 'Yes, with images, media, etc.'; $string['showquestiontext_off'] = 'No'; -$string['showquestiontext_plain'] = 'Text only'; +$string['showquestiontext_plain'] = 'Yes, text only'; $string['shown'] = 'Shown'; $string['shownumpartscorrect'] = 'Show the number of correct responses'; $string['shownumpartscorrectwhenfinished'] = 'Show the number of correct responses once the question has finished'; diff --git a/lang/en/xapi.php b/lang/en/xapi.php index d92131387ba..d27e3a278d6 100644 --- a/lang/en/xapi.php +++ b/lang/en/xapi.php @@ -27,7 +27,7 @@ $string['privacy:metadata:component'] = 'The component name in frankenstyle'; $string['privacy:metadata:itemid'] = 'The item ID of the state'; $string['privacy:metadata:registration'] = 'The xAPI registration UUID'; $string['privacy:metadata:statedata'] = 'JSON object with the state data'; -$string['privacy:metadata:stateid'] = 'The xAPI state id.'; +$string['privacy:metadata:stateid'] = 'The xAPI state ID'; $string['privacy:metadata:timecreated'] = 'The time when the state element was created'; $string['privacy:metadata:timemodified'] = 'The last time state was updated'; $string['privacy:metadata:userid'] = 'The ID of the user who belongs the state '; diff --git a/lib/editor/tiny/lang/en/editor_tiny.php b/lib/editor/tiny/lang/en/editor_tiny.php index 45713a2ba19..7ecf08b8595 100644 --- a/lib/editor/tiny/lang/en/editor_tiny.php +++ b/lib/editor/tiny/lang/en/editor_tiny.php @@ -28,8 +28,8 @@ $string['settings'] = 'General settings'; $string['privacy:reason'] = 'The TinyMCE editor does not store any preferences or user data.'; $string['branding'] = 'TinyMCE branding'; $string['branding_desc'] = 'Support TinyMCE by displaying the logo in the bottom corner of the text editor. The logo links to the TinyMCE website.'; -$string['plugin_enabled'] = 'The {$a} plugin has been enabled.'; -$string['plugin_disabled'] = 'The {$a} plugin has been disabled.'; +$string['plugin_enabled'] = '{$a} enabled.'; +$string['plugin_disabled'] = '{$a} disabled.'; $string['tiny:hash'] = '#'; $string['tiny:accessibility'] = 'Accessibility'; $string['tiny:action'] = 'Action'; diff --git a/lib/editor/tiny/tests/behat/manage_subplugins.feature b/lib/editor/tiny/tests/behat/manage_subplugins.feature index c8d780ac127..895f9b83f81 100644 --- a/lib/editor/tiny/tests/behat/manage_subplugins.feature +++ b/lib/editor/tiny/tests/behat/manage_subplugins.feature @@ -8,23 +8,23 @@ Feature: An administrator can manage TinyMCE subplugins Scenario: An administrator can control the enabled state of TinyMCE subplugins using JavaScript Given I am logged in as "admin" And I navigate to "Plugins > Text editors > TinyMCE editor > General settings" in site administration - When I click on "Disable the Tiny equation editor plugin" "link" - Then I should see "The Tiny equation editor plugin has been disabled" - And "Disable the Tiny equation editor plugin" "link" should not exist - But "Enable the Tiny equation editor plugin" "link" should exist - When I click on "Enable the Tiny equation editor plugin" "link" - Then I should see "The Tiny equation editor plugin has been enabled" - And "Enable the Tiny equation editor plugin" "link" should not exist - But "Disable the Tiny equation editor plugin" "link" should exist + When I click on "Disable Tiny equation editor" "link" + Then I should see "Tiny equation editor disabled." + And "Disable Tiny equation editor" "link" should not exist + But "Enable Tiny equation editor" "link" should exist + When I click on "Enable Tiny equation editor" "link" + Then I should see "Tiny equation editor enabled." + And "Enable Tiny equation editor" "link" should not exist + But "Disable Tiny equation editor" "link" should exist Scenario: An administrator can control the enabled state of TinyMCE subplugins without JavaScript Given I am logged in as "admin" And I navigate to "Plugins > Text editors > TinyMCE editor > General settings" in site administration - When I click on "Disable the Tiny equation editor plugin" "link" - Then I should see "The Tiny equation editor plugin has been disabled" - And "Disable the Tiny equation editor plugin" "link" should not exist - But "Enable the Tiny equation editor plugin" "link" should exist - When I click on "Enable the Tiny equation editor plugin" "link" - Then I should see "The Tiny equation editor plugin has been enabled" - And "Enable the Tiny equation editor plugin" "link" should not exist - But "Disable the Tiny equation editor plugin" "link" should exist + When I click on "Disable Tiny equation editor" "link" + Then I should see "Tiny equation editor disabled." + And "Disable Tiny equation editor" "link" should not exist + But "Enable Tiny equation editor" "link" should exist + When I click on "Enable Tiny equation editor" "link" + Then I should see "Tiny equation editor enabled." + And "Enable Tiny equation editor" "link" should not exist + But "Disable Tiny equation editor" "link" should exist diff --git a/mod/assign/tests/behat/assign_group_override.feature b/mod/assign/tests/behat/assign_group_override.feature index 5ffffad3c34..9fe42080e40 100644 --- a/mod/assign/tests/behat/assign_group_override.feature +++ b/mod/assign/tests/behat/assign_group_override.feature @@ -241,19 +241,19 @@ Feature: Assign group override Scenario: "Not visible" groups should not be available for group overrides Given the following "groups" exist: | name | course | idnumber | visibility | participation | - | Visible to all/Participation | C1 | VP | 0 | 1 | - | Visible to members/Participation | C1 | MP | 1 | 1 | - | See own membership | C1 | O | 2 | 0 | + | Visible to everyone/Participation | C1 | VP | 0 | 1 | + | Only visible to members/Participation | C1 | MP | 1 | 1 | + | Only see own membership | C1 | O | 2 | 0 | | Not visible | C1 | N | 3 | 0 | - | Visible to all/Non-Participation | C1 | VN | 0 | 0 | - | Visible to members/Non-Participation | C1 | MN | 1 | 0 | + | Visible to everyone/Non-Participation | C1 | VN | 0 | 0 | + | Only visible to members/Non-Participation | C1 | MN | 1 | 0 | When I am on the "Test assignment name" Activity page logged in as teacher1 And I navigate to "Overrides" in current page administration And I select "Group overrides" from the "jump" singleselect And I press "Add group override" - Then I should see "Visible to all/Participation" in the "Override group" "select" - And I should see "Visible to all/Non-Participation" in the "Override group" "select" - And I should see "Visible to members" in the "Override group" "select" - And I should see "Visible to members/Non-Participation" in the "Override group" "select" - And I should see "See own membership" in the "Override group" "select" + Then I should see "Visible to everyone/Participation" in the "Override group" "select" + And I should see "Visible to everyone/Non-Participation" in the "Override group" "select" + And I should see "Only visible to members" in the "Override group" "select" + And I should see "Only visible to members/Non-Participation" in the "Override group" "select" + And I should see "Only see own membership" in the "Override group" "select" And I should not see "Not visible" in the "Override group" "select" diff --git a/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php b/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php index cdcd5eff812..689ffd080b6 100644 --- a/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php +++ b/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php @@ -150,9 +150,8 @@ $string['config_server_url_description'] = 'The default credentials are for a '; $string['config_shared_secret'] = 'BigBlueButton shared secret'; $string['config_shared_secret_description'] = 'The security secret of your BigBlueButton server. The default secret is for a free BigBlueButton service provided by Blindside Networks.'; -$string['config_checksum_algorithm'] = 'BigBlueButton Checksum Algorithm'; -$string['config_checksum_algorithm_description'] = 'The checksum algorithm of your BigBlueButton server. - (SHA1 guarantees compatibility with older server versions but is less secure whereas SHA512 is FIPS 140-2 compliant.)'; +$string['config_checksum_algorithm'] = 'BigBlueButton server checksum algorithm'; +$string['config_checksum_algorithm_description'] = 'SHA1 is compatible with older servers. SHA256 and SHA512 are more secure. SHA512 is FIPS 140-2 compliant.'; $string['config_recording'] = 'Recording'; $string['config_recording_description'] = 'These settings are feature specific'; @@ -443,7 +442,7 @@ $string['view_error_unable_join'] = 'Unable to enter the room. Please check the $string['view_error_bigbluebutton'] = 'BigBlueButton responded with errors. {$a}'; $string['view_error_create'] = 'The BigBlueButton server responded with an error message. The room could not be created.'; $string['view_error_max_concurrent'] = 'The number of concurrent sessions allowed has been reached.'; -$string['view_error_userlimit_reached'] = 'The number of users allowed in a session has been reached.'; +$string['view_error_userlimit_reached'] = 'The limit of how many users allowed in a session has been reached.'; $string['view_error_url_missing_parameters'] = 'There are parameters missing in this URL'; $string['view_error_import_no_courses'] = 'There are no courses to look up for recordings.'; $string['view_error_import_no_recordings'] = 'There are no recordings in this course for importing.'; @@ -525,7 +524,7 @@ $string['view_message_conference_not_started'] = 'The session has not started ye $string['view_message_conference_wait_for_moderator'] = 'Waiting for a moderator to join.'; $string['view_message_conference_in_progress'] = 'The session is in progress.'; $string['view_message_conference_has_ended'] = 'The session has ended.'; -$string['view_message_conference_user_limit_reached'] = 'The number of users allowed in a session has been reached'; +$string['view_message_conference_user_limit_reached'] = 'The limit of how many users allowed in a session has been reached.'; $string['view_message_tab_close'] = 'This tab/window must be closed manually'; $string['view_message_recordings_disabled'] = 'Recordings are disabled on the server. BigBlueButton activities of type \'Recordings only\' cannot be used.'; $string['view_message_cron_disabled'] = 'The list of recordings may not be up to date. Please contact the site administrator with the following information: {$a}'; diff --git a/mod/bigbluebuttonbn/tests/behat/join_meeting.feature b/mod/bigbluebuttonbn/tests/behat/join_meeting.feature index 08028bbb1c1..9a6e39cde8a 100644 --- a/mod/bigbluebuttonbn/tests/behat/join_meeting.feature +++ b/mod/bigbluebuttonbn/tests/behat/join_meeting.feature @@ -58,8 +58,8 @@ Feature: Test the ability to run the full meeting lifecycle (start to end) And I log out Then I am on the "Room recordings" Activity page logged in as vraverst Then "Join session" "link" should not exist - And I should see "The number of users allowed in a session has been reached" + And I should see "The limit of how many users allowed in a session has been reached" And I log out Then I am on the "Room recordings" Activity page logged in as admin Then "Join session" "link" should not exist - And I should see "The number of users allowed in a session has been reached" + And I should see "The limit of how many users allowed in a session has been reached" diff --git a/mod/lesson/tests/behat/lesson_group_override.feature b/mod/lesson/tests/behat/lesson_group_override.feature index d44888dc0e9..639a61c901b 100644 --- a/mod/lesson/tests/behat/lesson_group_override.feature +++ b/mod/lesson/tests/behat/lesson_group_override.feature @@ -373,19 +373,19 @@ Feature: Lesson group override Scenario: "Not visible" groups should not be available for group overrides Given the following "groups" exist: | name | course | idnumber | visibility | participation | - | Visible to all/Participation | C1 | VP | 0 | 1 | - | Visible to members/Participation | C1 | MP | 1 | 1 | - | See own membership | C1 | O | 2 | 0 | + | Visible to everyone/Participation | C1 | VP | 0 | 1 | + | Only Only visible to members/Participation | C1 | MP | 1 | 1 | + | Only see own membership | C1 | O | 2 | 0 | | Not visible | C1 | N | 3 | 0 | - | Visible to all/Non-Participation | C1 | VN | 0 | 0 | - | Visible to members/Non-Participation | C1 | MN | 1 | 0 | + | Visible to everyone/Non-Participation | C1 | VN | 0 | 0 | + | Only visible to members/Non-Participation | C1 | MN | 1 | 0 | When I am on the "lesson1" Activity page logged in as teacher1 And I navigate to "Overrides" in current page administration And I select "Group overrides" from the "jump" singleselect And I follow "Add group override" - Then I should see "Visible to all/Participation" in the "Override group" "select" - And I should see "Visible to all/Non-Participation" in the "Override group" "select" - And I should see "Visible to members" in the "Override group" "select" - And I should see "Visible to members/Non-Participation" in the "Override group" "select" - And I should see "See own membership" in the "Override group" "select" + Then I should see "Visible to everyone/Participation" in the "Override group" "select" + And I should see "Visible to everyone/Non-Participation" in the "Override group" "select" + And I should see "Only visible to members" in the "Override group" "select" + And I should see "Only visible to members/Non-Participation" in the "Override group" "select" + And I should see "Only see own membership" in the "Override group" "select" And I should not see "Not visible" in the "Override group" "select" diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php index 62f2fd08253..87e71d3057b 100644 --- a/mod/quiz/lang/en/quiz.php +++ b/mod/quiz/lang/en/quiz.php @@ -371,7 +371,7 @@ $string['eventpagebreakdeleted'] = 'Page break deleted'; $string['eventquestionmanuallygraded'] = 'Question manually graded'; $string['eventquizattemptabandoned'] = 'Quiz attempt abandoned'; $string['eventquizattemptregraded'] = 'Quiz attempt regraded'; -$string['eventquizattemptreopened'] = 'Quiz attempt re-openend'; +$string['eventquizattemptreopened'] = 'Quiz attempt reopened'; $string['eventquizattemptstarted'] = 'Quiz attempt started'; $string['eventquizattemptsubmitted'] = 'Quiz attempt submitted'; $string['eventquizattempttimelimitexceeded'] = 'Quiz attempt time limit exceeded'; @@ -736,9 +736,8 @@ $string['questiondependencyadd'] = 'No restriction on when question {$a->thisq} $string['questiondependencyfree'] = 'No restriction on this question'; $string['questiondependencyremove'] = 'Question {$a->thisq} cannot be attempted until the previous question {$a->previousq} has been completed • Click to change'; $string['questiondependsonprevious'] = 'This question cannot be attempted until the previous question has been completed.'; -$string['questiondraftonly'] = 'The question \'{$a}\' has all versions in Draft status, so cannot be used. Visit the question bank and set the status to Ready.'; -$string['questiondraftwillnotwork'] = 'This question has all versions in Draft status. The quiz will not work with this question in place. Remove this question, -or visit the question bank and set the status to Ready.'; +$string['questiondraftonly'] = 'The question {$a} is in draft status. To use it in the quiz, go to the question bank and change the status to ready.'; +$string['questiondraftwillnotwork'] = 'This question is in draft status. To use it in the quiz, go to the question bank and change the status to ready.'; $string['questioninuse'] = 'The question \'{$a->questionname}\' is currently being used in:Are you sure you wish to re-open quiz attempt 1 by ' . fullname($this->student) . - '?
The re-opened attempt will remain open so that it can be continued.
', + $this->assertEquals('This will reopen attempt 1 by ' . fullname($this->student) . + '.
The attempt will remain open and can be continued.
', $message); } @@ -88,8 +88,8 @@ class reopen_attempt_test extends externallib_advanced_testcase { $message = get_reopen_attempt_confirmation::execute($attemptid); - $this->assertEquals('Are you sure you wish to re-open quiz attempt 1 by ' . fullname($this->student) . - '?
The re-opened attempt will remain open so that it can be continued. It will be due for submission by ' . + $this->assertEquals('
This will reopen attempt 1 by ' . fullname($this->student) . + '.
The attempt will remain open and can be continued until the quiz closes on ' . userdate($timeclose) . '.
', $message); } @@ -102,8 +102,8 @@ class reopen_attempt_test extends externallib_advanced_testcase { $message = get_reopen_attempt_confirmation::execute($attemptid); - $this->assertEquals('Are you sure you wish to re-open quiz attempt 1 by ' . fullname($this->student) . - '?
The re-opened attempt will be immediately submitted for grading.
', + $this->assertEquals('This will reopen attempt 1 by ' . fullname($this->student) . + '.
The attempt will be immediately submitted for grading.
', $message); } @@ -120,7 +120,7 @@ class reopen_attempt_test extends externallib_advanced_testcase { public function test_get_reopen_attempt_confirmation_service_checks_attempt_state() { [$attemptid] = $this->create_attempt_at_quiz_with_one_shortanswer_question(quiz_attempt::IN_PROGRESS); - $this->expectExceptionMessage("Attempt $attemptid is in the wrong state (In progress) to be re-openend."); + $this->expectExceptionMessage("Attempt $attemptid is in the wrong state (In progress) to be reopened."); get_reopen_attempt_confirmation::execute($attemptid); } diff --git a/question/bank/previewquestion/lang/en/qbank_previewquestion.php b/question/bank/previewquestion/lang/en/qbank_previewquestion.php index e41c4101dd0..37d2d558057 100644 --- a/question/bank/previewquestion/lang/en/qbank_previewquestion.php +++ b/question/bank/previewquestion/lang/en/qbank_previewquestion.php @@ -24,8 +24,7 @@ */ $string['alwayslatest'] = 'Always latest'; -$string['newerversion'] = 'This preview is using version {$a->currentversion} of this question. ' - . 'The latest version is {$a->latestversion}. {$a->restartbutton}?'; +$string['newerversion'] = 'This preview is using an older version of the question. {$a->restartbutton}'; $string['pluginname'] = 'Preview question'; $string['privacy:metadata'] = 'The Preview question question bank plugin does not store any personal data.'; // Tag related errors. @@ -35,7 +34,7 @@ $string['tagsnotfound'] = 'Tags not found'; // Form string(s). $string['previewoptions'] = 'Preview options'; $string['questionversion'] = 'Question version'; -$string['restartnow'] = 'Restart now'; +$string['restartnow'] = 'Use latest version'; // Preview title. $string['versiontitle'] = 'Version {$a}'; $string['versiontitlelatest'] = 'Version {$a} (latest)'; diff --git a/question/bank/previewquestion/tests/behat/preview_question.feature b/question/bank/previewquestion/tests/behat/preview_question.feature index 9e8392d2f8d..d31c6dc5491 100644 --- a/question/bank/previewquestion/tests/behat/preview_question.feature +++ b/question/bank/previewquestion/tests/behat/preview_question.feature @@ -136,8 +136,8 @@ Feature: A teacher can preview questions in the question bank And I should see "Version 1 (latest)" And I set the field "Answer:" to "3.14" When I press "Submit and finish" - And I should see "This preview is using version 1 of this question. The latest version is 2." - And I press "Restart now" + And I should see "This preview is using an older version of the question." + And I press "Use latest version" Then I should not see "Version 1" And I should see "Version 2 (latest)" diff --git a/question/bank/viewquestiontext/tests/behat/view_question_name_column.feature b/question/bank/viewquestiontext/tests/behat/view_question_name_column.feature index b8b2ec6ad37..04198652a57 100644 --- a/question/bank/viewquestiontext/tests/behat/view_question_name_column.feature +++ b/question/bank/viewquestiontext/tests/behat/view_question_name_column.feature @@ -19,23 +19,23 @@ Feature: Use the qbank plugin manager page for viewquestiontext @javascript Scenario: Display of plain question text can be turned on and off When I am on the "Test quiz" "mod_quiz > question bank" page logged in as admin - And I set the field "Show question text in the question list" to "Text only" + And I set the field "Show question text in the question list?" to "Yes, text only" Then I should see "Answer the first question" And ".totestforhtml" "css_element" should not exist in the "Answer the first question" "table_row" - And I set the field "Show question text in the question list" to "No" + And I set the field "Show question text in the question list?" to "No" And I should not see "Answer the first question" @javascript Scenario: Display of full question text can be turned on and off When I am on the "Test quiz" "mod_quiz > question bank" page logged in as admin - And I set the field "Show question text in the question list" to "Full display" + And I set the field "Show question text in the question list?" to "Yes, with images, media, etc." Then I should see "Answer the first question" And ".totestforhtml" "css_element" should exist in the "Answer the first question" "table_row" - And I set the field "Show question text in the question list" to "No" + And I set the field "Show question text in the question list?" to "No" And I should not see "Answer the first question" Scenario: Option does not show if the plugin is disabled Given the following config values are set as admin: | disabled | 1 | qbank_viewquestiontext | When I am on the "Test quiz" "mod_quiz > question bank" page logged in as admin - Then I should not see "Show question text in the question list" + Then I should not see "Show question text in the question list?" diff --git a/question/tests/behat/sort_questions.feature b/question/tests/behat/sort_questions.feature index ca0f2d7b620..98dd3da47f7 100644 --- a/question/tests/behat/sort_questions.feature +++ b/question/tests/behat/sort_questions.feature @@ -61,7 +61,7 @@ Feature: The questions in the question bank can be sorted in various ways @javascript Scenario: The question text can be shown in the list of questions - When I set the field "Show question text in the question list" to "1" + When I set the field "Show question text in the question list?" to "1" Then I should see "Question 1 text" And I should see "Question 2 text" And I should see "Question 3 text" diff --git a/question/type/ddmarker/lang/en/qtype_ddmarker.php b/question/type/ddmarker/lang/en/qtype_ddmarker.php index c2686701d58..9b11636ba72 100644 --- a/question/type/ddmarker/lang/en/qtype_ddmarker.php +++ b/question/type/ddmarker/lang/en/qtype_ddmarker.php @@ -53,8 +53,8 @@ For information the three shapes use coordinates in this way: Selecting a Marker text will add that text to the shape in the preview.'; $string['formerror_dragrequired'] = 'You must add at least one marker to this question.'; $string['formerror_droprequired'] = 'You must define at least one drop zone for this question.'; -$string['followingarewrong'] = 'The following markers have been placed in the wrong area: {$a}.'; -$string['followingarewrongandhighlighted'] = 'The following markers were incorrectly placed: {$a}. Highlighted marker(s) are now shown with the correct placement(s).