moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2020-05-28 13:01:39 +02:00
commit 6f56e743ed
47 changed files with 172 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

2
availability/condition/grade/tests/behat/availability_grade.feature
View file

@ -116,7 +116,7 @@ Feature: availability_grade
And I click on "Grade" "link" in the "s@example.com" "table_row"
And I set the field "Grade out of 100" to "40"
And I click on "Save changes" "button"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
# Log back in as student.

2
completion/tests/behat/restrict_activity_by_grade.feature
View file

@ -58,7 +58,7 @@ Feature: Restrict activity availability through grade conditions
And I set the following fields to these values:
| Grade | 21 |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I follow "Edit settings"
And I log out
And I log in as "student1"

2
completion/tests/behat/restrict_section_availability.feature
View file

@ -91,7 +91,7 @@ Feature: Restrict sections availability through completion or grade conditions
And I set the following fields to these values:
| Grade | 21 |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I follow "Edit settings"
And I log out
And I log in as "student1"

2
grade/grading/form/guide/tests/behat/edit_guide.feature
View file

@ -83,7 +83,7 @@ Feature: Marking guides can be created and edited
And I wait "1" seconds
Then the field "Guide criterion B criterion remark" matches value "Comment \"4\""
When I press "Save changes"
And I press "Ok"
And I press "OK"
And I follow "Edit settings"
And I follow "Test assignment 1 name"
And I navigate to "View all submissions" in current page administration

2
grade/grading/tests/behat/behat_grading.php
View file

