mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-70550-master-enfix' of git://github.com/mudrd8mz/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2021-01-09 13:17:35 +01:00
commit a1c6c4b5a1
11 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grade/tests/behat/grade_to_pass.feature
View File

@ -209,7 +209,7 @@ Feature: We can set the grade to pass value
| Ratings > Grade to pass | 90 |
And I navigate to "View > Grader report" in the course gradebook
And I turn editing mode on
And I click on "Edit forum Rating grade for Test Forum 1" "link"
And I click on "Edit forum Test Forum 1 rating" "link"
And I expand all fieldsets
Then the field "Grade to pass" matches value "90"
And I set the field "Grade to pass" to "80"

2
lang/en/admin.php
View File

@ -505,7 +505,7 @@ $string['displayloginfailures'] = 'Display login failures';
$string['divertallemails'] = 'Email diverting';
$string['divertallemailsdetail'] = 'Used as a safeguard in development environments when testing emails and should not be used in production.';
$string['divertallemailsexcept'] = 'Email diversion exceptions';
$string['divertallemailsexcept_desc'] = 'A list of email exception rules separated by either commas or new lines. Each rule is interpreted as a regular expression, eg<pre>simone@acme.com
$string['divertallemailsexcept_desc'] = 'A list of email exception rules separated by either commas or new lines. Each rule is interpreted as a regular expression e.g. <pre>simone@acme.com
.*@acme.com
fred(\\+.*)?@acme.com
</pre>';

2
lang/en/badges.php
View File

@ -136,7 +136,7 @@ In this area, you can select collections of badges from your backpack that you w
$string['backpacksettings'] = 'Backpack settings';
$string['backpackapiurl'] = 'Backpack API URL';
$string['backpackweburl'] = 'Backpack URL';
$string['backpackprovider'] = 'Backpack Provider';
$string['backpackprovider'] = 'Backpack provider';
$string['badges'] = 'Badges';
$string['badgedetails'] = 'Badge details';
$string['badgeimage'] = 'Image';

2
lang/en/grades.php
View File

@ -136,7 +136,7 @@ $string['coursesiamtaking'] = 'Courses I am taking';
$string['coursesiamteaching'] = 'Courses I am teaching';
$string['coursescales'] = 'Course scales';
$string['coursesettings'] = 'Course settings';
$string['coursesettingsexplanation'] = 'Course settings determine how the gradebook appears for all participants in the course.';
$string['coursesettingsexplanation'] = 'Course grade settings determine how the gradebook appears for all participants in the course.';
$string['coursetotal'] = 'Course total';
$string['createcategory'] = 'Create category';
$string['createcategoryerror'] = 'Could not create a new category';

4
lang/en/payment.php
View File

@ -28,9 +28,9 @@ $string['accountconfignote'] = 'Payment gateways for this account will be config
$string['accountidnumber'] = 'ID number';
$string['accountidnumber_help'] = 'The ID number is only used when matching the account against external systems and is not displayed anywhere on the site. If the account has an official code name it may be entered, otherwise the field can be left blank.';
$string['accountname'] = 'Account name';
$string['accountname_help'] = 'How this account will be identified for teachers or managers who set up payments (for example in the course enrolment plugin)';
$string['accountname_help'] = 'How this account will be identified for teachers or managers who set up payments (for example in the course enrolment plugin).';
$string['accountnotavailable'] = 'Not available';
$string['paymentaccountsexplained'] = 'Create one or multiple payment accounts for this site. Each account includes configuration for available payment gateways. The person who configures payments on the site (for example, payment for the course enrolment) will be able to chose from the available accounts.';
$string['paymentaccountsexplained'] = 'Create one or multiple payment accounts for this site. Each account includes configuration for available payment gateways. The person who configures payments on the site (for example, payment for the course enrolment) will be able to choose from the available accounts.';
$string['createaccount'] = 'Create payment account';
$string['deleteorarchive'] = 'Delete or archive';
$string['eventaccountcreated'] = 'Payment account created';

14
mod/assign/lang/en/assign.php
View File

