L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-77878-401-enfix' of https://github.com/vmdef/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Paul Holden
2023-04-17 19:12:36 +01:00
parent cbfde8c11a 1265b0ad84
commit 242ecbf7f3
12 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/admin.php
+2 -2
View File
@@ -383,7 +383,7 @@ $string['configstripalltitletags'] = 'Uncheck this setting to allow HTML tags in
$string['configsupportavailability'] = 'Determines who has access to contact site support from the footer.';
$string['configsupportemail'] = 'If SMTP is configured on this site and a support page is not set, this email address will receive messages submitted through the support form. If sending fails, the email address will be displayed to logged-in users.';
$string['configsupportname'] = 'The name of the person or other entity providing support via the support form or support page.';
$string['configsupportpage'] = 'A link to this page will be provided for users to contact the site support. If the field is left blank then a link to a support form will be provided instead.';
$string['configsupportpage'] = 'Enter the URL of a support page or leave empty to link to a contact form.';
$string['configtempdatafoldercleanup'] = 'Remove temporary data files from the data folder that are older than the selected time.';
$string['configthemedesignermode'] = 'Normally all theme images and style sheets are cached in browsers and on the server for a very long time, for performance. If you are designing themes or developing code then you probably want to turn this mode on so that you are not served cached versions. Warning: this will make your site slower for all users! Alternatively, you can also reset the theme caches manually from the Theme selection page.';
$string['configthemelist'] = 'Leave this blank to allow any valid theme to be used. If you want to shorten the theme menu, you can specify a comma-separated list of names here (Don\'t use spaces!).
@@ -1301,7 +1301,7 @@ $string['supportemail'] = 'Support email';
$string['supportemailsubject'] = 'Site support request - {$a}';
$string['supportavailability'] = 'Support availability';
$string['supportname'] = 'Support name';
$string['supportpage'] = 'Support page';
$string['supportpage'] = 'Contact site support link';
$string['suspenduser'] = 'Suspend user account';
$string['switchlang'] = 'Switch lang directory';
$string['systempaths'] = 'System paths';
lang/en/block.php
+1 -1
View File
@@ -41,7 +41,7 @@ $string['defaultweight_help'] = 'The default weight allows you to choose roughly
$string['deletecheck'] = 'Delete {$a} block?';
$string['deletecheck_modal'] = 'Delete block?';
$string['deleteblock'] = 'Delete {$a} block';
$string['deleteblockcheck'] = 'Are you sure that you want to delete this block titled {$a}?';
$string['deleteblockcheck'] = 'This will delete the block {$a}.';
$string['deleteblockinprogress'] = 'Block {$a} removal in progress...';
$string['deleteblockwarning'] = '<p>You are about to delete a block that appears elsewhere.</p><p>Original block location: {$a->location}<br />Display on page types: {$a->pagetype}</p><p>Are you sure you want to continue?</p>';
$string['hideblock'] = 'Hide {$a} block';
lang/en/enrol.php
+1 -1
View File
@@ -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';
lang/en/question.php
+3 -3
View File
@@ -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';
mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php
+2 -2
View File
@@ -431,7 +431,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.';
@@ -513,7 +513,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}';
mod/bigbluebuttonbn/tests/behat/join_meeting.feature
+2 -2
View File
@@ -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"
mod/quiz/lang/en/quiz.php
+2 -3
View File
@@ -732,9 +732,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: <br />{$a->quiznames}<br />The question will not be deleted from these quizzes but only from the category list.';
$string['questionmissing'] = 'Question for this session is missing';
$string['questionname'] = 'Question name';
mod/quiz/tests/behat/quiz_question_versions.feature
+1 -1
View File
@@ -120,7 +120,7 @@ Feature: Quiz question versioning
And I am on the "Quiz 1" "mod_quiz > Question bank" page logged in as teacher
And I set the field "question_status_dropdown" in the "First question" "table_row" to "Draft"
When I am on the "Quiz 1" "mod_quiz > Edit" page
Then I should see "This question has all versions in Draft status. The quiz will not work with this question in place."
Then I should see "This question is in draft status. To use it in the quiz, go to the question bank and change the status to ready."
@javascript
Scenario: Previewing a question set to use always latest version will set the preview to always latest version
question/bank/previewquestion/lang/en/qbank_previewquestion.php
+2 -3
View File
@@ -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)';
question/bank/previewquestion/tests/behat/preview_question.feature
+2 -2
View File
@@ -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)"
question/bank/viewquestiontext/tests/behat/view_question_name_column.feature
+4 -4
View File
@@ -19,19 +19,19 @@ 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
question/tests/behat/sort_questions.feature
+1 -1
View File
@@ -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"