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

Merge branch 'MDL-67527-37-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_37_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2019-12-29 23:27:22 +01:00
parent c671e56277 9ef1745639
commit aa5d6d1075
10 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/uploadcourse/lang/en/tool_uploadcourse.php
+1 -1
View File
@@ -90,7 +90,7 @@ $string['invalidcsvfile'] = 'Invalid input CSV file';
$string['invalidencoding'] = 'Invalid encoding';
$string['invalidmode'] = 'Invalid mode selected';
$string['invalideupdatemode'] = 'Invalid update mode selected';
$string['invalidvisibilitymode'] = 'Invalid visibility mode given';
$string['invalidvisibilitymode'] = 'Invalid visible mode';
$string['invalidroles'] = 'Invalid role names: {$a}';
$string['invalidshortname'] = 'Invalid shortname';
$string['missingmandatoryfields'] = 'Missing value for mandatory fields: {$a}';
grade/grading/form/rubric/lang/en/gradingform_rubric.php
+3 -3
View File
@@ -53,8 +53,8 @@ $string['leveldelete'] = 'Delete level {$a}';
$string['leveldefinition'] = 'Level {$a} definition';
$string['levelempty'] = 'Click to edit level';
$string['levelsgroup'] = 'Levels group';
$string['lockzeropoints'] = 'Calculate grade based on the rubric having a minimum score of 0';
$string['lockzeropoints_help'] = 'This setting only applies if the sum of the minimum number of points for each criterion is greater than 0. If ticked, the minimum achievable grade for the rubric will be greater than 0. If unticked, the minimum possible score for the rubric will be mapped to the minimum grade available for the activity (which is 0 unless a scale is used).';
$string['lockzeropoints'] = 'Calculate grade having a minimum score of the minimum achievable grade for the rubric';
$string['lockzeropoints_help'] = 'This setting only applies if the sum of the minimum number of points for each criterion is greater than 0. If ticked, the minimum achievable grade for the rubric will be the minimum achievable grade for the rubric. If unticked, the minimum possible score for the rubric will be mapped to the minimum grade available for the activity (which is 0 unless a scale is used).';
$string['name'] = 'Name';
$string['needregrademessage'] = 'The rubric definition was changed after this student had been graded. The student can not see this rubric until you check the rubric and update the grade.';
$string['pluginname'] = 'Rubric';
@@ -75,7 +75,7 @@ $string['rubricmappingexplained'] = 'The minimum possible score for this rubric
If a scale is used for grading, the score will be rounded and converted to the scale elements as if they were consecutive integers.
This grade calculation may be changed by editing the form and ticking the box \'Calculate grade based on the rubric having a minimum score of 0\'.';
This grade calculation may be changed by editing the form and ticking the box \'Calculate grade having a minimum score of the minimum achievable grade for the rubric\'.';
$string['rubricnotcompleted'] = 'Please choose something for each criterion';
$string['rubricoptions'] = 'Rubric options';
$string['rubricstatus'] = 'Current rubric status';
grade/grading/form/rubric/tests/behat/grade_calculation.feature
+1 -1
View File
@@ -29,7 +29,7 @@ Feature: Converting rubric score to grades
And I set the following fields to these values:
| Name | Assignment 1 rubric |
| Description | Rubric test description |
| Calculate grade based on the rubric having a minimum score of 0 | <lockzeropoints> |
| Calculate grade having a minimum score of the minimum achievable grade for the rubric | <lockzeropoints> |
And I define the following rubric:
| Criterion 1 | Level 11 | 20 | Level 12 | 25 | Level 13 | 40 | Level 14 | 50 |
| Criterion 2 | Level 21 | 20 | Level 22 | 25 | Level 23 | 30 | | |
lang/en/admin.php
+1 -1
View File
@@ -239,7 +239,7 @@ $string['configextendedusernamechars'] = 'Enable this setting to allow students
$string['configextramemorylimit'] = 'Some scripts like search, backup/restore or cron require more memory. Set higher values for large sites.';
$string['configfilterall'] = 'Filter all strings, including headings, titles, navigation bar and so on. This is mostly useful when using the multilang filter, otherwise it will just create extra load on your site for little gain.';
$string['configfiltermatchoneperpage'] = 'Automatic linking filters will only generate a single link for the first matching text instance found on the complete page. All others are ignored.';
$string['configfiltermatchonepertext'] = 'Automatic linking filters will only generate a single link for the first matching text instance found in each item of text (e.g., resource, block) on the page. All others are ignored. This setting is ignored if the one per page setting is <i>yes</i>.';
$string['configfiltermatchonepertext'] = 'Automatic linking filters will only generate a single link for the first matching text instance found in each item of text on the page. All others are ignored. This setting has no effect if \'Filter match once per page\' is enabled.';
$string['configfilteruploadedfiles'] = 'Process all uploaded HTML and text files with the filters before displaying them, only uploaded HTML files or none at all.';
$string['configforcelogin'] = 'Normally, the front page of the site and the course listings (but not courses) can be read by people without logging in to the site. If you want to force people to log in before they do ANYTHING on the site, then you should enable this setting.';
$string['configforceloginforprofiles'] = 'This setting forces people to log in as a real (non-guest) account before viewing any user\'s profile. If you disabled this setting, you may find that some users post advertising (spam) or other inappropriate content in their profiles, which is then visible to the whole world.';
lang/en/error.php
+1 -1
View File
@@ -169,7 +169,7 @@ $string['cannotuseadmin'] = 'You need to be an admin user to use this page';
$string['cannotuseadminadminorteacher'] = 'You need to be a teacher or admin user to use this page';
$string['cannotusepage'] = 'Only teachers and administrators can use this page';
$string['cannotusepage2'] = 'Sorry, you may not use this page';
$string['cannotviewcategory'] = 'You don\'t have permission to view courses here';
$string['cannotviewcategory'] = 'You don\'t have permission to view this list of courses.';
$string['cannotviewprofile'] = 'You cannot view the profile of this user';
$string['cannotviewreport'] = 'You cannot view this report';
$string['cannotwritefile'] = 'Cannot write to file ({$a})';
mod/forum/lang/en/forum.php
+2 -2
View File
@@ -460,8 +460,8 @@ $string['pluginname'] = 'Forum';
$string['postadded'] = '<p>Your post was successfully added.</p> <p>You have {$a} to edit it if you want to make any changes.</p>';
$string['postaddedsuccess'] = 'Your post was successfully added.';
$string['postaddedtimeleft'] = 'You have {$a} to edit it if you want to make any changes.';
$string['postbymailsuccess'] = 'Congratulations, your forum post with subject "{$a->subject}" was successfully added. You can view it at {$a->discussionurl}.';
$string['postbymailsuccess_html'] = 'Congratulations, your <a href="{$a->discussionurl}">forum post</a> with subject "{$a->subject}" was successfully posted.';
$string['postbymailsuccess'] = 'Your reply "{$a->subject}" was successfully posted: {$a->discussionurl}';
$string['postbymailsuccess_html'] = 'Your reply <a href="{$a->discussionurl}">{$a->subject}</a> was successfully posted.';
$string['postbyuser'] = '{$a->post} by {$a->user}';
$string['postincontext'] = 'See this post in context';
$string['postmailinfolink'] = 'This is a copy of a message posted in {$a->coursename}.
mod/quiz/lang/en/quiz.php
+2 -2
View File
@@ -381,8 +381,8 @@ $string['functiondisabledbysecuremode'] = 'That functionality is currently disab
$string['generalfeedback'] = 'General feedback';
$string['generalfeedback_help'] = 'General feedback is text which is shown after a question has been attempted. Unlike feedback for a specific question which depends on the response given, the same general feedback is always shown.';
$string['graceperiod'] = 'Submission grace period';
$string['graceperiod_desc'] = 'If what to do when time expires is set to \'Allow a grace period to submit, but not change any responses\', this is the default amount of extra time that is allowed.';
$string['graceperiod_help'] = 'If what to do when time expires is set to \'Allow a grace period to submit, but not change any responses\', this is the amount of extra time that is allowed.';
$string['graceperiod_desc'] = 'If what to do when the time expires is set to \'There is a grace period...\', then this is the default amount of extra time that is allowed.';
$string['graceperiod_help'] = 'If what to do when the time expires is set to \'There is a grace period...\', then this is the amount of extra time that is allowed.';
$string['graceperiodmin'] = 'Last submission grace period';
$string['graceperiodmin_desc'] = 'There is a potential problem right at the end of the quiz. On the one hand, we want to let students continue working right up until the last second - with the help of the timer that automatically submits the quiz when time runs out. On the other hand, the server may then be overloaded, and take some time to get to process the responses. Therefore, we will accept responses for up to this long after time expires, so they are not penalised for the server being slow. However, the student could cheat and get this many seconds to answer the quiz. You have to make a trade-off based on how much you trust the performance of your server during quizzes.';
$string['graceperiodtoosmall'] = 'The grace period must be more than {$a}.';
mod/workshop/lang/en/workshop.php
+1 -1
View File
@@ -93,7 +93,7 @@ $string['configgradedecimals'] = 'Default number of digits that should be shown
$string['configgradinggrade'] = 'Default maximum grade for assessment in workshops';
$string['configmaxbytes'] = 'Default maximum submission file size for all workshops on the site (subject to course limits and other local settings)';
$string['configstrategy'] = 'Default grading strategy for workshops';
$string['createsubmission'] = 'Start preparing your submission';
$string['createsubmission'] = 'Add submission';
$string['crontask'] = 'Background processing for workshop module';
$string['daysago'] = '{$a} days ago';
$string['daysleft'] = '{$a} days left';
mod/workshop/tests/behat/file_type_restriction.feature
+1 -1
View File
@@ -38,7 +38,7 @@ Feature: File types of the submission and feedback attachments can be limitted
And I log in as "student1"
And I am on "Course1" course homepage
And I follow "TestWorkshop"
And I press "Start preparing your submission"
And I press "Add submission"
And I set the following fields to these values:
| Title | Submission1 |
| Submission content | See the attached file |
mod/workshop/tests/behat/submission_types.feature
+6 -6
View File
@@ -73,7 +73,7 @@ Feature: Submission types
And I follow "All required"
And I follow "Switch to the submission phase"
And I press "Continue"
And I press "Start preparing your submission"
And I press "Add submission"
And I set the field "Title" to "Test submission"
When I press "Save changes"
Then I should see "You must supply a value here." in the "Submission content" "form_row"
@@ -95,7 +95,7 @@ Feature: Submission types
And I follow "Optional file"
And I follow "Switch to the submission phase"
And I press "Continue"
And I press "Start preparing your submission"
And I press "Add submission"
And I set the field "Title" to "Test submission"
When I press "Save changes"
Then I should see "You must supply a value here." in the "Submission content" "form_row"
@@ -115,7 +115,7 @@ Feature: Submission types
And I follow "Optional text"
And I follow "Switch to the submission phase"
And I press "Continue"
And I press "Start preparing your submission"
And I press "Add submission"
And I set the field "Title" to "Test submission"
When I press "Save changes"
Then I should see "You must supply a value here." in the "Attachment" "form_row"
@@ -134,7 +134,7 @@ Feature: Submission types
And I follow "Only text"
And I follow "Switch to the submission phase"
And I press "Continue"
When I press "Start preparing your submission"
When I press "Add submission"
Then "Attachment" "field" should not exist
And I set the field "Title" to "Test submission"
And I press "Save changes"
@@ -155,7 +155,7 @@ Feature: Submission types
And I follow "Only file"
And I follow "Switch to the submission phase"
And I press "Continue"
When I press "Start preparing your submission"
When I press "Add submission"
Then "Submission content" "field" should not exist
And I set the field "Title" to "Test submission"
And I press "Save changes"
@@ -177,7 +177,7 @@ Feature: Submission types
And I follow "Neither required"
And I follow "Switch to the submission phase"
And I press "Continue"
And I press "Start preparing your submission"
And I press "Add submission"
And I set the field "Title" to "Test submission"
When I press "Save changes"
Then I should see "You need to add a file or enter some text." in the "Attachment" "form_row"