@ -55,7 +55,7 @@ $string['assign:receivegradernotifications'] = 'Receive grader submission notifi
$string['assign:releasegrades'] = 'Release grades';
$string['assign:revealidentities'] = 'Reveal student identities';
$string['assign:reviewgrades'] = 'Review grades';
$string['assign:viewblinddetails'] = 'View student identities when blind marking is enabled';
$string['assign:viewblinddetails'] = 'View student identities when anonymous submissions are enabled';
$string['assign:viewgrades'] = 'View grades';
$string['assign:showhiddengrader'] = 'See the identity of a hidden grader';
$string['assign:submit'] = 'Submit assignment';
@ -109,9 +109,9 @@ $string['batchoperationunlock'] = 'unlock submissions';
$string['batchoperationreverttodraft'] = 'revert submissions to draft';
$string['batchsetallocatedmarker'] = 'Set allocated marker for {$a} selected user(s).';
$string['batchsetmarkingworkflowstateforusers'] = 'Set marking workflow state for {$a} selected user(s).';
$string['blindmarking'] = 'Blind marking';
$string['blindmarkingenabledwarning'] = 'Blind marking is enabled for this activity.';
$string['blindmarking_help'] = 'Blind marking hides the identity of students from markers. Blind marking settings will be locked once a submission or grade has been made in relation to this assignment.';
$string['blindmarking'] = 'Anonymous submissions';
$string['blindmarkingenabledwarning'] = 'Anonymous submissions are enabled for this activity.';
$string['blindmarking_help'] = 'Anonymous submissions hide the identity of students from markers. Anonymous submission settings will be locked once a submission or grade has been made in relation to this assignment.';
$string['calendardue'] = '{$a} is due';
$string['calendargradingdue'] = '{$a} is due to be graded';
$string['changeuser'] = 'Change user';
@ -414,7 +414,7 @@ $string['preventsubmissions'] = 'Prevent the user from making any more submissio
$string['preventsubmissionsshort'] = 'Prevent submission changes';
$string['previous'] = 'Previous';
$string['privacy:attemptpath'] = 'attempt {$a}';
$string['privacy:blindmarkingidentifier'] = 'The identifier used for blind marking';
$string['privacy:blindmarkingidentifier'] = 'The identifier used for anonymous submissions';
$string['privacy:gradepath'] = 'grade';
$string['privacy:metadata:assigndownloadasfolders'] = 'A user preference for whether multiple file submissions should be downloaded into folders';
$string['privacy:metadata:assignfeedbackpluginsummary'] = 'Feedback data for the assignment.';
@ -429,7 +429,7 @@ $string['privacy:metadata:assignquickgrading'] = 'A preference as to whether qui
$string['privacy:metadata:assignsubmissiondetail'] = 'Stores user submission information';
$string['privacy:metadata:assignsubmissionpluginsummary'] = 'Submission data for the assignment.';
$string['privacy:metadata:assignuserflags'] = 'Stores user meta data such as extension dates';
$string['privacy:metadata:assignusermapping'] = 'The mapping for blind marking';
$string['privacy:metadata:assignusermapping'] = 'The mapping for anonymous submissions';
$string['privacy:metadata:assignworkflowfilter'] = 'Filter by the different workflow stages.';
$string['privacy:metadata:grade'] = 'The numerical grade for this assignment submission. Can be determined by scales/advancedgradingforms etc but will always be converted back to a floating point number.';
$string['privacy:metadata:grader'] = 'The user ID of the person grading.';
@ -448,7 +448,7 @@ $string['relativedatessubmissionduedateafter'] = '{$a->datediffstr} after course
$string['relativedatessubmissionduedatebefore'] = '{$a->datediffstr} before course start';
$string['removeallgroupoverrides'] = 'Delete all group overrides';
$string['removealluseroverrides'] = 'Delete all user overrides';
$string['reopenuntilpassincompatiblewithblindmarking'] = 'Reopen until pass option is incompatible with blind marking, because the grades are not released to the gradebook until the student identities are revealed.';
$string['reopenuntilpassincompatiblewithblindmarking'] = 'Reopen until pass option is incompatible with anonymous submissions, because the grades are not released to the gradebook until the student identities are revealed.';
$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';

2
mod/assign/tests/behat/steps_blind_marking.feature
View File

@ -26,7 +26,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
| Online text | 1 |
| File submissions | 0 |
| Use marking workflow | Yes |
| Blind marking | Yes |
| Anonymous submissions | Yes |
And I log out
# Add a submission.
And I log in as "student1"

4
mod/forum/lang/en/forum.php
View File

