Merge branch 'MDL-80725-402-enfix' of https://github.com/mudrd8mz/moodle into MOODLE_402_STABLE

This commit is contained in:
Jun Pataleta
2024-02-06 15:58:50 +08:00
20 changed files with 57 additions and 55 deletions
@@ -22,12 +22,12 @@ Feature: Within a moodle instance, an administrator should be able to modify lan
Scenario: Edit an string but don't save it to lang pack.
When I press "Apply changes and continue editing"
Then I should not see "moodle documents" in the "page-footer" "region"
And I should see "Help and documentation" in the "page-footer" "region"
And I should see "Documentation for this page" in the "page-footer" "region"
@javascript
Scenario: Customize an string as admin and save it to lang pack.
Given I press "Save changes to the language pack"
And I should see "There are 1 modified strings."
When I click on "Continue" "button"
Then I should not see "Help and documentation" in the "page-footer" "region"
Then I should not see "Documentation for this page" in the "page-footer" "region"
And I should see "moodle documents" in the "page-footer" "region"
+1 -1
View File
@@ -88,7 +88,7 @@ Feature: Manage custom reports for cohorts
And I click on "Show/hide 'Sorting'" "button"
And I click on "Move sorting for column 'Last name'" "button"
And I click on "To the top of the list" "link" in the "Move sorting for column 'Last name'" "dialogue"
And I click on "Enable initial sorting for column Last name" "checkbox"
And I click on "Enable initial sorting for column 'Last name'" "checkbox"
# "New system cohort" has fewer members than "Another one" cohort.
And "New system cohort" "table_row" should appear before "Another one" "table_row"
When I click on "Sort column 'Last name' descending" "button"
@@ -35,8 +35,8 @@ $string['pluginname'] = 'Topics format';
$string['privacy:metadata'] = 'The Topics format plugin does not store any personal data.';
$string['indentation'] = 'Allow indentation on course page';
$string['indentation_help'] = 'Allow teachers, and other users with the manage activities capability, to indent items on the course page.';
$string['section_highlight_feedback'] = 'Section {$a->name} is highlighted.';
$string['section_unhighlight_feedback'] = 'Highlight removed from section {$a->name}.';
$string['section_highlight_feedback'] = 'Section {$a->name} highlighted.';
$string['section_unhighlight_feedback'] = 'Highlighting removed from section {$a->name}.';
$string['section0name'] = 'General';
$string['sectionavailability_title'] = 'Topic availability';
$string['sectiondelete_title'] = 'Delete topic?';
+2 -2
View File
@@ -242,7 +242,7 @@ $string['configdisableuserimages'] = 'Disable the ability for users to change us
$string['configdisplayloginfailures'] = 'This will display information to users about previous failed logins.';
$string['configdndallowtextandlinks'] = 'Enable or disable the dragging and dropping of text and links onto a course page, alongside the dragging and dropping of files. Note that the dragging of text into Firefox or between different browsers is unreliable and may result in no data being uploaded, or corrupted text being uploaded.';
$string['configdoclang'] = 'This language will be used in links for the documentation pages.';
$string['configdocroot'] = 'Defines the path to Moodle Docs for providing context-specific documentation via \'Help and documentation\' links in the footer of each page. If the field is left blank, links will not be displayed.';
$string['configdocroot'] = 'Defines the path to Moodle Docs for providing context-specific documentation via \'Documentation for this page\' links in the footer of each page. If the field is left blank, links will not be displayed.';
$string['configdoctonewwindow'] = 'If enabled, then links to Moodle Docs will be shown in a new window.';
$string['configduration_low'] = 'This value is too low. The minimum value is {$a}.';
$string['configduration_high'] = 'This value is too high. The maximum value is {$a}.';
@@ -507,7 +507,7 @@ $string['debugsqltrace_desc'] = 'If enabled, a partial or full PHP stack trace i
$string['debugstringids'] = 'Show origin of languages strings';
$string['debugstringids_desc'] = 'If enabled, language string components and identifiers are displayed when ?strings=1 or &strings=1 is appended to the page URL.';
$string['debugtemplateinfo'] = 'Show template information';
$string['debugtemplateinfo_desc'] = 'If enabled, templates used for rendering are shown as comments in the page HTML. Use for temporary debugging only, as it produces HTML validation errors and could break some page scripts.';
$string['debugtemplateinfo_desc'] = 'If enabled, templates used for rendering are shown as comments in the page HTML. After changing the setting, you need to purge caches. Use for temporary debugging only, as it produces HTML validation errors and can break page scripts. It can also break core functionality!';
$string['debugvalidators'] = 'Show validator links';
$string['defaultcity'] = 'Default city';
$string['defaultcity_help'] = 'A city entered here will be the default city when creating new user accounts.';
+12 -12
View File
@@ -33,14 +33,14 @@ $string['bulkeditingcourse'] = 'Bulk edit course: {$a}';
$string['bulkcancel'] = 'Close bulk edit';
$string['bulkselection'] = '{$a} selected';
$string['bulkselection_plural'] = '{$a} selected';
$string['cm_delete_feedback'] = '{$a->name} has been deleted.';
$string['cm_delete_feedback_batch'] = 'The selected {$a->count} activities have been deleted.';
$string['cm_duplicate_feedback'] = '{$a->name} has been duplicated.';
$string['cm_duplicate_feedback_batch'] = 'The selected {$a->count} activities have been duplicated.';
$string['cm_delete_feedback'] = '{$a->name} deleted.';
$string['cm_delete_feedback_batch'] = 'Selected {$a->count} activities deleted.';
$string['cm_duplicate_feedback'] = '{$a->name} duplicated.';
$string['cm_duplicate_feedback_batch'] = 'Selected {$a->count} activities duplicated.';
$string['cm_hide_feedback'] = '{$a->name} is now hidden.';
$string['cm_hide_feedback_batch'] = 'The selected {$a->count} activities are now hidden.';
$string['cm_moveleft_feedback'] = '{$a->name} has been moved to the left.';
$string['cm_moveright_feedback'] = '{$a->name} has been moved to the right.';
$string['cm_moveleft_feedback'] = '{$a->name} moved left.';
$string['cm_moveright_feedback'] = '{$a->name} moved right.';
$string['cm_show_feedback'] = '{$a->name} is now shown.';
$string['cm_show_feedback_batch'] = 'The selected {$a->count} activities are now shown.';
$string['cm_stealth_feedback'] = '{$a->name} is now available but not shown on the course page.';
@@ -60,12 +60,12 @@ $string['courseindex'] = 'Course index';
$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['section_hide_feedback'] = 'The course section {$a->name} has been hidden.';
$string['section_hide_feedback_batch'] = 'The selected {$a->count} course sections have been hidden.';
$string['section_show_feedback'] = 'The course section {$a->name} has been shown.';
$string['section_show_feedback_batch'] = 'The selected {$a->count} course sections have been shown.';
$string['section_delete_feedback'] = 'The course section {$a->name} has been deleted';
$string['section_delete_feedback_batch'] = 'The selected {$a->count} course sections have been deleted';
$string['section_hide_feedback'] = 'Course section {$a->name} hidden.';
$string['section_hide_feedback_batch'] = 'Selected {$a->count} course sections hidden.';
$string['section_show_feedback'] = 'Course section {$a->name} shown.';
$string['section_show_feedback_batch'] = 'Selected {$a->count} course sections shown.';
$string['section_delete_feedback'] = 'Course section {$a->name} deleted.';
$string['section_delete_feedback_batch'] = 'Selected {$a->count} course sections deleted.';
$string['sectionavailability_title'] = 'Section availability';
$string['sectiondelete_info'] = 'This will delete {$a->name} and all the activities it contains.';
$string['sectiondelete_title'] = 'Delete section?';
+1 -1
View File
@@ -1366,7 +1366,7 @@ $string['modulesetup'] = 'Setting up module tables';
$string['modulesuccess'] = '{$a} tables have been set up correctly';
$string['modulesused'] = 'Modules used';
$string['moodledocs'] = 'Moodle Docs';
$string['moodledocslink'] = 'Help and documentation';
$string['moodledocslink'] = 'Documentation for this page';
$string['moodleversion'] = 'Moodle version';
$string['moodlerelease'] = 'Moodle release';
$string['moodleservicesandsupport'] = 'Services and support';
+2 -2
View File
@@ -65,8 +65,8 @@ $string['columndeleted'] = 'Deleted column \'{$a}\'';
$string['columnmoved'] = 'Moved column \'{$a}\'';
$string['columnsortdirectionasc'] = 'Sort column \'{$a}\' ascending';
$string['columnsortdirectiondesc'] = 'Sort column \'{$a}\' descending';
$string['columnsortdisable'] = 'Disable initial sorting for column {$a}';
$string['columnsortenable'] = 'Enable initial sorting for column {$a}';
$string['columnsortdisable'] = 'Disable initial sorting for column \'{$a}\'';
$string['columnsortenable'] = 'Enable initial sorting for column \'{$a}\'';
$string['columnsortupdated'] = 'Updated sorting for column \'{$a}\'';
$string['conditionadded'] = 'Added condition \'{$a}\'';
$string['conditiondeleted'] = 'Deleted condition \'{$a}\'';
+4 -4
View File
@@ -78,7 +78,7 @@ use core\output\activity_header;
* course table. (Also available as $COURSE global.) If we are not inside
* an actual course, this will be the site course.
* @property-read string $devicetypeinuse The name of the device type in use
* @property-read string $docspath The path to the Help and documentation.
* @property-read string $docspath The path to the Documentation for this page.
* @property-read string $focuscontrol The id of the HTML element to be focused when the page has loaded.
* @property-read bool $headerprinted True if the page header has already been printed.
* @property-read string $heading The main heading that should be displayed at the top of the <body>.
@@ -214,7 +214,7 @@ class moodle_page {
protected $_subpage = '';
/**
* @var string Set a different path to use for the 'Help and documentation' link.
* @var string Set a different path to use for the 'Documentation for this page' link.
* By default, it uses the path of the file for instance mod/quiz/attempt.
*/
protected $_docspath = null;
@@ -658,7 +658,7 @@ class moodle_page {
/**
* Please do not call this method directly, use the ->docspath syntax. {@link moodle_page::__get()}.
* @return string the path to the Help and documentation.
* @return string the path to the Documentation for this page.
*/
protected function magic_get_docspath() {
if (is_string($this->_docspath)) {
@@ -1462,7 +1462,7 @@ class moodle_page {
}
/**
* Set a different path to use for the 'Help and documentation' link.
* Set a different path to use for the 'Documentation for this page' link.
*
* By default, it uses the pagetype, which is normally the same as the
* script name. So, for example, for mod/quiz/attempt.php, pagetype is
+3 -1
View File
@@ -475,7 +475,9 @@ $string['reopenuntilpassincompatiblewithblindmarking'] = 'Reopen until pass opti
$string['requiresubmissionstatement'] = 'Require that students accept the submission statement';
$string['requiresubmissionstatement_help'] = 'Require that students accept the submission statement for all submissions to this assignment.';
$string['requireallteammemberssubmit'] = 'Require all group members submit';
$string['requireallteammemberssubmit_help'] = 'If enabled, all members of the student group must click the submit button for this assignment before the group submission will be considered as submitted. If disabled, the group submission will be considered as submitted as soon as any member of the student group clicks the submit button.';
$string['requireallteammemberssubmit_help'] = 'This setting must be used together with the \'Require students to click the submit button\' in Submission settings.
If enabled, all group members must click the submit button for the group submission to be considered as submitted. If disabled, any group member can click the submit button.';
$string['recordid'] = 'Identifier';
$string['removesubmission'] = 'Remove submission';
$string['removesubmissionforstudent'] = 'Remove submission for student: (id={$a->id}, fullname={$a->fullname}).';
+1 -1
View File
@@ -159,7 +159,7 @@ $string['insufficient_responses'] = 'insufficient responses';
$string['insufficient_responses_help'] = 'For the feedback to be anonymous, there must be at least 2 responses.';
$string['item_label'] = 'Label';
$string['item_name'] = 'Question';
$string['label'] = 'Label';
$string['label'] = 'Text and media area';
$string['labelcontents'] = 'Contents';
$string['mapcourseinfo'] = 'This is a site-wide feedback that is available to all courses using the feedback block. You can however limit the courses to which it will appear by mapping them. Search the course and map it to this feedback.';
$string['mapcoursenone'] = 'No courses mapped. Feedback available to all courses';
@@ -28,7 +28,7 @@ Feature: Exporting and importing feedbacks
| Question | this is an information question |
| Label | info |
| Information type | Course |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | label text |
And I add a "Longer text answer" question to the feedback with:
| Question | this is a longer text answer |
+9 -9
View File
@@ -31,7 +31,7 @@ Feature: Testing multichoice questions in feedback
| Label | multichoice1 |
| Multiple choice type | Multiple choice - single answer |
| Multiple choice values | option a\noption b\noption c |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | this is the first page of the feedback |
And I select "Add a page break" from the "typ" singleselect
And I add a "Multiple choice" question to the feedback with:
@@ -40,7 +40,7 @@ Feature: Testing multichoice questions in feedback
| Multiple choice type | Multiple choice - single answer |
| Multiple choice values | option d\noption e\noption f |
| Required | 1 |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | this is the second page of the feedback |
And I select "Add a page break" from the "typ" singleselect
And I add a "Multiple choice" question to the feedback with:
@@ -51,7 +51,7 @@ Feature: Testing multichoice questions in feedback
| Hide the "Not selected" option | Yes |
| Dependence item | multichoice2 |
| Dependence value | option d |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | this is the third page of the feedback |
And I log out
And I am on the "Learning experience" "feedback activity" page logged in as student1
@@ -171,7 +171,7 @@ Feature: Testing multichoice questions in feedback
| Label | multichoice1 |
| Multiple choice type | Multiple choice - multiple answers |
| Multiple choice values | option a\noption b\noption c |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | this is the first page of the feedback |
And I select "Add a page break" from the "typ" singleselect
And I add a "Multiple choice" question to the feedback with:
@@ -180,7 +180,7 @@ Feature: Testing multichoice questions in feedback
| Multiple choice type | Multiple choice - multiple answers |
| Multiple choice values | option d\noption e\noption f |
| Required | 1 |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | this is the second page of the feedback |
And I select "Add a page break" from the "typ" singleselect
And I add a "Multiple choice" question to the feedback with:
@@ -190,7 +190,7 @@ Feature: Testing multichoice questions in feedback
| Multiple choice values | option g\noption h\noption i |
| Dependence item | multichoice2 |
| Dependence value | option d |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | this is the third page of the feedback |
And I log out
# Login as the first student.
@@ -310,7 +310,7 @@ Feature: Testing multichoice questions in feedback
| Label | multichoice1 |
| Multiple choice type | Multiple choice - single answer allowed (drop-down menu) |
| Multiple choice values | option a\noption b\noption c |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | this is the first page of the feedback |
And I select "Add a page break" from the "typ" singleselect
And I add a "Multiple choice" question to the feedback with:
@@ -319,7 +319,7 @@ Feature: Testing multichoice questions in feedback
| Multiple choice type | Multiple choice - single answer allowed (drop-down menu) |
| Multiple choice values | option d\noption e\noption f |
| Required | 1 |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | this is the second page of the feedback |
And I select "Add a page break" from the "typ" singleselect
And I add a "Multiple choice" question to the feedback with:
@@ -329,7 +329,7 @@ Feature: Testing multichoice questions in feedback
| Multiple choice values | option g\noption h\noption i |
| Dependence item | multichoice2 |
| Dependence value | option d |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | this is the third page of the feedback |
And I log out
And I am on the "Learning experience" "feedback activity" page logged in as student1
@@ -28,7 +28,7 @@ Feature: Test creating different types of feedback questions for anonymous feedb
| Question | this is an information question |
| Label | info |
| Information type | Course |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | label text |
And I add a "Longer text answer" question to the feedback with:
| Question | this is a longer text answer |
@@ -32,7 +32,7 @@ Feature: Test creating different types of feedback questions for non-anonymous f
| Question | this is a response time question |
| Label | curtime |
| Information type | Responses time |
And I add a "Label" question to the feedback with:
And I add a "Text and media area" question to the feedback with:
| Contents | label text |
And I add a "Longer text answer" question to the feedback with:
| Question | this is a longer text answer |
+2 -2
View File
@@ -144,7 +144,7 @@ $string['correctresponse'] = 'Correct response';
$string['createaquestionpage'] = 'Create a question page';
$string['credit'] = 'Credit';
$string['customscoring'] = 'Custom scoring';
$string['customscoring_help'] = 'If enabled, then each answer may be given a numerical point value (positive or negative).';
$string['customscoring_help'] = 'If enabled, a whole number value (positive or negative) may be entered for each answer.';
$string['deadline'] = 'Deadline';
$string['defaultessayresponse'] = 'Your essay will be graded by your teacher.';
$string['deleteallattempts'] = 'Delete all lesson attempts';
@@ -538,7 +538,7 @@ $string['savechangesandeol'] = 'Save all changes and go to the end of the lesson
$string['saveoverrideandstay'] = 'Save and enter another override';
$string['savepage'] = 'Save page';
$string['score'] = 'Score';
$string['score_help'] = 'Score is only used when custom scoring is enabled. Each answer can then be given a numerical point value (positive or negative).';
$string['score_help'] = 'If custom scoring is enabled in the lesson settings, a whole number value (positive or negative) may be entered for each answer.';
$string['scores'] = 'Scores';
$string['search:activity'] = 'Lesson - activity information';
$string['secondpluswrong'] = 'Not quite. Would you like to try again?';
@@ -24,18 +24,18 @@ Feature: Manage custom report columns sorting
Given I change window size to "large"
And I click on "Show/hide 'Sorting'" "button"
# This will be the fallback sort after toggling lastname sorting.
And I click on "Enable initial sorting for column First name" "checkbox"
When I click on "Enable initial sorting for column Last name" "checkbox"
And I click on "Enable initial sorting for column 'First name'" "checkbox"
When I click on "Enable initial sorting for column 'Last name'" "checkbox"
Then I should see "Updated sorting for column 'Last name'"
And "user02" "table_row" should appear before "user01" "table_row"
And I click on "Disable initial sorting for column Last name" "checkbox"
And I click on "Disable initial sorting for column 'Last name'" "checkbox"
And I should see "Updated sorting for column 'Last name'"
And "user01" "table_row" should appear before "user02" "table_row"
Scenario: Change column sort direction in report
Given I change window size to "large"
And I click on "Show/hide 'Sorting'" "button"
When I click on "Enable initial sorting for column Last name" "checkbox"
When I click on "Enable initial sorting for column 'Last name'" "checkbox"
And I click on "Sort column 'Last name' descending" "button"
Then I should see "Updated sorting for column 'Last name'"
And "user01" "table_row" should appear before "user02" "table_row"
@@ -46,8 +46,8 @@ Feature: Manage custom report columns sorting
Scenario: Change column sort order in report
Given I change window size to "large"
And I click on "Show/hide 'Sorting'" "button"
When I click on "Enable initial sorting for column Last name" "checkbox"
And I click on "Enable initial sorting for column First name" "checkbox"
When I click on "Enable initial sorting for column 'Last name'" "checkbox"
And I click on "Enable initial sorting for column 'First name'" "checkbox"
And I click on "Move sorting for column 'First name'" "button"
And I click on "To the top of the list" "link" in the "Move sorting for column 'First name'" "dialogue"
Then I should see "Updated sorting for column 'First name'"
@@ -58,7 +58,7 @@ Feature: Manage custom report columns sorting
Given I change window size to "large"
And I click on "Add column 'Full name'" "link"
And I click on "Show/hide 'Sorting'" "button"
When I click on "Enable initial sorting for column Full name" "checkbox"
When I click on "Enable initial sorting for column 'Full name'" "checkbox"
Then I should see "Updated sorting for column 'Full name'"
# User1 = Alice Zebra; User2=Zoe Aardvark; User3 = Alice Badger.
And "user03" "table_row" should appear before "user01" "table_row"
@@ -72,7 +72,7 @@ Feature: Manage custom report columns sorting
Given I change window size to "large"
And I click on "Show/hide 'Sorting'" "button"
# Sort by last name descending.
When I click on "Enable initial sorting for column Last name" "checkbox"
When I click on "Enable initial sorting for column 'Last name'" "checkbox"
Then "user02" "table_row" should appear before "user01" "table_row"
# Switching to preview mode should observe report config.
And I click on "Switch to preview mode" "button"
@@ -26,7 +26,7 @@ Feature: Manage custom reports
# Confirm we see the default sorting in the report
And "Admin User" "table_row" should appear before "User 2" "table_row"
And I click on "Show/hide 'Sorting'" "button"
And "Disable initial sorting for column Full name" "checkbox" should exist in the "#settingssorting" "css_element"
And "Disable initial sorting for column 'Full name'" "checkbox" should exist in the "#settingssorting" "css_element"
And I click on "Show/hide 'Sorting'" "button"
# Confirm we only see not suspended users in the report.
And I should see "Admin User" in the "reportbuilder-table" "table"
@@ -69,7 +69,7 @@ class custom_report_columns_sorting_exporter_test extends advanced_testcase {
$this->assertTrue($sortcolumnemail['sortenabled']);
$this->assertEquals(1, $sortcolumnemail['sortorder']);
$this->assertEquals(SORT_DESC, $sortcolumnemail['sortdirection']);
$this->assertEquals('Disable initial sorting for column Email address', $sortcolumnemail['sortenabledtitle']);
$this->assertEquals('Disable initial sorting for column \'Email address\'', $sortcolumnemail['sortenabledtitle']);
$this->assertEquals('Sort column \'Email address\' ascending', $sortcolumnemail['sorticon']['title']);
// Fullname column.
@@ -78,7 +78,7 @@ class custom_report_columns_sorting_exporter_test extends advanced_testcase {
$this->assertFalse($sortcolumnfullname['sortenabled']);
$this->assertEquals(2, $sortcolumnfullname['sortorder']);
$this->assertEquals(SORT_ASC, $sortcolumnfullname['sortdirection']);
$this->assertEquals('Enable initial sorting for column Full name', $sortcolumnfullname['sortenabledtitle']);
$this->assertEquals('Enable initial sorting for column \'Full name\'', $sortcolumnfullname['sortenabledtitle']);
$this->assertEquals('Sort column \'Full name\' descending', $sortcolumnfullname['sorticon']['title']);
$this->assertNotEmpty($export->helpicon);
+1 -1
View File
@@ -22,7 +22,7 @@
Example context (json):
{
"output": {
"page_doc_link": "Help and documentation",
"page_doc_link": "Documentation for this page",
"supportemail": "<a href=\"#\">Contact site support</a>",
"has_popover_links": true,
"services_support": "Services and support",
+1 -1
View File
@@ -23,7 +23,7 @@
{
"output": {
"course_footer": "More information about this course",
"page_doc_link": "<a href='https://docs.moodle.org/'>Help and documentation</a>",
"page_doc_link": "<a href='https://docs.moodle.org/'>Documentation for this page</a>",
"login_info": "You are logged in as cute kitten",
"supportemail": "<a href=\"#\">Contact site support</a>",
"services_support_link": "Services and support"