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

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

Browse Source
This commit is contained in:
Jun Pataleta
2023-12-04 16:11:21 +08:00
parent caacef2ea2 83054f331b
commit bfa1b6cf19
14 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/myoverview/lang/en/block_myoverview.php
+1 -1
View File
@@ -30,7 +30,7 @@ $string['aria:allcoursesincludinghidden'] = 'Show all courses';
$string['aria:allcourses'] = 'Show all courses except courses removed from view';
$string['aria:card'] = 'Switch to card view';
$string['aria:controls'] = 'Course overview controls';
$string['aria:courseactions'] = 'Actions for current course';
$string['aria:courseactions'] = 'Actions for course';
$string['aria:coursesummary'] = 'Course summary text:';
$string['aria:courseprogress'] = 'Course progress:';
$string['aria:customfield'] = 'Show {$a} courses';
course/tests/behat/course_request.feature
+1 -1
View File
@@ -29,7 +29,7 @@ Feature: Users can request and approve courses
| Course short name | Mynewcourse |
| Supporting information | pretty please |
And I press "Request a course"
And I should see "Your course request has been saved successfully."
And I should see "Course request submitted."
And I press "Continue"
And I am on course index
And I should not see "My new course"
enrol/self/lang/en/enrol_self.php
+1 -1
View File
@@ -92,7 +92,7 @@ If an enrolment key is specified, any user attempting to enrol in the course wil
$string['passwordinvalid'] = 'Incorrect enrolment key, please try again';
$string['passwordinvalidhint'] = 'That enrolment key was incorrect, please try again<br />
(Here\'s a hint - it starts with \'{$a}\')';
$string['passwordmatchesgroupkey'] = 'Enrolment key matches an existing group enrolment key';
$string['passwordmatchesgroupkey'] = 'This enrolment key is already used as a group enrolment key.';
$string['pluginname'] = 'Self enrolment';
$string['pluginname_desc'] = 'The self enrolment plugin allows users to choose which courses they want to participate in. The courses may be protected by an enrolment key. Internally the enrolment is done via the manual enrolment plugin which has to be enabled in the same course.';
$string['requirepassword'] = 'Require enrolment key';
enrol/self/tests/self_test.php
+1 -1
View File
@@ -800,7 +800,7 @@ class self_test extends \advanced_testcase {
] + (array) $instance, [], $instance, $context);
$this->assertArrayHasKey('password', $errors);
$this->assertEquals('Enrolment key matches an existing group enrolment key', $errors['password']);
$this->assertEquals('This enrolment key is already used as a group enrolment key.', $errors['password']);
}
/**
group/tests/behat/backup_restore_groups.feature
+4 -4
View File
@@ -16,11 +16,11 @@ Feature: Backup and restore a course containing groups
| teacher1 | C1 | editingteacher |
And the following "groups" exist:
| name | course | idnumber | visibility | participation |
| Visible to everyone/Participation | C1 | VP | 0 | 1 |
| Visible/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 everyone/Non-Participation | C1 | VN | 0 | 0 |
| Visible/Non-Participation | C1 | VN | 0 | 0 |
| Only visible to members/Non-Participation | C1 | MN | 1 | 0 |
And I log in as "admin"
And I backup "Course 1" course using this options:
@@ -40,9 +40,9 @@ Feature: Backup and restore a course containing groups
Examples:
| group | idnumber | visibility | participation |
| Visible to everyone/Participation | VP | 0 | 1 |
| Visible/Participation | VP | 0 | 1 |
| Only visible to members/Participation | MP | 1 | 1 |
| Only see own membership | O | 2 | 0 |
| Not visible | N | 3 | 0 |
| Visible to everyone/Non-Participation | VN | 0 | 0 |
| Visible/Non-Participation | VN | 0 | 0 |
| Only visible to members/Non-Participation | MN | 1 | 0 |
group/tests/behat/private_groups.feature
+20 -20
View File
@@ -32,11 +32,11 @@ Feature: Private groups
| student8 | C1 | student |
And the following "groups" exist:
| name | course | idnumber | visibility | participation |
| Visible to everyone/Participation | C1 | VP | 0 | 1 |
| Visible/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 everyone/Non-Participation | C1 | VN | 0 | 0 |
| Visible/Non-Participation | C1 | VN | 0 | 0 |
| Only visible to members/Non-Participation | C1 | MN | 1 | 0 |
And the following "group members" exist:
| user | group |
@@ -53,54 +53,54 @@ Feature: Private groups
| student7 | O |
| student8 | N |
Scenario: Participants in "Visible to everyone" groups see their membership and other members:
Scenario: Participants in "Visible" groups see their membership and other members:
Given I am on the "C1" "enrolled users" page logged in as "student1"
Then the following should exist in the "participants" table:
| First name / Surname | Groups |
| Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 1 | Visible/Non-Participation, Visible/Participation |
| Student 2 | No groups |
| Student 3 | No groups |
| Student 4 | No groups |
| Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 5 | Visible/Non-Participation, Visible/Participation |
| Student 6 | No groups |
| Student 7 | No groups |
| Student 8 | No groups |
Scenario: Participants in "Only visible to members" groups see their membership and other members, plus "Visible to everyone"
Scenario: Participants in "Only visible to members" groups see their membership and other members, plus "Visible"
Given I am on the "C1" "enrolled users" page logged in as "student2"
Then the following should exist in the "participants" table:
| First name / Surname | Groups |
| Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 1 | Visible/Non-Participation, Visible/Participation |
| Student 2 | Only visible to members/Non-Participation, Only visible to members/Participation |
| Student 3 | No groups |
| Student 4 | No groups |
| Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 5 | Visible/Non-Participation, Visible/Participation |
| Student 6 | Only visible to members/Non-Participation, Only visible to members/Participation |
| Student 7 | No groups |
| Student 8 | No groups |
Scenario: Participants in "Only see own membership" groups see their membership but not other members, plus "Visible to everyone"
Scenario: Participants in "Only see own membership" groups see their membership but not other members, plus "Visible"
Given I am on the "C1" "enrolled users" page logged in as "student3"
Then the following should exist in the "participants" table:
| First name / Surname | Groups |
| Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 1 | Visible/Non-Participation, Visible/Participation |
| Student 2 | No groups |
| Student 3 | Only see own membership |
| Student 4 | No groups |
| Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 5 | Visible/Non-Participation, Visible/Participation |
| Student 6 | No groups |
| Student 7 | No groups |
| Student 8 | No groups |
Scenario: Participants in "Not visible" groups do not see that group, do see "Visible to everyone"
Scenario: Participants in "Not visible" groups do not see that group, do see "Visible"
Given I am on the "C1" "enrolled users" page logged in as "student4"
Then the following should exist in the "participants" table:
| First name / Surname | Groups |
| Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 1 | Visible/Non-Participation, Visible/Participation |
| Student 2 | No groups |
| Student 3 | No groups |
| Student 4 | No groups |
| Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 5 | Visible/Non-Participation, Visible/Participation |
| Student 6 | No groups |
| Student 7 | No groups |
| Student 8 | No groups |
@@ -109,11 +109,11 @@ Feature: Private groups
Given I am on the "C1" "enrolled users" page logged in as "teacher1"
Then the following should exist in the "participants" table:
| First name / Surname | Groups |
| Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 1 | Visible/Non-Participation, Visible/Participation |
| Student 2 | Only visible to members/Non-Participation, Only visible to members/Participation |
| Student 3 | Only see own membership |
| Student 4 | Not visible |
| Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 5 | Visible/Non-Participation, Visible/Participation |
| Student 6 | Only visible to members/Non-Participation, Only visible to members/Participation |
| Student 7 | Only see own membership |
| Student 8 | Not visible |
@@ -154,10 +154,10 @@ Feature: Private groups
And I click on "Apply filters" "button"
Then the following should exist in the "participants" table:
| First name / Surname | Groups |
| Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 1 | Visible/Non-Participation, Visible/Participation |
| Student 2 | No groups |
| Student 4 | No groups |
| Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 5 | Visible/Non-Participation, Visible/Participation |
| Student 6 | No groups |
| Student 7 | No groups |
| Student 8 | No groups |
@@ -171,6 +171,6 @@ Feature: Private groups
And I click on "Apply filters" "button"
Then the following should exist in the "participants" table:
| First name / Surname | Groups |
| Student 1 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 1 | Visible/Non-Participation, Visible/Participation |
| Student 3 | Only see own membership |
| Student 5 | Visible to everyone/Non-Participation, Visible to everyone/Participation |
| Student 5 | Visible/Non-Participation, Visible/Participation |
group/tests/behat/update_groups.feature
+2 -2
View File
@@ -146,7 +146,7 @@ Feature: Automatic updating of groups and groupings
Given I set the field "groups" to "Group (with ID)"
And I press "Edit group settings"
And "visibility" "select" should exist
And the field "Group membership visibility" matches value "Visible to everyone"
And the field "Group membership visibility" matches value "Visible"
And the "participation" "checkbox" should be enabled
And the field "Show group in dropdown menu for activities in group mode" matches value "1"
When the following "group members" exist:
@@ -154,6 +154,6 @@ Feature: Automatic updating of groups and groupings
| teacher1 | An ID |
And I reload the page
Then "visibility" "select" should not exist
And "Visible to everyone" "text" should exist
And "Visible" "text" should exist
And the "participation" "checkbox" should be disabled
And the field "Show group in dropdown menu for activities in group mode" matches value "1"
group/tests/reportbuilder/datasource/groups_test.php
+1 -1
View File
@@ -180,7 +180,7 @@ class groups_test extends core_reportbuilder_testcase {
$this->assertEquals('G101', $groupidnumber);
$this->assertEquals(format_text($group->description), $groupdescription);
$this->assertEquals('S', $groupenrolmentkey);
$this->assertEquals('Visible to everyone', $groupvisibility);
$this->assertEquals('Visible', $groupvisibility);
$this->assertEquals('Yes', $groupparticipation);
$this->assertEmpty($grouppicture);
$this->assertNotEmpty($grouptimecreated);
lang/en/group.php
+3 -3
View File
@@ -173,7 +173,7 @@ $string['mygroups'] = 'My groups';
$string['othergroups'] = 'Other groups';
$string['overview'] = 'Overview';
$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['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 or only visible to members.)';
$string['participationshort'] = 'Participation';
$string['potentialmembers'] = 'Potential members: {$a}';
$string['potentialmembs'] = 'Potential members';
@@ -200,7 +200,7 @@ $string['usercount'] = 'User count';
$string['usercounttotal'] = 'User count ({$a})';
$string['usergroupmembership'] = 'Selected user\'s membership:';
$string['visibility'] = 'Group membership visibility';
$string['visibility_help'] = '* Visible to everyone - all course participants can view who is in the group
$string['visibility_help'] = '* Visible - 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
@@ -209,7 +209,7 @@ Users with the view hidden groups capability can always view group membership.
Note that you can\'t change this setting if the group has members.';
$string['visibilityshort'] = 'Visibility';
$string['visibilityall'] = 'Visible to everyone';
$string['visibilityall'] = 'Visible';
$string['visibilitymembers'] = 'Only visible to members';
$string['visibilityown'] = 'Only see own membership';
$string['visibilitynone'] = 'Hidden';
lang/en/moodle.php
+2 -2
View File
@@ -410,7 +410,7 @@ $string['courserequestfailed'] = 'For some reason, your course request could not
$string['courserequestintro'] = 'Use this form to request a course to be created for you.<br />Try and fill in as much information as you can to allow<br />the administrators to understand your reasons for wanting this course.';
$string['courserequestreason'] = 'Reasons for wanting this course';
$string['courserequestroleerror'] = 'The creators\' role in new courses configuration is invalid. Please see <a href="{$a}">user policies</a>.';
$string['courserequestsuccess'] = 'Your course request has been saved successfully. You will be sent an email to inform you whether your request was approved.';
$string['courserequestsuccess'] = 'Course request submitted.';
$string['courserequestsupport'] = 'Supporting information to help the administrator evaluate this request';
$string['courserequestwarning'] = 'The user requesting this course will be automatically enrolled and assigned the role of {$a}.';
$string['courserestore'] = 'Course restore';
@@ -2364,7 +2364,7 @@ $string['weeks'] = 'weeks';
$string['weekhide'] = 'Hide this week from {$a}';
$string['weeklyoutline'] = 'Weekly outline';
$string['weekshow'] = 'Show this week to {$a}';
$string['welcomeback'] = 'Welcome back, {$a->firstname}! 👋';
$string['welcomeback'] = 'Hi, {$a->firstname}! 👋';
$string['welcometosite'] = 'Welcome, {$a->firstname}! 👋';
$string['welcometocourse'] = 'Welcome to {$a}';
$string['welcometocoursetext'] = 'Welcome to {$a->coursename}!
mod/assign/lang/en/assign.php
+2 -2
View File
@@ -152,7 +152,7 @@ $string['currentattempt'] = 'This is attempt {$a}.';
$string['currentattemptof'] = 'This is attempt {$a->attemptnumber} ( {$a->maxattempts} attempts allowed ).';
$string['cutoffdate'] = 'Cut-off date';
$string['cutoffdatecolon'] = 'Cut-off date: {$a}';
$string['cutoffdate_help'] = 'If set, the assignment will not accept submissions after this date without an extension.';
$string['cutoffdate_help'] = 'If set, submissions will not be accepted after this date without an extension. If not set, submissions will always be accepted.';
$string['cutoffdatevalidation'] = 'Cut-off date cannot be earlier than the due date.';
$string['cutoffdatefromdatevalidation'] = 'Cut-off date cannot be earlier than the allow submissions from date.';
$string['defaultlayout'] = 'Restore default layout';
@@ -282,7 +282,7 @@ $string['filterrequiregrading'] = 'Requires grading';
$string['filtersubmitted'] = 'Submitted';
$string['graded'] = 'Graded';
$string['gradedby'] = 'Graded by';
$string['gradedfollowupsubmit'] = 'Graded - follow-up submission received';
$string['gradedfollowupsubmit'] = 'Graded - resubmitted';
$string['gradedon'] = 'Graded on';
$string['gradebelowzero'] = 'Grade must be greater than or equal to zero.';
$string['gradebreakdown'] = 'Grade breakdown';
mod/assign/tests/behat/grading_status.feature
+2 -2
View File
@@ -137,10 +137,10 @@ Feature: View the grading status of an assignment
| Online text | I'm the student's second submission |
And I press "Save changes"
And I log out
# Teacher marks the submission again after noticing the 'Graded - follow-up submission received'.
# Teacher marks the submission again after noticing the 'Graded - resubmitted'.
And I am on the "Test assignment name" "assign activity" page logged in as teacher1
And I follow "View all submissions"
And I should see "Graded - follow-up submission received" in the "Student 1" "table_row"
And I should see "Graded - resubmitted" in the "Student 1" "table_row"
And I wait "10" seconds
And I click on "Grade" "link" in the "Student 1" "table_row"
And I should see "1 of 1"
mod/h5pactivity/lang/en/h5pactivity.php
+1 -1
View File
@@ -32,7 +32,7 @@ $string['answer_fail'] = 'Incorrect answer';
$string['answer_incorrect'] = 'Your answer is incorrect';
$string['answer_pass'] = 'Correct answer';
$string['answer_unchecked'] = 'Answer unchecked';
$string['answer_unknown'] = 'Unkown answer';
$string['answer_unknown'] = 'Unknown answer';
$string['answer_text'] = 'Answer text';
$string['answer_noanswer'] = 'None';
$string['areapackage'] = 'Package file';
my/tests/behat/welcome.feature
+1 -1
View File
@@ -29,4 +29,4 @@ Feature: Welcome message
And I log out
And I should see "You are not logged in" in the "page-footer" "region"
And I log in as "admin"
Then I should see "Welcome back, Admin!" in the "page-header" "region"
Then I should see "Hi, Admin!" in the "page-header" "region"