@ -762,8 +762,8 @@ $string['gradeforwholeforum'] = 'Grade for forum: {$a->str_long_grade}';
$string['grading'] = 'Grading';
$string['gradingstatus'] = 'Grade status:';
$string['gradeforwholeforumhidden'] = 'Grade for forum hidden';
$string['gradeitemnameforwholeforum'] = 'Whole forum grade for {$a->name}';
$string['gradeitemnameforrating'] = 'Rating grade for {$a->name}';
$string['gradeitemnameforwholeforum'] = '{$a->name} whole forum';
$string['gradeitemnameforrating'] = '{$a->name} rating';
$string['grades:gradesavedfor'] = 'Grade saved for {$a->fullname}';
$string['grades:gradesavefailed'] = 'Unable to save grade for {$a->fullname}: {$a->error}';
$string['notgraded'] = 'Not graded';

20
mod/forum/tests/behat/grade_forum.feature
View File

@ -63,11 +63,11 @@ Feature: I can grade a students interaction across a forum
And I turn editing mode on
# There shouldn't be any Ratings grade item.
Then I should see "Whole forum grade"
But I should not see "Rating grade"
Then I should see "Test Forum 1 whole forum"
But I should not see "Test Forum 1 rating"
# The values saved should be reflected here.
Given I click on "Edit forum Whole forum grade for Test Forum 1" "link"
Given I click on "Edit forum Test Forum 1 whole forum" "link"
When I expand all fieldsets
Then the field "Maximum grade" matches value "10"
Then the field "Grade to pass" matches value "4"
@ -120,11 +120,11 @@ Feature: I can grade a students interaction across a forum
And I turn editing mode on
# There shouldn't be any Whole forum grade gradeitem.
Then I should see "Rating grade"
But I should not see "Whole forum grade"
Then I should see "Test Forum 1 rating"
But I should not see "Test Forum 1 whole forum"
# The values saved should be reflected here.
Given I click on "Edit forum Rating grade for Test Forum 1" "link"
Given I click on "Edit forum Test Forum 1 rating" "link"
When I expand all fieldsets
Then the field "Maximum grade" matches value "10"
Then the field "Grade to pass" matches value "4"
@ -151,18 +151,18 @@ Feature: I can grade a students interaction across a forum
And I turn editing mode on
# There shouldn't be any Whole forum grade gradeitem.
Then I should see "Rating grade"
And I should see "Whole forum grade"
Then I should see "Test Forum 1 rating"
And I should see "Test Forum 1 whole forum"
# The values saved should be reflected here.
Given I click on "Edit forum Rating grade for Test Forum 1" "link"
Given I click on "Edit forum Test Forum 1 rating" "link"
When I expand all fieldsets
Then the field "Maximum grade" matches value "100"
Then the field "Grade to pass" matches value "40"
And I should see "Peers" in the "Parent category" "fieldset"
And I press "cancel"
Given I click on "Edit forum Whole forum grade for Test Forum 1" "link"
Given I click on "Edit forum Test Forum 1 whole forum" "link"
When I expand all fieldsets
Then the field "Maximum grade" matches value "10"
Then the field "Grade to pass" matches value "4"

2
mod/quiz/lang/en/quiz.php
View File

@ -179,7 +179,7 @@ $string['comment'] = 'Comment';
$string['commentorgrade'] = 'Make comment or override grade';
$string['comments'] = 'Comments';
$string['completedon'] = 'Completed on';
$string['completionminattempts'] = 'Student must send attempts:';
$string['completionminattempts'] = 'Minimum number of attempts:';
$string['completionminattemptsgroup'] = 'Require attempts';
$string['completionminattemptserror'] = 'Minimum number of attempts must be lower or equal to attempts allowed.';
$string['completionpass'] = 'Require passing grade';

4
payment/gateway/paypal/lang/en/paygw_paypal.php
View File

@ -38,8 +38,8 @@ $string['live'] = 'Live';
$string['paymentnotcleared'] = 'payment not cleared by PayPal.';
$string['pluginname'] = 'PayPal';
$string['pluginname_desc'] = 'The PayPal plugin allows you to receive payments via PayPal.';
$string['privacy:metadata'] = 'The Analytic models plugin does not store any personal data.';
$string['privacy:metadata'] = 'The PayPal plugin does not store any personal data.';
$string['repeatedorder'] = 'This order has already been processed earlier.';
$string['sandbox'] = 'Sandbox';
$string['secret'] = 'Secret';
$string['secret_help'] = 'The secret thatPayPal generated for your application.';
$string['secret_help'] = 'The secret that PayPal generated for your application.';