@ -156,7 +156,7 @@ class behat_grading extends behat_base {
public function i_save_the_advanced_grading_form() {
$this->execute('behat_forms::press_button', get_string('savechanges'));
$this->execute('behat_forms::press_button', 'Ok');
$this->execute('behat_forms::press_button', 'OK');
$this->execute('behat_general::i_click_on', array($this->escape(get_string('editsettings')), 'link'));
$this->execute('behat_forms::press_button', get_string('cancel'));
$this->execute('behat_navigation::i_navigate_to_in_current_page_administration',

4
grade/report/singleview/tests/behat/bulk_insert_grades.feature
View file

@ -38,7 +38,7 @@ Feature: We can bulk insert grades for students in a course
And I set the following fields to these values:
| Grade out of 100 | 50 |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I am on "Course 1" course homepage
And I navigate to "View > Grader report" in the course gradebook
And I follow "Single view for Test assignment one"
@ -79,7 +79,7 @@ Feature: We can bulk insert grades for students in a course
And I set the following fields to these values:
| Grade out of 100 | 50 |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I am on "Course 1" course homepage
And I navigate to "View > Grader report" in the course gradebook
# And I click on "input[title='Dock Navigation block']" "css_element"

10
grade/tests/behat/grade_scales.feature
View file

@ -55,23 +55,23 @@ Feature: View gradebook when scales are used
And I click on "Grade" "link" in the "Student 1" "table_row"
And I set the field "Grade" to "A"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "[data-action=next-user]" "css_element"
And I set the field "Grade" to "B"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "[data-action=next-user]" "css_element"
And I set the field "Grade" to "C"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "[data-action=next-user]" "css_element"
And I set the field "Grade" to "D"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "[data-action=next-user]" "css_element"
And I set the field "Grade" to "F"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I am on "Course 1" course homepage
And I navigate to "Setup > Course grade settings" in the course gradebook
And I set the field "Show weightings" to "Show"

2
grade/tests/behat/grade_single_item_scales.feature
View file

@ -51,7 +51,7 @@ Feature: View gradebook when single item scales are used
And I click on "Grade" "link" in the "Student 1" "table_row"
And I set the field "Grade" to "A"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I am on "Course 1" course homepage
And I navigate to "Setup > Course grade settings" in the course gradebook
And I set the field "Show weightings" to "Show"

54
h5p/h5plib/v124/lang/en/h5plib_v124.php
View file

@ -53,7 +53,7 @@ $string['editor:confirmremoveauthor'] = 'Are you sure you would like to remove t
$string['editor:contenttypebackbuttonlabel'] = 'Back';
$string['editor:contenttypecacheoutdated'] = 'Content type list outdated';
$string['editor:contenttypecacheoutdateddesc'] = 'Your site is having difficulties connecting to H5P.org to check for content type updates. You may not be able to update or install new content types.';
$string['editor:contenttypedemobuttonlabel'] = 'Content Demo';
$string['editor:contenttypedemobuttonlabel'] = 'Content demo';
$string['editor:contenttypedetailbuttonlabel'] = 'Details';
$string['editor:contenttypegetbuttonlabel'] = 'Get';
$string['editor:contenttypeiconalttext'] = 'Icon';
@ -67,8 +67,8 @@ $string['editor:contenttypenotinstalleddesc'] = 'You do not have permission to i
$string['editor:contenttypeowner'] = 'By :owner';
$string['editor:contenttyperestricted'] = 'Restricted content type';
$string['editor:contenttyperestricteddesc'] = 'The use of this content type has been restricted by an administrator.';
$string['editor:contenttypesearchfieldplaceholder'] = 'Search for Content Types';
$string['editor:contenttypesectionall'] = 'All Content Types';
$string['editor:contenttypesearchfieldplaceholder'] = 'Search for content types';
$string['editor:contenttypesectionall'] = 'All content types';
$string['editor:contenttypeunsupportedapiversioncontent'] = 'Contact your system administrator to provide you with the necessary updates';
$string['editor:contenttypeunsupportedapiversiontitle'] = 'This content type requires a newer core version';
$string['editor:contenttypeupdateavailable'] = 'Update available';
@ -76,12 +76,12 @@ $string['editor:contenttypeupdatebuttonlabel'] = 'Update';
$string['editor:contenttypeupdatesuccess'] = ':contentType successfully updated!';
$string['editor:contenttypeupdatingbuttonlabel'] = 'Updating';
$string['editor:contenttypeusebuttonlabel'] = 'Use';
$string['editor:contributetranslations'] = 'If you want to complete the translation for :language you can learn about <a href=":url" target="_new">contributing translations to H5P</a>';
$string['editor:contributetranslations'] = 'If you want to complete the translation for :language, see <a href=":url" target="_new">contributing translations to H5P</a>.';
$string['editor:copiedbutton'] = 'Copied';
$string['editor:copiedtoclipboard'] = 'Content is copied to the clipboard';
$string['editor:copybutton'] = 'Copy';
$string['editor:copytoclipboard'] = 'Copy H5P content to the clipboard';
$string['editor:createcontenttablabel'] = 'Create Content';
$string['editor:createcontenttablabel'] = 'Create content';
$string['editor:currentmenuselected'] = 'current selection';
$string['editor:editcopyright'] = 'Edit copyright';
$string['editor:editimage'] = 'Edit image';
@ -105,9 +105,9 @@ $string['editor:expandcollapse'] = 'Expand/Collapse';
$string['editor:filetolarge'] = 'The file you are trying to upload might be too large.';
$string['editor:fillinthefieldsbelow'] = 'Fill in the fields below';
$string['editor:gethelp'] = 'Get help';
$string['editor:h5pfileuploadservererrorcontent'] = 'An unexpected error occured. Check your server error log for\' + \' more details.';
$string['editor:h5pfileuploadservererrorcontent'] = 'An unexpected error occurred. Check your server error log for more details.';
$string['editor:h5pfileuploadservererrortitle'] = 'The H5P file could not be uploaded';
$string['editor:h5pfilevalidationfailedcontent'] = 'Make sure the uploaded H5P contains valid H5P content. H5P\' + \' files containing only libraries should be uploaded through the H5P Libraries page.';
$string['editor:h5pfilevalidationfailedcontent'] = 'Make sure the uploaded H5P contains valid H5P content. H5P files containing only libraries should be uploaded through the H5P libraries page.';
$string['editor:h5pfilevalidationfailedtitle'] = 'Could not validate H5P file.';
$string['editor:h5pfilewrongextensioncontent'] = 'Only files with the .h5p extension are allowed.';
$string['editor:h5pfilewrongextensiontitle'] = 'The selected file could not be uploaded';
@ -126,15 +126,15 @@ $string['editor:librarymissing'] = 'Missing required library %lib.';
$string['editor:licensecandistribute'] = 'Can distribute';
$string['editor:licensecanholdliable'] = 'Can hold liable';
$string['editor:licensecanmodify'] = 'Can modify';
$string['editor:licensecansublicense'] = 'Can sublicense';
$string['editor:licensecansublicense'] = 'Can sub-licence';
$string['editor:licensecanusecommercially'] = 'Can use commercially';
$string['editor:licensecannotholdliable'] = 'Cannot hold liable';
$string['editor:licensedescription'] = 'Some of the features of this license are indicated below. Click the info icon above to read the original license text.';
$string['editor:licensefetchdetailsfailed'] = 'Failed fetching license details';
$string['editor:licensemodalsubtitle'] = 'Select a license to view information about proper usage';
$string['editor:licensemodaltitle'] = 'License Details';
$string['editor:licensedescription'] = 'Some of the features of this licence are indicated below. Click the info icon above to read the original licence text.';
$string['editor:licensefetchdetailsfailed'] = 'Failed fetching licence details';
$string['editor:licensemodalsubtitle'] = 'Select a licence to view information about proper usage';
$string['editor:licensemodaltitle'] = 'Licence details';
$string['editor:licensemustincludecopyright'] = 'Must include copyright';
$string['editor:licensemustincludelicense'] = 'Must include license';
$string['editor:licensemustincludelicense'] = 'Must include licence';
$string['editor:licenseunspecified'] = 'Unspecified';
$string['editor:listbelowmin'] = 'The list needs at least :min items for the content to function properly.';
$string['editor:listexceedsmax'] = 'The list exceeds the maximum of :max items.';
@ -145,11 +145,11 @@ $string['editor:logthischange'] = 'Log this change';
$string['editor:loggedchanges'] = 'Logged changes';
$string['editor:maxscoresemanticsmissing'] = 'Could not find the expected semantics in the content.';
$string['editor:metadata'] = 'Metadata';
$string['editor:metadatasharingandlicensinginfo'] = 'Metadata (sharing and licensing info)';
$string['editor:metadatasharingandlicensinginfo'] = 'Metadata (sharing and licencing info)';
$string['editor:missingproperty'] = 'Field :index is missing its :property property.';
$string['editor:missingtranslation'] = '[Missing translation :key]';
$string['editor:newchangehasbeenlogged'] = 'New change has been logged';
$string['editor:newestfirst'] = 'Newest First';
$string['editor:newestfirst'] = 'Newest first';
$string['editor:nextimage'] = 'Next image';
$string['editor:nochangeshavebeenlogged'] = 'No changes have been logged';
$string['editor:nocontenttypesavailable'] = 'No content types are available';
@ -159,7 +159,7 @@ $string['editor:nolanguagessupported'] = 'No languages supported';
$string['editor:noresultsfound'] = 'No results found';
$string['editor:noresultsfounddesc'] = 'There is no content type that matches your search criteria.';
$string['editor:nosemantics'] = 'Error, could not load the content type form.';
$string['editor:notalltextschanged'] = 'Not all texts were changed, there is only partial coverage for :language.';
$string['editor:notalltextschanged'] = 'Not all texts were changed, as there is only partial coverage for :language.';
$string['editor:notimagefield'] = '":path" is not an image.';
$string['editor:notimageordimensionsfield'] = '":path" is not an image or dimensions field.';
$string['editor:numresults'] = ':num results';
@ -170,23 +170,23 @@ $string['editor:or'] = 'or';
$string['editor:orderitemdown'] = 'Order item down';
$string['editor:orderitemup'] = 'Order item up';
$string['editor:outofstep'] = 'The :property value can only be changed in steps of :step.';
$string['editor:pasteandreplacebutton'] = 'Paste & Replace';
$string['editor:pasteandreplacefromclipboard'] = 'Replace existing content with H5P Content from the clipboard';
$string['editor:pasteandreplacebutton'] = 'Paste and replace';
$string['editor:pasteandreplacefromclipboard'] = 'Replace existing content with H5P content from the clipboard';
$string['editor:pastebutton'] = 'Paste';
$string['editor:pastecontent'] = 'Replace Content';
$string['editor:pastecontent'] = 'Replace content';
$string['editor:pastecontentnotsupported'] = 'The content in the H5P clipboard is not supported in this context';
$string['editor:pastecontentrestricted'] = 'The content in the clipboard has been restricted on this site';
$string['editor:pasteerror'] = 'Cannot paste from clipboard';
$string['editor:pastefromclipboard'] = 'Paste H5P content from the clipboard';
$string['editor:pastenocontent'] = 'No H5P content on the clipboard';
$string['editor:pastetoonew'] = 'The content in the H5P clipboard is of a higher version (:clip) than what is supported in this context (:local), if possible try to have this content upgraded first, and then try pasting the content here again.';
$string['editor:pastetooold'] = 'The content in the H5P clipboard is of a lower version (:clip) than what is supported in this context (:local), if possible try to have the content you want to paste upgraded, copy it again and try pasting it here.';
$string['editor:popularfirst'] = 'Popular First';
$string['editor:pastetoonew'] = 'The content in the H5P clipboard is of a higher version (:clip) than what is supported in this context (:local). If possible, try to have this content upgraded first, then try pasting the content here again.';
$string['editor:pastetooold'] = 'The content in the H5P clipboard is of a lower version (:clip) than what is supported in this context (:local). If possible, try to have the content you want to paste upgraded, then copy it again and try pasting it here.';
$string['editor:popularfirst'] = 'Popular first';
$string['editor:previousimage'] = 'Previous image';
$string['editor:proceedbuttonlabel'] = 'Proceed to save';
$string['editor:readless'] = 'Read less';
$string['editor:readmore'] = 'Read more';
$string['editor:recentlyusedfirst'] = 'Recently Used First';
$string['editor:recentlyusedfirst'] = 'Recently used first';
$string['editor:reloadbuttonlabel'] = 'Reload';
$string['editor:removefile'] = 'Remove file';
$string['editor:removeimage'] = 'Remove image';
@ -197,19 +197,19 @@ $string['editor:savelabel'] = 'Save';
$string['editor:savemetadata'] = 'Save metadata';
$string['editor:screenshots'] = 'Screenshots';
$string['editor:scriptmissing'] = 'Could not load upgrades script for %lib.';
$string['editor:searchresults'] = 'Search Results';
$string['editor:searchresults'] = 'Search results';
$string['editor:selectfiletoupload'] = 'Select file to upload';
$string['editor:selectlibrary'] = 'Select the library you wish to use for your content.';
$string['editor:semanticserror'] = 'Semantics error: :error';
$string['editor:show'] = 'Show';
$string['editor:showimportantinstructions'] = 'Show instructions';
$string['editor:tabtitlebasicfileupload'] = 'File Upload';
$string['editor:tabtitlebasicfileupload'] = 'File upload';
$string['editor:tabtitleinputlinkurl'] = 'Link/URL';
$string['editor:textfield'] = 'text field';
$string['editor:thecontenttype'] = 'the content type';
$string['editor:thiswillpotentially'] = 'This will potentially reset all the text and translations. You can\'t undo this. The content itself will not be changed. Do you want to proceed?';
$string['editor:title'] = 'Title';
$string['editor:toolong'] = 'Field value is too long, should contain :max letters or less.';
$string['editor:toolong'] = 'Field value is too long; it should contain :max letters or less.';
$string['editor:tryagain'] = 'Try again';
$string['editor:tutorial'] = 'Tutorial';
$string['editor:unabletointerpreterror'] = 'Unable to interpret response.';
@ -219,7 +219,7 @@ $string['editor:unknownfileuploaderror'] = 'Unknown file upload error';
$string['editor:unknownlibrary'] = 'Unfortunately, the selected content type \'%lib\' isn\'t installed on this system.';
$string['editor:untitled'] = 'Untitled :libraryTitle';
$string['editor:uploadaudiotitle'] = 'Upload audio file';
$string['editor:uploaderror'] = 'File Upload Error';
$string['editor:uploaderror'] = 'File upload error';
$string['editor:uploadfilebuttonchangelabel'] = 'Change file';
$string['editor:uploadfilebuttonlabel'] = 'Upload a file';
$string['editor:uploadinstructionscontent'] = 'You may start with examples from <a href="https://h5p.org/content-types-and-applications" target="blank">H5P.org</a>.';

2
lang/en/admin.php
View file

@ -242,7 +242,7 @@ $string['configenablewsdocumentation'] = 'Enable auto-generation of web services
$string['configerrorlevel'] = 'Choose the amount of PHP warnings that you want to be displayed. Normal is usually the best choice.';
$string['configexportlookahead'] = 'Days to look ahead during export';
$string['configexportlookback'] = 'Days to look back during export';
$string['configextendedusernamechars'] = 'Enable this setting to allow students to use any characters in their usernames (note this does not affect their actual names). The default is "false" which restricts usernames to be alphanumeric lowercase characters, underscore (_), hyphen (-), period (.) or at symbol (@).';
$string['configextendedusernamechars'] = 'If enabled, usernames may include any characters except uppercase letters. Otherwise, only alphanumeric characters with lowercase letters, underscore (_), hyphen (-), period (.) and at symbol (@) are allowed.';
$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.';

6
lang/en/auth.php
View file

@ -75,11 +75,11 @@ $string['emailnowexists'] = 'The email address you tried to assign to your profi
$string['emailupdate'] = 'Email address update';
$string['emailupdatemessage'] = 'Dear {$a->fullname},
You have requested a change of your email address for your user account at {$a->site}. Please open the following URL in your browser in order to confirm this change.
You have requested a change of your email address for your account on {$a->site}. To confirm this change, please go to the following web address:
If you have any questions please contact support on: {$a->supportemail}
{$a->url}
{$a->url}';
{$a->supportemail}';
$string['emailupdatesuccess'] = 'Email address of user <em>{$a->fullname}</em> was successfully updated to <em>{$a->email}</em>.';
$string['emailupdatetitle'] = 'Confirmation of email update at {$a->site}';
$string['errormaxconsecutiveidentchars'] = 'Passwords must have at most {$a} consecutive identical characters.';

4
lang/en/backup.php
View file

@ -163,13 +163,13 @@ $string['confirmcancelno'] = 'Do not cancel';
$string['confirmnewcoursecontinue'] = 'New course warning';
$string['confirmnewcoursecontinuequestion'] = 'A temporary (hidden) course will be created by the course restoration process. To abort restoration click cancel. Do not close the browser while restoring.';
$string['copiesinprogress'] = 'This course has copies in progress. <a href="{$a}">View in progress copies.</a>';
$string['copycoursedesc'] = 'This course will be duplicated and put into the given course category.';
$string['copycoursedesc'] = 'This course will be duplicated and put into the selected course category.';
$string['copycourseheading'] = 'Copy a course';
$string['copycoursetitle'] = 'Copy course: {$a}';
$string['copydest'] = 'Destination';
$string['copyingcourse'] = 'Course copying in progress';
$string['copyingcourseshortname'] = 'copying';
$string['copyformfail'] = 'Ajax submission of course copy form has failed.';
$string['copyformfail'] = 'AJAX submission of course copy form has failed.';
$string['copyop'] = 'Current operation';
$string['copyprogressheading'] = 'Course copies in progress';
$string['copyprogressheading_help'] = 'This table shows the status of all of your unfinished course copies.';

10
lang/en/badges.php
View file

@ -98,7 +98,7 @@ The only URL required for verification is [your-site-url]/badges/assertion.php s
$string['backpackbadgessummary'] = 'You have {$a->totalbadges} badge(s) displayed from {$a->totalcollections} collection(s).';
$string['backpackbadgessettings'] = 'Change backpack settings';
$string['backpackcannotsendverification'] = 'Cannot send verification email';
$string['backpackconnected'] = 'Backpack has been connected';
$string['backpackconnected'] = 'Backpack is connected';
$string['backpackconnection'] = 'Backpack connection';
$string['backpackconnection_help'] = 'Connecting to a backpack enables you to share your badges from this site, and display public badge collections from your backpack on your profile page on this site.';
$string['backpackconnectioncancelattempt'] = 'Connect using a different email address';
@ -107,7 +107,7 @@ $string['backpackconnectionresendemail'] = 'Resend verification email';
$string['backpackconnectionunexpectedresult'] = 'There was a problem connecting to your backpack. Please check the credentials and try again.';
$string['backpackconnectionunexpectedmessage'] = 'The backpack returned the error: "{$a}".';
$string['backpackdetails'] = 'Backpack settings';
$string['backpackdisconnected'] = 'Backpack has been disconnected';
$string['backpackdisconnected'] = 'Backpack is disconnected';
$string['backpackemail'] = 'Email address';
$string['backpackemail_help'] = 'The email address associated with your backpack. While you are connected, any badges earned on this site will be associated with this email address.';
$string['backpackemailverificationpending'] = 'Verification pending';
@ -471,11 +471,11 @@ $string['privacy:metadata:external:backpacks:description'] = 'The description of
$string['privacy:metadata:external:backpacks:image'] = 'The image of the badge';
$string['privacy:metadata:external:backpacks:issuer'] = 'Some information about the issuer';
$string['privacy:metadata:external:backpacks:url'] = 'The Moodle URL where the issued badge information can be seen';
$string['privacy:metadata:backpackoauth2'] = 'Information oauthorization when user connect to an external backpack';
$string['privacy:metadata:backpackoauth2'] = 'OAuth 2 information when user connects to an external backpack';
$string['privacy:metadata:backpackoauth2:userid'] = 'The ID of the user connect to backpack';
$string['privacy:metadata:backpackoauth2:usermodified'] = 'The ID of the user modified connect';
$string['privacy:metadata:backpackoauth2:token'] = 'The token of backpack connect';
$string['privacy:metadata:backpackoauth2:issuerid'] = 'The ID of Oauth2 service';
$string['privacy:metadata:backpackoauth2:token'] = 'Backpack connection token';
$string['privacy:metadata:backpackoauth2:issuerid'] = 'OAuth 2 service ID';
$string['privacy:metadata:backpackoauth2:scope'] = 'List scope of backpack connect';
$string['privacy:metadata:issued'] = 'A record of badges awarded';
$string['privacy:metadata:issued:dateexpire'] = 'The date when the badge expires';

1
lang/en/moodle.php
View file

@ -1500,7 +1500,6 @@ $string['numwords'] = '{$a} words';
$string['numyear'] = '{$a} year';
$string['numyears'] = '{$a} years';
$string['ok'] = 'OK';
$string['okay'] = 'Ok';
$string['oldpassword'] = 'Current password';
$string['olduserdirectory'] = 'This is the OLD users directory, and is no longer needed. You may safely delete it. The files it contains have been copied to the NEW user directory.';
$string['optional'] = 'optional';

2
lang/en/question.php
View file

@ -124,7 +124,7 @@ $string['editingcategory'] = 'Editing a category';
$string['editingquestion'] = 'Editing a question';
$string['editquestion'] = 'Edit question';
$string['editthiscategory'] = 'Edit this category';
$string['emptyxml'] = 'Unkown error - empty imsmanifest.xml';
$string['emptyxml'] = 'Unknown error - empty imsmanifest.xml';
$string['enabled'] = 'Enabled';
$string['erroraccessingcontext'] = 'Cannot access context';
$string['errordeletingquestionsfromcategory'] = 'Error deleting questions from category {$a}.';

6
lang/en/role.php
View file

@ -153,9 +153,9 @@ $string['confirmunassignno'] = 'Cancel';
$string['contentbank:access'] = 'Access the content bank';
$string['contentbank:deleteanycontent'] = 'Delete any content from the content bank';
$string['contentbank:deleteowncontent'] = 'Delete content from own content bank';
$string['contentbank:manageanycontent'] = 'Manage any content from the content bank (rename, move, publish, share, etc.)';
$string['contentbank:manageowncontent'] = 'Manage content from own content bank (rename, move, publish, share, etc.)';
$string['contentbank:upload'] = 'Upload new content in the content bank';
$string['contentbank:manageanycontent'] = 'Manage any content from the content bank';
$string['contentbank:manageowncontent'] = 'Manage content from own content bank';
$string['contentbank:upload'] = 'Upload new content to the content bank';
$string['contentbank:useeditor'] = 'Create or edit content using a content type editor';
$string['context'] = 'Context';
$string['course:activityvisibility'] = 'Hide/show activities';

4
lib/form/tests/behat/modgrade_validation.feature
View file

@ -144,7 +144,7 @@ Feature: Using the activity grade form element
And I click on "Grade" "link" in the "Student 1" "table_row"
And I set the field "Grade" to "C"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I follow "Edit settings"
When I expand all fieldsets
Then I should see "Some grades have already been awarded, so the grade type and scale cannot be changed"
@ -203,7 +203,7 @@ Feature: Using the activity grade form element
And I click on "Grade" "link" in the "Student 1" "table_row"
And I set the field "Grade out of 100" to "50"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I follow "Edit settings"
When I expand all fieldsets
Then I should see "Some grades have already been awarded, so the grade type cannot be changed. If you wish to change the maximum grade, you must first choose whether or not to rescale existing grades."

2
lib/templates/local/modal/alert.mustache
View file

@ -40,6 +40,6 @@
{{< core/modal }}
{{$footer}}
<button type="button" class="btn btn-primary" data-action="cancel">{{#str}}okay, moodle{{/str}}</button>
<button type="button" class="btn btn-primary" data-action="cancel">{{#str}}ok, moodle{{/str}}</button>
{{/footer}}
{{/ core/modal }}

6
lib/yui/build/moodle-core-notification-alert/moodle-core-notification-alert-debug.js vendored
View file

@ -127,17 +127,17 @@ Y.extend(ALERT, M.core.notification.info, {
*
* @attribute yesLabel
* @type String
* @default 'Ok'
* @default 'OK'
*/
yesLabel: {
validator: Y.Lang.isString,
setter: function(txt) {
if (!txt) {
txt = 'Ok';
txt = 'OK';
}
return txt;
},
value: 'Ok'
value: 'OK'
}
}
});

2
lib/yui/build/moodle-core-notification-alert/moodle-core-notification-alert-min.js vendored
View file

@ -1 +1 @@
YUI.add("moodle-core-notification-alert",function(o,t){var e,i;M.core=M.core||{},e="Moodle alert",i=function(t){t.closeButton=!1,i.superclass.constructor.apply(this,[t])},o.extend(i,M.core.notification.info,{_closeEvents:null,initializer:function(){var t,e,i;this._closeEvents=[],this.publish("complete"),t=o.Node.create('<input type="button" class="btn btn-primary" id="id_yuialertconfirm-'+this.get("COUNT")+'"value="'+this.get("yesLabel")+'" />'),e=o.Node.create('<div class="confirmation-dialogue"></div>').append(o.Node.create('<div class="confirmation-message">'+this.get("message")+"</div>")).append(o.Node.create('<div class="confirmation-buttons text-xs-right"></div>').append(t)),this.get("notificationBase").addClass("moodle-dialogue-confirm"),this.setStdModContent(o.WidgetStdMod.BODY,e,o.WidgetStdMod.REPLACE),this.setStdModContent(o.WidgetStdMod.HEADER,'<h1 id="moodle-dialogue-'+this.get("COUNT")+'-header-text">'+this.get("title")+"</h1>",o.WidgetStdMod.REPLACE),this._closeEvents.push(o.on("key",this.submit,window,"down:13",this),t.on("click",this.submit,this)),(i=this.get("boundingBox").one(".closebutton"))&&this._closeEvents.push(i.on("click",this.submit,this))},submit:function(){new o.EventHandle(this._closeEvents).detach(),this.fire("complete"),this.hide(),this.destroy()}},{NAME:e,CSS_PREFIX:"moodle-dialogue",ATTRS:{title:{validator:o.Lang.isString,value:"Alert"},message:{validator:o.Lang.isString,value:"Confirm"},yesLabel:{validator:o.Lang.isString,setter:function(t){return t=t||"Ok"},value:"Ok"}}}),M.core.alert=i},"@VERSION@",{requires:["moodle-core-notification-dialogue"]});
YUI.add("moodle-core-notification-alert",function(o,t){var e,i;M.core=M.core||{},e="Moodle alert",i=function(t){t.closeButton=!1,i.superclass.constructor.apply(this,[t])},o.extend(i,M.core.notification.info,{_closeEvents:null,initializer:function(){var t,e,i;this._closeEvents=[],this.publish("complete"),t=o.Node.create('<input type="button" class="btn btn-primary" id="id_yuialertconfirm-'+this.get("COUNT")+'"value="'+this.get("yesLabel")+'" />'),e=o.Node.create('<div class="confirmation-dialogue"></div>').append(o.Node.create('<div class="confirmation-message">'+this.get("message")+"</div>")).append(o.Node.create('<div class="confirmation-buttons text-xs-right"></div>').append(t)),this.get("notificationBase").addClass("moodle-dialogue-confirm"),this.setStdModContent(o.WidgetStdMod.BODY,e,o.WidgetStdMod.REPLACE),this.setStdModContent(o.WidgetStdMod.HEADER,'<h1 id="moodle-dialogue-'+this.get("COUNT")+'-header-text">'+this.get("title")+"</h1>",o.WidgetStdMod.REPLACE),this._closeEvents.push(o.on("key",this.submit,window,"down:13",this),t.on("click",this.submit,this)),(i=this.get("boundingBox").one(".closebutton"))&&this._closeEvents.push(i.on("click",this.submit,this))},submit:function(){new o.EventHandle(this._closeEvents).detach(),this.fire("complete"),this.hide(),this.destroy()}},{NAME:e,CSS_PREFIX:"moodle-dialogue",ATTRS:{title:{validator:o.Lang.isString,value:"Alert"},message:{validator:o.Lang.isString,value:"Confirm"},yesLabel:{validator:o.Lang.isString,setter:function(t){return t=t||"OK"},value:"OK"}}}),M.core.alert=i},"@VERSION@",{requires:["moodle-core-notification-dialogue"]});

6
lib/yui/build/moodle-core-notification-alert/moodle-core-notification-alert.js vendored
View file

@ -127,17 +127,17 @@ Y.extend(ALERT, M.core.notification.info, {
*
* @attribute yesLabel
* @type String
* @default 'Ok'
* @default 'OK'
*/
yesLabel: {
validator: Y.Lang.isString,
setter: function(txt) {
if (!txt) {
txt = 'Ok';
txt = 'OK';
}
return txt;
},
value: 'Ok'
value: 'OK'
}
}
});

6
lib/yui/src/notification/js/alert.js vendored
View file

@ -97,17 +97,17 @@ Y.extend(ALERT, M.core.notification.info, {
*
* @attribute yesLabel
* @type String
* @default 'Ok'
* @default 'OK'
*/
yesLabel: {
validator: Y.Lang.isString,
setter: function(txt) {
if (!txt) {
txt = 'Ok';
txt = 'OK';
}
return txt;
},
value: 'Ok'
value: 'OK'
}
}
});

2
mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
View file

@ -133,7 +133,7 @@ Feature: In an assignment, teacher can annotate PDF files during grading
And I draw on the pdf
And I press "Save changes"
And I should see "The changes to the grade and feedback were saved"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration

4
mod/assign/feedback/editpdf/tests/behat/group_annotations.feature
View file

@ -62,7 +62,7 @@ Feature: In a group assignment, teacher can annotate PDF files for all users
Given I set the field "applytoall" to "0"
And I press "Save changes"
And I should see "The changes to the grade and feedback were saved"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I log out
And I log in as "student1"
@ -81,7 +81,7 @@ Feature: In a group assignment, teacher can annotate PDF files for all users
@javascript
Scenario: Submit a PDF file as a student and annotate the PDF as a teacher and all students in the group get a copy of the annotated PDF.
Given I press "Save changes"
And I click on "Ok" "button"
And I click on "OK" "button"
And I am on "Course 1" course homepage
And I log out
And I log in as "student1"

2
mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature
View file

@ -54,7 +54,7 @@ Feature: In an assignment, teacher can view the feedback for a previous attempt.
And I press "Save changes"
And I wait until the page is ready
And I should see "The changes to the grade and feedback were saved"
And I press "Ok"
And I press "OK"
And I follow "View a different attempt"
And I click on "Attempt 1" "radio" in the "View a different attempt" "dialogue"
And I press "View"

4
mod/assign/feedback/file/tests/behat/feedback_file.feature
View file

@ -58,7 +58,7 @@ Feature: In an assignment, teacher can submit feedback files during grading
Scenario: A teacher can provide a feedback file when grading an assignment.
Given I set the field "applytoall" to "0"
And I press "Save changes"
And I click on "Ok" "button"
And I click on "OK" "button"
And I click on "Course 1" "link" in the "[data-region=assignment-info]" "css_element"
And I log out
And I log in as "student1"
@ -74,7 +74,7 @@ Feature: In an assignment, teacher can submit feedback files during grading
@javascript
Scenario: A teacher can provide a feedback file when grading an assignment and all students in the group will receive the file.
Given I press "Save changes"
And I click on "Ok" "button"
And I click on "OK" "button"
And I click on "Course 1" "link" in the "[data-region=assignment-info]" "css_element"
And I log out
And I log in as "student1"

4
mod/assign/tests/behat/allow_another_attempt.feature
View file

@ -43,7 +43,7 @@ Feature: In an assignment, students start a new attempt based on their previous
And I set the following fields to these values:
| Allow another attempt | 1 |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I log out
Then I log in as "student1"
@ -150,7 +150,7 @@ Feature: In an assignment, students start a new attempt based on their previous
And I set the following fields to these values:
| Allow another attempt | 1 |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I follow "Assignment: Test assignment name"
And I log out
And I log in as "student4"

2
mod/assign/tests/behat/comment_inline.feature
View file

@ -46,7 +46,7 @@ Feature: In an assignment, teachers can edit a students submission inline
| Feedback comments | I'm the teacher feedback |
And I upload "lib/tests/fixtures/empty.txt" file to "Feedback files" filemanager
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration

4
mod/assign/tests/behat/display_grade.feature
View file

@ -32,7 +32,7 @@ Feature: Check that the assignment grade can be updated correctly
And I set the field "Grade out of 100" to "50"
And I set the field "Notify students" to "0"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -68,7 +68,7 @@ Feature: Check that the assignment grade can be updated correctly
And I set the field "Grade out of 100" to "50"
And I set the field "Notify students" to "0"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration

4
mod/assign/tests/behat/edit_previous_feedback.feature
View file

@ -46,7 +46,7 @@ Feature: In an assignment, teachers can edit feedback for a students previous su
| Feedback comments | I'm the teacher first feedback |
| Allow another attempt | Yes |
And I press "Save changes"
And I click on "Ok" "button"
And I click on "OK" "button"
And I click on "Edit settings" "link"
And I log out
And I log in as "student2"
@ -66,7 +66,7 @@ Feature: In an assignment, teachers can edit feedback for a students previous su
| Grade | 50 |
| Feedback comments | I'm the teacher second feedback |
And I press "Save changes"
And I click on "Ok" "button"
And I click on "OK" "button"
And I click on "Edit settings" "link"
And I log out
Then I log in as "student2"

2
mod/assign/tests/behat/filter_by_marker.feature
View file

@ -36,7 +36,7 @@ Feature: In an assignment, teachers can filter displayed submissions by assigned
And I set the field "allocatedmarker" to "Marker 1"
And I set the field "Notify students" to "0"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I log out
When I log in as "teacher1"

10
mod/assign/tests/behat/grading_status.feature
View file

@ -57,7 +57,7 @@ Feature: View the grading status of an assignment
And I set the field "Feedback comments" to "Great job! Lol, not really."
And I set the field "Notify students" to "0"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -80,7 +80,7 @@ Feature: View the grading status of an assignment
And I should see "1 of 1"
And I set the field "Marking workflow state" to "Released"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -104,7 +104,7 @@ Feature: View the grading status of an assignment
And I set the field "Marking workflow state" to "In marking"
And I set the field "Notify students" to "0"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -154,7 +154,7 @@ Feature: View the grading status of an assignment
And I set the field "Grade out of 100" to "50"
And I set the field "Feedback comments" to "Great job! Lol, not really."
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -188,7 +188,7 @@ Feature: View the grading status of an assignment
And I set the field "Grade out of 100" to "99.99"
And I set the field "Feedback comments" to "Even better job! Really."
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration

4
mod/assign/tests/behat/group_submission.feature
View file

@ -189,11 +189,11 @@ Feature: Group assignment submissions
| Grade out of 100 | 50.0 |
| Apply grades and feedback to entire group | 1 |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I set the following fields to these values:
| Allow another attempt | 1 |
And I press "Save changes"
And I press "Ok"
And I press "OK"
When I am on "Course 1" course homepage
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration

2
mod/assign/tests/behat/hide_grader.feature
View file

@ -46,7 +46,7 @@ Feature: Hide grader identities identity from students
And I set the field "Grade out of 100" to "50"
And I set the field "Feedback comments" to "Catch for us the foxes."
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
And I should see "Graded" in the "Student 1" "table_row"

6
mod/assign/tests/behat/outcome_grading.feature
View file

@ -65,7 +65,7 @@ Feature: Outcome grading
And I set the following fields to these values:
| Outcome Test: | Excellent |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -113,7 +113,7 @@ Feature: Outcome grading
| Outcome Test: | Excellent |
| Apply grades and feedback to entire group | Yes |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -125,7 +125,7 @@ Feature: Outcome grading
| Outcome Test: | Disappointing |
| Apply grades and feedback to entire group | No |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration

4
mod/assign/tests/behat/quickgrading.feature
View file

@ -39,7 +39,7 @@ Feature: In an assignment, teachers grade multiple students on one page
And I click on "Grade" "link" in the "Student 1" "table_row"
And I wait until the page is ready
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
Then I should see "1" in the "Needs grading" "table_row"
@ -113,7 +113,7 @@ Feature: In an assignment, teachers grade multiple students on one page
| M8d skillZ! | 1337 |
| Feedback comments | I'm the teacher first feedback |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration

2
mod/assign/tests/behat/rescale_grades.feature
View file

@ -31,7 +31,7 @@ Feature: Check that the assignment grade can be rescaled when the max grade is c
And I click on "Grade" "link" in the "Student 1" "table_row"
And I set the field "Grade out of 100" to "40"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I follow "Edit settings"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration

10
mod/assign/tests/behat/steps_blind_marking.feature
View file

@ -51,7 +51,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
And I set the field "Feedback comments" to "Great job! Lol, not really."
And I set the field "Notify students" to "0"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -63,7 +63,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
And I set the field "Marking workflow state" to "Ready for release"
And I set the field "Notify students" to "0"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -71,7 +71,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
And I click on "Grade" "link" in the "I'm the student's first submission" "table_row"
And I set the field "Marking workflow state" to "Released"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -91,7 +91,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
And I set the field "Marking workflow state" to "Ready for release"
And I set the field "Notify students" to "0"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -101,7 +101,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
And I click on "Grade" "link" in the "Student 1" "table_row"
And I set the field "Marking workflow state" to "Released"
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration

4
mod/assign/tests/behat/submission_comments.feature
View file

@ -58,7 +58,7 @@ Feature: In an assignment, students can comment in their submissions
| Grade out of 100 | 50 |
| Feedback comments | I'm the teacher feedback |
And I press "Save changes"
And I press "Ok"
And I press "OK"
And I click on "Edit settings" "link"
And I follow "Test assignment name"
And I navigate to "View all submissions" in current page administration
@ -78,7 +78,7 @@ Feature: In an assignment, students can comment in their submissions
| Grade out of 100 | 0 |
And I press "Save changes"
And I should see "The changes to the grade and feedback were saved"
And I press "Ok"
And I press "OK"
And I set the following fields to these values:
| Feedback comments | I'm the teacher feedback |
And I press "Save changes"

4
mod/h5pactivity/lang/en/h5pactivity.php
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['areapackage'] = 'Package file';
$string['attempt'] = 'Attempt';
@ -113,7 +113,7 @@ $string['result_compound'] = 'Combined partial score';
$string['result_fill-in'] = 'Fill-in text';
$string['result_fill-in_gap'] = 'Gap #{$a}';
$string['result_matching'] = 'Matching choice';
$string['result_other'] = 'Unkown interaction type';
$string['result_other'] = 'Unknown interaction type';
$string['result_sequencing_choice'] = 'Positions';
$string['result_sequencing_answer'] = 'Position value';
$string['result_sequencing_position'] = '#{$a}';

110
mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php
View file

@ -33,32 +33,32 @@ $string['allowedbrowserkeyssyntax'] = 'A key should be a 64-character hex string
$string['cachedef_config'] = 'SEB config cache';
$string['cachedef_configkey'] = 'SEB config key cache';
$string['cachedef_quizsettings'] = 'SEB quiz settings cache';
$string['cantdelete'] = 'Template can\'t be deleted as it has been used for one or more quizzes';
$string['cantedit'] = 'Template can\'t be edited as it has been used for one or more quizzes';
$string['cantdelete'] = 'The template can\'t be deleted as it has been used for one or more quizzes.';
$string['cantedit'] = 'The template can\'t be edited as it has been used for one or more quizzes.';
$string['clientrequiresseb'] = 'This quiz has been configured to use the Safe Exam Browser with client configuration.';
$string['confirmtemplateremovalquestion'] = 'Are you sure you want to remove this template?';
$string['confirmtemplateremovaltitle'] = 'Confirm template removal?';
$string['conflictingsettings'] = 'You don\'t have permissions to update existing Safe Exam Browser settings';
$string['conflictingsettings'] = 'You don\'t have permission to update existing Safe Exam Browser settings.';
$string['content'] = 'Template';
$string['description'] = 'Description';
$string['disabledsettings'] = 'Disabled settings.';
$string['disabledsettings_help'] = 'Safe Exam Browser quiz settings are unable to be updated if there is one or more existing quiz attempts. To re-enable settings, all quiz attempts must be deleted.';
$string['disabledsettings_help'] = 'Safe Exam Browser quiz settings can\'t be changed if the quiz has been attempted. To change a setting, all quiz attempts must first be deleted.';
$string['downloadsebconfig'] = 'Download SEB config file';
$string['duplicatetemplate'] = "Template with the same name already exists";
$string['duplicatetemplate'] = 'A template with the same name already exists.';
$string['edittemplate'] = 'Edit template';
$string['enabled'] = 'Enabled';
$string['event:accessprevented'] = "Quiz access was prevented";
$string['event:templatecreated'] = "SEB Template was created";
$string['event:templatedeleted'] = "SEB Template was deleted";
$string['event:templatedisabled'] = "SEB Template was disabled";
$string['event:templateenabled'] = "SEB Template was enabled";
$string['event:templateupdated'] = "SEB Template was updated";
$string['event:templatecreated'] = 'SEB template was created';
$string['event:templatedeleted'] = 'SEB template was deleted';
$string['event:templatedisabled'] = 'SEB template was disabled';
$string['event:templateenabled'] = 'SEB template was enabled';
$string['event:templateupdated'] = 'SEB template was updated';
$string['exitsebbutton'] = 'Exit Safe Exam Browser';
$string['filemanager_sebconfigfile'] = 'Upload Safe Exam Browser config file';
$string['filemanager_sebconfigfile_help'] = 'Please upload your own Safe Exam Browser config file for this quiz.';
$string['filenotpresent'] = 'Please upload a SEB config file.';
$string['fileparsefailed'] = 'The uploaded file could not be saved as a SEB config file.';
$string['httplinkbutton'] = 'Download Configuration';
$string['httplinkbutton'] = 'Download configuration';
$string['invalid_browser_key'] = "Invalid SEB browser key";
$string['invalid_config_key'] = "Invalid SEB config key";
$string['invalidkeys'] = "The config key or browser exam keys could not be validated. Please ensure you are using the Safe Exam Browser with correct configuration file.";
@ -70,10 +70,10 @@ $string['name'] = 'Name';
$string['newtemplate'] = 'New template';
$string['noconfigfilefound'] = 'No uploaded SEB config file could be found for quiz with cmid: {$a}';
$string['noconfigfound'] = 'No SEB config could be found for quiz with cmid: {$a}';
$string['not_seb'] = "No SEB browser is being used";
$string['not_seb'] = 'No Safe Exam Browser is being used.';
$string['notemplate'] = 'No template';
$string['passwordnotset'] = 'Current settings require quizzes using the Safe Exam Browser to have a quiz password set.';
$string['pluginname'] = 'Safe Exam Browser access rule';
$string['pluginname'] = 'Safe Exam Browser access rules';
$string['privacy:metadata:quizaccess_seb_quizsettings'] = 'Safe Exam Browser settings for a quiz. This includes the ID of the last user to create or modify the settings.';
$string['privacy:metadata:quizaccess_seb_quizsettings:quizid'] = 'ID of the quiz the settings exist for.';
$string['privacy:metadata:quizaccess_seb_quizsettings:timecreated'] = 'Unix time that the settings were created.';
@ -87,37 +87,37 @@ $string['quizsettings'] = 'Quiz settings';
$string['restoredfrom'] = '{$a->name} (restored via cmid {$a->cmid})';
$string['seb'] = 'Safe Exam Browser';
$string['seb:bypassseb'] = 'Bypass the requirement to view quiz in Safe Exam Browser.';
$string['seb:manage_filemanager_sebconfigfile'] = 'Modify Safe Exam Browser quiz setting: Select SEB config file.';
$string['seb:manage_seb_activateurlfiltering'] = 'Modify Safe Exam Browser quiz setting: Activate URL filtering.';
$string['seb:manage_seb_allowedbrowserexamkeys'] = 'Modify Safe Exam Browser quiz setting: Modify Allowed Browser Exam Keys.';
$string['seb:manage_seb_allowreloadinexam'] = 'Modify Safe Exam Browser quiz setting: Allow reload.';
$string['seb:manage_seb_allowspellchecking'] = 'Modify Safe Exam Browser quiz setting: Enable spell checking.';
$string['seb:manage_seb_allowuserquitseb'] = 'Modify Safe Exam Browser quiz setting: Allow quit.';
$string['seb:manage_seb_enableaudiocontrol'] = 'Modify Safe Exam Browser quiz setting: Enable audio control.';
$string['seb:manage_seb_expressionsallowed'] = 'Modify Safe Exam Browser quiz setting: Simple expressions allowed.';
$string['seb:manage_seb_expressionsblocked'] = 'Modify Safe Exam Browser quiz setting: Simple expressions blocked.';
$string['seb:manage_seb_filterembeddedcontent'] = 'Modify Safe Exam Browser quiz setting: Filter embedded content.';
$string['seb:manage_seb_linkquitseb'] = 'Modify Safe Exam Browser quiz setting: Quit link.';
$string['seb:manage_seb_muteonstartup'] = 'Modify Safe Exam Browser quiz setting: Mute on startup.';
$string['seb:manage_seb_quitpassword'] = 'Modify Safe Exam Browser quiz setting: Quit password.';
$string['seb:manage_seb_regexallowed'] = 'Modify Safe Exam Browser quiz setting: Regex expressions allowed.';
$string['seb:manage_seb_regexblocked'] = 'Modify Safe Exam Browser quiz setting: Regex expressions blocked.';
$string['seb:manage_seb_requiresafeexambrowser'] = 'Modify Safe Exam Browser quiz setting: Require Safe Exam Browser.';
$string['seb:manage_seb_showkeyboardlayout'] = 'Modify Safe Exam Browser quiz setting: Show keyboard layout.';
$string['seb:manage_seb_showreloadbutton'] = 'Modify Safe Exam Browser quiz setting: Show reload button.';
$string['seb:manage_seb_showsebtaskbar'] = 'Modify Safe Exam Browser quiz setting: Show task bar.';
$string['seb:manage_seb_showtime'] = 'Modify Safe Exam Browser quiz setting: Show time.';
$string['seb:manage_seb_showwificontrol'] = 'Modify Safe Exam Browser quiz setting: Show Wi-Fi control.';
$string['seb:manage_seb_showsebdownloadlink'] = 'Modify Safe Exam Browser quiz setting: Show download link.';
$string['seb:manage_seb_templateid'] = 'Modify Safe Exam Browser quiz setting: Select SEB template.';
$string['seb:manage_seb_userconfirmquit'] = 'Modify Safe Exam Browser quiz setting: Confirm on quit.';
$string['seb:managetemplates'] = 'Manage Safe Exam Browser configuration templates.';
$string['seb:manage_filemanager_sebconfigfile'] = 'Change SEB quiz setting: Select SEB config file';
$string['seb:manage_seb_activateurlfiltering'] = 'Change SEB quiz setting: Activate URL filtering';
$string['seb:manage_seb_allowedbrowserexamkeys'] = 'Change SEB quiz setting: Allowed browser exam keys';
$string['seb:manage_seb_allowreloadinexam'] = 'Change SEB quiz setting: Allow reload';
$string['seb:manage_seb_allowspellchecking'] = 'Change SEB quiz setting: Enable spell checking';
$string['seb:manage_seb_allowuserquitseb'] = 'Change SEB quiz setting: Allow quit';
$string['seb:manage_seb_enableaudiocontrol'] = 'Change SEB quiz setting: Enable audio control';
$string['seb:manage_seb_expressionsallowed'] = 'Change SEB quiz setting: Simple expressions allowed';
$string['seb:manage_seb_expressionsblocked'] = 'Change SEB quiz setting: Simple expressions blocked';
$string['seb:manage_seb_filterembeddedcontent'] = 'Change SEB quiz setting: Filter embedded content';
$string['seb:manage_seb_linkquitseb'] = 'Change SEB quiz setting: Quit link';
$string['seb:manage_seb_muteonstartup'] = 'Change SEB quiz setting: Mute on startup';
$string['seb:manage_seb_quitpassword'] = 'Change SEB quiz setting: Quit password';
$string['seb:manage_seb_regexallowed'] = 'Change SEB quiz setting: Regex expressions allowed';
$string['seb:manage_seb_regexblocked'] = 'Change SEB quiz setting: Regex expressions blocked';
$string['seb:manage_seb_requiresafeexambrowser'] = 'Change SEB quiz setting: Require Safe Exam Browser';
$string['seb:manage_seb_showkeyboardlayout'] = 'Change SEB quiz setting: Show keyboard layout';
$string['seb:manage_seb_showreloadbutton'] = 'Change SEB quiz setting: Show reload button';
$string['seb:manage_seb_showsebtaskbar'] = 'Change SEB quiz setting: Show task bar';
$string['seb:manage_seb_showtime'] = 'Change SEB quiz setting: Show time';
$string['seb:manage_seb_showwificontrol'] = 'Change SEB quiz setting: Show Wi-Fi control';
$string['seb:manage_seb_showsebdownloadlink'] = 'Change SEB quiz setting: Show download link';
$string['seb:manage_seb_templateid'] = 'Change SEB quiz setting: Select SEB template';
$string['seb:manage_seb_userconfirmquit'] = 'Change SE quiz setting: Confirm on quit';
$string['seb:managetemplates'] = 'Manage SEB configuration templates';
$string['seb_activateurlfiltering'] = 'Enable URL filtering';
$string['seb_activateurlfiltering_help'] = 'If enabled, URLs will be filtered when loading web pages. The filter set has to be defined below.';
$string['seb_allowedbrowserexamkeys'] = 'Allowed Browser Exam Keys';
$string['seb_allowedbrowserexamkeys_help'] = 'In this field you can enter the allowed Browser Exam Keys for versions of Safe Exam Browser that are permitted to access this quiz. If no keys are entered, then Moodle does not check Browser Exam Keys.';
$string['seb_allowedbrowserexamkeys'] = 'Allowed browser exam keys';
$string['seb_allowedbrowserexamkeys_help'] = 'In this field you can enter the allowed browser exam keys for versions of Safe Exam Browser that are permitted to access this quiz. If no keys are entered, then browser exam keys are not checked.';
$string['seb_allowreloadinexam'] = 'Enable reload in exam';
$string['seb_allowreloadinexam_help'] = 'If enabled, page reload is allowed (reload button in SEB task bar, browser tool bar, iOS side slider menu, keyboard shortcut F5/cmd+R). Offline caching might break when the user tries to reload a page without internet connection.';
$string['seb_allowreloadinexam_help'] = 'If enabled, page reload is allowed (reload button in SEB task bar, browser tool bar, iOS side slider menu, keyboard shortcut F5/cmd+R). Note that offline caching may break if a user tries to reload a page without an internet connection.';
$string['seb_allowspellchecking'] = 'Enable spell checking';
$string['seb_allowspellchecking_help'] = 'If enabled, spell checking in the SEB browser is allowed.';
$string['seb_allowuserquitseb'] = 'Enable quitting of SEB';
@ -129,7 +129,7 @@ $string['seb_expressionsallowed_help'] = 'A text field which contains the allowe
$string['seb_expressionsblocked'] = 'Expressions blocked';
$string['seb_expressionsblocked_help'] = 'A text field which contains the filtering expressions for the blocked URLs. Use of the wildcard char \'\*\' is possible. Examples for expressions: \'example.com\' or \'example.com/stuff/\*\'. \'example.com\' matches \'example.com\', \'www.example.com\' and \'www.mail.example.com\'. \'example.com/stuff/\*\' matches all requests to any subdomain of \'example.com\' that have \'stuff\' as the first segment of the path.';
$string['seb_filterembeddedcontent'] = 'Filter also embedded content';
$string['seb_filterembeddedcontent_help'] = 'If enabled, also all embedded resources will be filtered using the filter set.';
$string['seb_filterembeddedcontent_help'] = 'If enabled, embedded resources will also be filtered using the filter set.';
$string['seb_help'] = 'Setup quiz to use the Safe Exam Browser.';
$string['seb_linkquitseb'] = 'Show Exit Safe Exam Browser button, configured with this quit link';
$string['seb_linkquitseb_help'] = 'In this field you can enter the link to quit SEB. It will be used on an "Exit Safe Exam Browser" button on the page that appears after the exam is submitted. When clicking the button or the link placed wherever you want to put it, it is possible to quit SEB without having to enter a quit password. If no link is entered, then the "Exit Safe Exam Browser" button does not appear and there is no link set to quit SEB.';
@ -143,29 +143,29 @@ $string['seb_regexallowed_help'] = 'A text field which contains the filtering ex
$string['seb_regexblocked'] = 'Regex blocked';
$string['seb_regexblocked_help'] = 'A text field which contains the filtering expressions for blocked URLs in a regular expression (Regex) format.';
$string['seb_requiresafeexambrowser'] = 'Require the use of Safe Exam Browser';
$string['seb_requiresafeexambrowser_help'] = "If enabled, students can only attempt the quiz using the Safe Exam Browser.
$string['seb_requiresafeexambrowser_help'] = 'If enabled, students can only attempt the quiz using the Safe Exam Browser.
The available options are:
* No
<br/>Safe Exam Browser is not required to attempt the quiz.
* Yes – Use an existing template
<br/>A template for the configuration of Safe Exam Browser can be used. Templates are managed by the Moodle Administrator. Your manual settings overwrite the settings in the template.
<br/>A template for the configuration of Safe Exam Browser can be used. Templates are managed in the site administration. Your manual settings overwrite the settings in the template.
* Yes – Configure manually
<br/>No template for the configuration of Safe Exam Browser will be used. You can configure Safe Exam Browser manually.
* Yes – Upload my own config
<br/>You can upload your own Safe Exam Browser configuration file. All manual settings and the use of templates will be disabled.
* Yes – Use SEB client config
<br/>No configurations of Safe Exam Browser are on Moodle side. The quiz can be attempted with any configuration of Safe Exam Browser.";
<br/>No configurations of Safe Exam Browser are on the Moodle side. The quiz can be attempted with any configuration of Safe Exam Browser.';
$string['seb_showkeyboardlayout'] = 'Show keyboard layout';
$string['seb_showkeyboardlayout_help'] = 'If enabled, the current keyboard layout is shown in the SEB task bar. It allows you to switch to other keyboard layouts, which have been enabled in the operating system.';
$string['seb_showreloadbutton'] = 'Show reload button';
$string['seb_showreloadbutton_help'] = 'If enabled, a reload button appears in the SEB task bar. This button allows to reload the current web page.';
$string['seb_showreloadbutton_help'] = 'If enabled, a reload button is displayed in the SEB task bar, allowing the current web page to be reloaded.';
$string['seb_showsebtaskbar'] = 'Show SEB task bar';
$string['seb_showsebtaskbar_help'] = 'If enabled, a task bar appears at the bottom of the SEB browser window. In case you like to show the Wi-Fi control, the reload button, the time or the keyboard layout to your students, you have to activate the task bar. The task bar is also needed when you permit third party applications, which are displayed as icons in the task bar.';
$string['seb_showsebtaskbar_help'] = 'If enabled, a task bar appears at the bottom of the SEB browser window. The task bar is required to display items such as Wi-Fi control, reload button, time and keyboard layout.';
$string['seb_showtime'] = 'Show time';
$string['seb_showtime_help'] = 'If enabled, the current time is displayed in the SEB task bar.';
$string['seb_showwificontrol'] = 'Show Wi-Fi control';
$string['seb_showwificontrol_help'] = 'If enabled, a Wi-Fi control button appears in the SEB task bar. The button allows to reconnect to Wi-Fi networks which have previously been connected to.';
$string['seb_showwificontrol_help'] = 'If enabled, a Wi-Fi control button appears in the SEB task bar. The button allows users to reconnect to Wi-Fi networks which have previously been connected to.';
$string['seb_showsebdownloadlink'] = 'Show Safe Exam Browser download button';
$string['seb_showsebdownloadlink_help'] = 'If enabled, a button for Safe Exam Browser download will be shown on the quiz start page.';
$string['seb_templateid'] = 'Safe Exam Browser config template';
@ -179,12 +179,12 @@ $string['seb_userconfirmquit_help'] = 'If enabled, users have to confirm quittin
$string['sebdownloadbutton'] = 'Download Safe Exam Browser';
$string['seblinkbutton'] = 'Launch Safe Exam Browser';
$string['sebrequired'] = "This quiz has been configured so that students may only attempt it using the Safe Exam Browser.";
$string['setting:autoreconfigureseb'] = 'Auto configure SEB';
$string['setting:autoreconfigureseb'] = 'Auto-configure SEB';
$string['setting:autoreconfigureseb_desc'] = 'If enabled, users who navigate to the quiz using the Safe Exam Browser will be automatically forced to reconfigure their Safe Exam Browser.';
$string['setting:displayblocksbeforestart'] = 'Display blocks before quiz started';
$string['setting:displayblocksbeforestart_desc'] = 'If enabled, blocks will be displayed before students start a quiz.';
$string['setting:displayblockswhenfinished'] = 'Display blocks after quiz finished';
$string['setting:displayblockswhenfinished_desc'] = 'If enabled, blocks will be displayed after students finished a quiz.';
$string['setting:displayblocksbeforestart'] = 'Display blocks before starting quiz';
$string['setting:displayblocksbeforestart_desc'] = 'If enabled, blocks will be displayed before a user attempts the quiz.';
$string['setting:displayblockswhenfinished'] = 'Display blocks after finishing quiz';
$string['setting:displayblockswhenfinished_desc'] = 'If enabled, blocks will be displayed after a user has finished their quiz attempt.';
$string['setting:downloadlink'] = 'Safe Exam Browser download link';
$string['setting:downloadlink_desc'] = 'URL for downloading the Safe Exam Browser application.';
$string['setting:quizpasswordrequired'] = 'Quiz password required';
@ -192,8 +192,8 @@ $string['setting:quizpasswordrequired_desc'] = 'If enabled, all quizzes that req
$string['setting:showhttplink'] = 'Show http:// link';
$string['setting:showseblink'] = 'Show seb:// link';
$string['setting:showseblinks'] = 'Show Safe Exam Browser config links';
$string['setting:showseblinks_desc'] = 'Decide whether to show links for the user to access the Safe Exam Browser configuration file when access to quiz is prevented. Note that seb:// links may not work for every browser.';
$string['setting:supportedversions'] = 'Please note, that the following minimum versions of the Safe Exam Browser client are required for use of the Config Key feature: macOS - 2.1.5pre2, Windows - 3.0, iOS - 2.1.14';
$string['setting:showseblinks_desc'] = 'Whether to show links for a user to access the Safe Exam Browser configuration file when access to the quiz is prevented. Note that seb:// links may not work in every browser.';
$string['setting:supportedversions'] = 'Please note that the following minimum versions of the Safe Exam Browser client are required to use the config key feature: macOS - 2.1.5pre2, Windows - 3.0, iOS - 2.1.14.';
$string['settingsfrozen'] = 'Due to there being at least one quiz attempt, the Safe Exam Browser settings can no longer be updated.';
$string['unknown_reason'] = "Unknown reason";
$string['used'] = 'In use';

10
mod/quiz/accessrule/seb/tests/behat/edit_form.feature
View file

@ -43,7 +43,7 @@ Feature: Safe Exam Browser settings in quiz edit form
Then I should not see "Show Safe Exam Browser download button"
Then I should not see "Enable quitting of SEB"
Then I should not see "Quit password"
Then I should not see "Allowed Browser Exam Keys"
Then I should not see "Allowed browser exam keys"
Then I should not see "Show Exit Safe Exam Browser button, configured with this quit link"
Then I should not see "Ask user to confirm quitting"
Then I should not see "Enable reload in exam"
@ -70,7 +70,7 @@ Feature: Safe Exam Browser settings in quiz edit form
And I expand all fieldsets
And I set the field "Require the use of Safe Exam Browser" to "Yes – Use SEB client config"
Then I should see "Show Safe Exam Browser download button"
Then I should see "Allowed Browser Exam Keys"
Then I should see "Allowed browser exam keys"
Then I should not see "Upload Safe Exam Browser config file"
Then I should not see "Safe Exam Browser config template"
Then I should not see "Template 1"
@ -105,7 +105,7 @@ Feature: Safe Exam Browser settings in quiz edit form
Then I should see "Show Safe Exam Browser download button"
Then I should not see "Enable quitting of SEB"
Then I should not see "Quit password"
Then I should see "Allowed Browser Exam Keys"
Then I should see "Allowed browser exam keys"
Then I should not see "Show Exit Safe Exam Browser button, configured with this quit link"
Then I should not see "Ask user to confirm quitting"
Then I should not see "Enable reload in exam"
@ -138,7 +138,7 @@ Feature: Safe Exam Browser settings in quiz edit form
Then I should see "Show Safe Exam Browser download button"
Then I should see "Enable quitting of SEB"
Then I should see "Quit password"
Then I should not see "Allowed Browser Exam Keys"
Then I should not see "Allowed browser exam keys"
Then I should not see "Upload Safe Exam Browser config file"
Then I should not see "Show Exit Safe Exam Browser button, configured with this quit link"
Then I should not see "Ask user to confirm quitting"
@ -203,6 +203,6 @@ Feature: Safe Exam Browser settings in quiz edit form
Then I should see "Expressions blocked"
Then I should see "Regex blocked"
Then I should not see "Upload Safe Exam Browser config file"
Then I should not see "Allowed Browser Exam Keys"
Then I should not see "Allowed browser exam keys"
Then I should not see "Safe Exam Browser config template"
Then I should not see "Template 1"

2
mod/quiz/accessrule/seb/tests/event_test.php
View file

@ -119,7 +119,7 @@ class quizaccess_seb_event_testcase extends advanced_testcase {
// Test that the event data is as expected.
$this->assertInstanceOf('\quizaccess_seb\event\template_created', $event);
$this->assertEquals('SEB Template was created', $event->get_name());
$this->assertEquals('SEB template was created', $event->get_name());
$this->assertEquals(
"The user with id '$user->id' has created a template with id '{$template->get('id')}'.",
$event->get_description()

2
mod/quiz/accessrule/seb/tests/rule_test.php
View file

@ -751,7 +751,7 @@ class quizaccess_seb_rule__testcase extends advanced_testcase {
// Test that the event data is as expected.
$this->assertInstanceOf('\quizaccess_seb\event\access_prevented', $event);
$this->assertEquals('No SEB browser is being used', $event->other['reason']);
$this->assertEquals('No Safe Exam Browser is being used.', $event->other['reason']);
}
/**

4
question/type/multichoice/lang/en/qtype_multichoice.php
View file

@ -72,6 +72,6 @@ $string['shuffleanswers'] = 'Shuffle the choices?';
$string['shuffleanswers_desc'] = 'Whether options should be randomly shuffled for each attempt by default.';
$string['shuffleanswers_help'] = 'If enabled, the order of the answers is randomly shuffled for each attempt, provided that "Shuffle within questions" in the activity settings is also enabled.';
$string['singleanswer'] = 'Choose one answer.';
$string['showstandardinstruction'] = 'Show standard instruction';
$string['showstandardinstruction_help'] = 'With this setting enabled, standard instruction will be supplied as part of the selection area (e.g. "Select one:" or "Select one or more:"). If disabled, question authors can instead include instructions in the question content, if required.';
$string['showstandardinstruction'] = 'Show standard instructions';
$string['showstandardinstruction_help'] = 'Whether to show the instructions "Select one:" or "Select one or more:" before multiple choice answers.';
$string['toomanyselected'] = 'You have selected too many options.';