mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-77416-master-enfix' of https://github.com/vmdef/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2023-03-08 08:50:30 +08:00
commit 85718f00d8
29 changed files with 70 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
View File

@ -276,7 +276,7 @@ $string['requesttypedelete'] = 'Delete all of my personal data';
$string['requesttypedeleteshort'] = 'Delete';
$string['requesttypeexport'] = 'Export all of my personal data';
$string['requesttypeexportshort'] = 'Export';
$string['requesttypeothers'] = 'General inquiry';
$string['requesttypeothers'] = 'General enquiry';
$string['requesttypeothersshort'] = 'Message';
$string['requireallenddatesforuserdeletion'] = 'Consider courses without end date as active';
$string['requireallenddatesforuserdeletion_desc'] = 'When calculating user expiry, several factors are considered:

2
admin/tool/dataprivacy/tests/behat/contact_privacy_officer.feature
View File

@ -20,7 +20,7 @@ Feature: Contact the privacy officer
And I click on "Send" "button" in the "Contact the privacy officer" "dialogue"
Then I should see "Your request has been submitted to the privacy officer"
And I click on "Data requests" "link"
And I should see "Hello DPO!" in the "General inquiry" "table_row"
And I should see "Hello DPO!" in the "General enquiry" "table_row"
Scenario: Contacting the privacy officer when not enabled
When I log in as "student1"

4
admin/tool/policy/tests/behat/consent.feature
View File

@ -462,7 +462,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
And I am on site homepage
And I change window size to "large"
And I follow "Log in"
When I press "Log in as a guest"
When I press "Access as a guest"
Then I should see "If you continue browsing this website, you agree to our policies"
# Confirm when navigating, the pop-up policies are displayed.
When I am on the "My courses" page
@ -626,7 +626,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
And I am on site homepage
And I follow "Log in"
# First log in as a guest
And I press "Log in as a guest"
And I press "Access as a guest"
# Now sign up
And I follow "Log in"
When I click on "Create new account" "link"

4
blocks/site_main_menu/tests/behat/edit_activities.feature
View File

@ -57,8 +57,8 @@ Feature: Edit activities in main menu block
And I click on "Edit settings" "link" in the "My forum name" activity in site main menu block
And I expand all fieldsets
And the "Availability" select box should contain "Show on course page"
And the "Availability" select box should contain "Hide from students"
And the field "Availability" matches value "Make available but not shown on course page"
And the "Availability" select box should contain "Hide on course page"
And the field "Availability" matches value "Make available but don't show on course page"
And I press "Save and return to course"
And "My forum name" activity in site main menu block should be available but hidden from course page
And I turn editing mode off

4
blocks/social_activities/tests/behat/edit_activities.feature
View File

@ -67,8 +67,8 @@ Feature: Edit activities in social activities block
And I click on "Edit settings" "link" in the "My forum name" activity in social activities block
And I expand all fieldsets
And the "Availability" select box should contain "Show on course page"
And the "Availability" select box should contain "Hide from students"
And the field "Availability" matches value "Make available but not shown on course page"
And the "Availability" select box should contain "Hide on course page"
And the field "Availability" matches value "Make available but don't show on course page"
And I press "Save and return to course"
And "My forum name" activity in social activities block should be available but hidden from course page
And I turn editing mode off

14
course/tests/behat/activities_visibility_icons.feature
View File

@ -57,8 +57,8 @@ Feature: Toggle activities visibility from the course page
And I click on "Edit settings" "link" in the "Test forum name" activity
And I expand all fieldsets
And the "Availability" select box should contain "Show on course page"
And the "Availability" select box should not contain "Make available but not shown on course page"
And the field "Availability" matches value "Hide from students"
And the "Availability" select box should not contain "Make available but don't show on course page"
And the field "Availability" matches value "Hide on course page"
And I press "Save and return to course"
And "Test forum name" activity should be hidden
And I turn editing mode off
@ -100,10 +100,10 @@ Feature: Toggle activities visibility from the course page
And I open "Test forum name" actions menu
And I click on "Edit settings" "link" in the "Test forum name" activity
And I expand all fieldsets
And the "Availability" select box should contain "Hide from students"
And the "Availability" select box should contain "Make available but not shown on course page"
And the "Availability" select box should contain "Hide on course page"
And the "Availability" select box should contain "Make available but don't show on course page"
And the "Availability" select box should not contain "Show on course page"
And I set the field "Availability" to "Make available but not shown on course page"
And I set the field "Availability" to "Make available but don't show on course page"
And I press "Save and return to course"
And "Test forum name" activity should be available but hidden from course page
And I turn editing mode off
@ -142,8 +142,8 @@ Feature: Toggle activities visibility from the course page
And I click on "Edit settings" "link" in the "Test assignment name" activity
And I expand all fieldsets
And the "Availability" select box should contain "Show on course page"
And the "Availability" select box should contain "Hide from students"
And the field "Availability" matches value "Make available but not shown on course page"
And the "Availability" select box should contain "Hide on course page"
And the field "Availability" matches value "Make available but don't show on course page"
And I press "Save and return to course"
And "Test assignment name" activity should be available but hidden from course page
And I turn editing mode off

6
course/tests/behat/section_visibility.feature
View File

@ -21,7 +21,7 @@ Feature: Show/hide course sections
And I add a "Forum" to section "1" and I fill the form with:
| Forum name | Test hidden forum 11 name |
| Description | Test hidden forum 11 description |
| Availability | Hide from students |
| Availability | Hide on course page |
And I add a "Forum" to section "1" and I fill the form with:
| Forum name | Test hidden forum 12 name |
| Description | Test hidden forum 12 description |
@ -29,7 +29,7 @@ Feature: Show/hide course sections
And I add a "Forum" to section "2" and I fill the form with:
| Forum name | Test hidden forum 21 name |
| Description | Test hidden forum 21 description |
| Availability | Hide from students |
| Availability | Hide on course page |
And I add a "Forum" to section "2" and I fill the form with:
| Forum name | Test hidden forum 22 name |
| Description | Test hidden forum 22 description |
@ -37,7 +37,7 @@ Feature: Show/hide course sections
And I add a "Forum" to section "3" and I fill the form with:
| Forum name | Test hidden forum 31 name |
| Description | Test hidden forum 31 description |
| Availability | Hide from students |
| Availability | Hide on course page |
And I add a "Forum" to section "3" and I fill the form with:
| Forum name | Test hidden forum 32 name |
| Description | Test hidden forum 32 description |

2
enrol/self/tests/behat/self_enrolment.feature
View File

@ -25,7 +25,7 @@ Feature: Users can auto-enrol themself in courses where self enrolment is allowe
| Custom instance name | Test student enrolment |
And I log out
When I am on "Course 1" course homepage
And I press "Log in as a guest"
And I press "Access as a guest"
Then I should see "Guests cannot access this course. Please log in."
And I press "Continue"
And I should see "Log in"

2
lang/en/admin.php
View File

@ -581,7 +581,7 @@ $string['enablegravatar'] = 'Enable Gravatar';
$string['enablegravatar_help'] = 'When enabled Moodle will attempt to fetch a user profile picture from Gravatar if the user has not uploaded an image.';
$string['enablemobilewebservice'] = 'Enable web services for mobile devices';
$string['enablepdfexportfont'] = 'Enable PDF fonts';
$string['enablepdfexportfont_desc'] = 'If your site has courses in different languages which need other fonts in generated PDF files, you can provide the option to set the font in the course settings. You need to specify available fonts in $CFG->pdfexportfont in config.php. If $CFG->pdfexportfont defines none or one font, the setting in the course is not shown.';
$string['enablepdfexportfont_desc'] = 'If your site has courses in different languages which need other fonts in generated PDF files, you can provide the option to set the font in the course settings. You need to specify available fonts in $CFG->pdfexportfont in config.php.';
$string['enablerecordcache'] = 'Enable record cache';
$string['enablerssfeeds'] = 'Enable RSS feeds';
$string['enablesearchareas'] = 'Enable search areas';

2
lang/en/backup.php
View File

@ -413,4 +413,4 @@ $string['userdata_help'] = 'If enabled, data such as forum posts, assignment sub
$string['userinfo'] = 'Userinfo';
$string['module'] = 'Module';
$string['morecoursesearchresults'] = 'More than {$a} courses found, showing first {$a} results';
$string['recyclebin_desc'] = 'Note that these settings will be also be used for the recycle bin.';
$string['recyclebin_desc'] = 'Note that these settings will also be used for the recycle bin.';

2
lang/en/error.php
View File

@ -228,7 +228,7 @@ $string['dmlparseexception'] = 'Error parsing SQL query';
$string['dmlreadexception'] = 'Error reading from database';
$string['dmltransactionexception'] = 'Database transaction error';
$string['dmlwriteexception'] = 'Error writing to database';
$string['dndmaxbytes'] = 'The file is too large. The maximum size allowed is {$a->size}';
$string['dndmaxbytes'] = 'The file is too large. The maximum size allowed is {$a->size}.';
$string['dndread'] = 'Error reading the file';
$string['dndupload'] = 'An unknown error ocurred while uploading the file';
$string['dndunkownfile'] = 'This file type is not supported';

4
lang/en/grades.php
View File

@ -569,8 +569,8 @@ $string['noidnumber'] = 'No ID number';
$string['nolettergrade'] = 'No letter grade for';
$string['nomode'] = 'NA';
$string['nonnumericweight'] = 'Received non-numeric value for';
$string['nonunlockableverbose'] = 'This grade cannot be unlocked until {$a->itemname} is unlocked.';
$string['nonunhideableverbose'] = 'This grade cannot be unhidden until {$a->itemname} is hidden.';
$string['nonunlockableverbose'] = 'To unlock this grade, you need to unlock {$a->itemname}.';
$string['nonunhideableverbose'] = 'To unhide this grade, you need to unhide {$a->itemname}.';
$string['nonweightedpct'] = 'non-weighted %';
$string['nooutcome'] = 'No outcome';
$string['nooutcomes'] = 'Outcome items must be linked to a course outcome, but there are no outcomes for this course. Would you like to add one?';

26
lang/en/moodle.php
View File

@ -1023,8 +1023,8 @@ $string['hiddenwithbrackets'] = '(hidden)';
$string['hide'] = 'Hide';
$string['hideadvancedsettings'] = 'Hide advanced settings';
$string['hidechartdata'] = 'Hide chart data';
$string['hidefromstudents'] = 'Hide from students';
$string['hideoncoursepage'] = 'Make available but not shown on course page';
$string['hidefromstudents'] = 'Hide on course page';
$string['hideoncoursepage'] = 'Make available but don\'t show on course page';
$string['hidesection'] = 'Hide section {$a}';
$string['hidesettings'] = 'Hide settings';
$string['hideshowblocks'] = 'Hide or show blocks';
@ -1216,7 +1216,7 @@ $string['loginalready'] = 'You are already logged in';
$string['loginas'] = 'Log in as';
$string['loginaspasswordexplain'] = '<p>You must enter the special "loginas password" to use this feature.<br />If you do not know it, ask your server administrator.</p>';
$string['login_failure_logs'] = 'Login failure logs';
$string['loginguest'] = 'Log in as a guest';
$string['loginguest'] = 'Access as a guest';
$string['loginsite'] = 'Log in to the site';
$string['loginsteps'] = 'For full access to this site, you first need to create an account.';
$string['loginstepsnone'] = '<p>Hi!</p>
@ -1341,19 +1341,15 @@ $string['moddoesnotsupporttype'] = 'Module {$a->modname} does not support upload
$string['modhide'] = 'Hide';
$string['modshow'] = 'Show';
$string['modvisible'] = 'Availability';
$string['modvisible_help'] = 'If the availability is set to \'Show on course page\', the activity or resource is available to students (subject to any access restrictions which may be set).
If the availability is set to \'Hide from students\', the activity or resource is only available to users with permission to view hidden activities (by default, users with the role of teacher or non-editing teacher).';
$string['modvisible_help'] = '* Show on course page: Available to students (subject to any access restrictions which may be set).
* Hide on course page: Not available to students.';
$string['modvisiblewithstealth'] = 'Availability';
$string['modvisiblewithstealth_help'] = 'If the availability is set to \'Show on course page\', the activity or resource is available to students (subject to any access restrictions which may be set).
If the availability is set to \'Hide from students\', the activity or resource is only available to users with permission to view hidden activities (by default, users with the role of teacher or non-editing teacher).
If the course contains many activities or resources, the course page may be simplified by setting the availability to \'Make available but not shown on course page\'. In this case, a link to the activity or resource must be provided from elsewhere, such as from a page resource. The activity would still be listed in the gradebook and other reports.';
$string['modvisiblewithstealth_help'] = '* Show on course page: Available to students (subject to any access restrictions which may be set).
* Hide on course page: Not available to students.
* Make available but don\'t show on course page: Available to students if you provide a link. Activities will still appear in the gradebook and other reports.';
$string['modvisiblehiddensection'] = 'Availability';
$string['modvisiblehiddensection_help'] = 'If the availability is set to \'Hide from students\', the activity or resource is only available to users with permission to view hidden activities (by default, users with the role of teacher or non-editing teacher).
If the course contains many activities or resources, the course page may be simplified by setting the availability to \'Make available but not shown on course page\'. In this case, a link to the activity or resource must be provided from elsewhere, such as from a page resource. The activity would still be listed in the gradebook and other reports.';
$string['modvisiblehiddensection_help'] = '* Hide on course page: Not available to students.
* Make available but don\'t show on course page: Available to students if you provide a link. Activities will still appear in the gradebook and other reports.';
$string['moodlelogo'] = 'Moodle logo';
$string['month'] = 'Month';
$string['months'] = 'Months';
@ -1376,7 +1372,7 @@ $string['moreprofileinfoneeded'] = 'Please tell us more about yourself';
$string['morenavigationlinks'] = 'More...';
$string['mostrecently'] = 'most recently';
$string['move'] = 'Move';
$string['movecoursemodule'] = 'Move resource';
$string['movecoursemodule'] = 'Move activity';
$string['movecoursesection'] = 'Move section';
$string['movecontent'] = 'Move {$a}';
$string['movecontentafter'] = 'After "{$a}"';

4
lib/editor/tiny/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature
View File

@ -27,7 +27,7 @@ Feature: Tiny editor accessibility checker
And I should see "Images require alternative text." in the "Accessibility checker" "dialogue"
And I click on "View" "link" in the "Accessibility checker" "dialogue"
And I click on the "Image" button for the "Description" TinyMCE editor
And the field "Enter URL" matches value "/broken-image"
And the field "URL" matches value "/broken-image"
And I set the field "Describe this image for someone who cannot see it" to "No more warning!"
And I press "Save image"
And I click on the "Tools > Accessibility checker" menu item for the "Description" TinyMCE editor
@ -35,7 +35,7 @@ Feature: Tiny editor accessibility checker
And I click on "Close" "button" in the "Accessibility checker" "dialogue"
And I select the "img" element in position "2" of the "Description" TinyMCE editor
And I click on the "Image" button for the "Description" TinyMCE editor
And I set the field "Enter URL" to "/decorative-image.png"
And I set the field "URL" to "/decorative-image.png"
And I set the field "Describe this image for someone who cannot see it" to ""
And I set the field "Width" to "1"
And I set the field "Height" to "1"

8
lib/editor/tiny/plugins/media/lang/en/tiny_media.php
View File

@ -56,10 +56,10 @@ $string['descriptions'] = 'Descriptions';
$string['descriptionssourcelabel'] = 'Description track URL';
$string['displayoptions'] = 'Display options';
$string['enteralt'] = 'Describe this image for someone who cannot see it';
$string['entername'] = 'Enter name';
$string['entername'] = 'Name';
$string['entersource'] = 'Source URL';
$string['entertitle'] = 'Enter title';
$string['enterurl'] = 'Enter URL';
$string['entertitle'] = 'Title';
$string['enterurl'] = 'URL';
$string['filemanager'] = 'File manager';
$string['hasmissingfiles'] = 'Warning! The following files that are referenced in the text area appear to be missing:';
$string['height'] = 'Height';
@ -87,7 +87,7 @@ $string['presentationoraltrequired'] = 'An image must have a description, unless
$string['privacy:metadata'] = 'The media plugin for TinyMCE does not store any personal data.';
$string['remove'] = 'Remove';
$string['saveimage'] = 'Save image';
$string['size'] = 'Size';
$string['size'] = 'Width x height (in pixels)';
$string['srclang'] = 'Language';
$string['subtitles_help'] = 'Subtitles may be used to provide a transcription or translation of the dialogue.';
$string['subtitles'] = 'Subtitles';

4
lib/editor/tiny/plugins/media/tests/behat/video.feature
View File

@ -40,7 +40,7 @@ Feature: Use the TinyMCE editor to upload a video
And I select the "video" element in position "1" of the "Description" TinyMCE editor
When I click on the "Multimedia" button for the "Description" TinyMCE editor
And I click on "Display options" "link"
And I set the field "Enter title" to "Test title"
And I set the field "Title" to "Test title"
And I click on "Advanced settings" "link"
And I click on "Play automatically" "checkbox"
And I click on "Muted" "checkbox"
@ -51,7 +51,7 @@ Feature: Use the TinyMCE editor to upload a video
And I select the "video" element in position "1" of the "Description" TinyMCE editor
And I click on the "Multimedia" button for the "Description" TinyMCE editor
And I click on "Display options" "link"
And the field "Enter title" matches value "Test title"
And the field "Title" matches value "Test title"
And I click on "Advanced settings" "link"
And the field "Play automatically" matches value "1"
And the field "Muted" matches value "1"

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

@ -27,7 +27,7 @@ $string['activitydate:submissionsdue'] = 'Due:';
$string['activitydate:submissionsopen'] = 'Opens:';
$string['activitydate:submissionsopened'] = 'Opened:';
$string['activityeditor'] = 'Activity instructions';
$string['activityeditor_help'] = 'The actions you would like the student to complete for this assignment. This is only shown on the submission page where a students edits and submits their assignment.';
$string['activityeditor_help'] = 'The actions you would like the student to complete for this assignment. This is only shown on the submission page where a student edits and submits their assignment.';
$string['activityoverview'] = 'You have assignments that need attention';
$string['addattempt'] = 'Allow another attempt';
$string['addnewattempt'] = 'Add a new attempt';

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

@ -208,7 +208,7 @@ Feature: Assign user override
Given I am on the "Test assignment name" Activity page logged in as teacher1
And I navigate to "Settings" in current page administration
And I expand all fieldsets
And I set the field "Availability" to "Hide from students"
And I set the field "Availability" to "Hide on course page"
And I click on "Save and display" "button"
When I navigate to "Overrides" in current page administration
And I press "Add user override"

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

@ -186,7 +186,7 @@ $string['config_recordings_preview_default_description'] = 'If enabled the table
$string['config_recordings_preview_editable'] = 'Preview feature can be edited';
$string['config_recordings_preview_editable_description'] = 'Preview feature can be edited when the instance is added or updated.';
$string['config_recordings_asc_sort'] = 'List recordings in chronological order';
$string['config_recordings_asc_sort_description'] = 'Recordings are ordered by date, either chronological or reverse chronological order.';
$string['config_recordings_asc_sort_description'] = 'Recordings are ordered by date, either chronological or reverse chronological order (most recent recording first).';
$string['config_importrecordings'] = 'Import recordings';
$string['config_importrecordings_description'] = 'These settings are feature specific.';

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

@ -191,7 +191,7 @@ $string['fieldsinformationtags'] = 'Field information';
$string['fieldsnavigation'] = 'Fields tertiary navigation';
$string['fieldtagdescription'] = '{$a} description';
$string['fieldtagname'] = '{$a} name';
$string['fieldtagid'] = '{$a} id';
$string['fieldtagid'] = '{$a} ID';
$string['fieldupdated'] = 'Field updated';
$string['fieldwidth'] = 'Width';
$string['fieldwidthlistview'] = 'Width (in pixels) in list view';

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

@ -95,8 +95,8 @@ $string['cannotfavourite'] = 'Sorry, but you do not have the permission to star
$string['cannottrack'] = 'Could not stop tracking that forum';
$string['cannotunsubscribe'] = 'Could not unsubscribe you from that forum';
$string['cannotupdatepost'] = 'You can not update this post';
$string['cannotuseseperategroupsandsingletopic'] = 'Separate groups cannot be used with single discussion topic';
$string['cannotusesingletopicandseperategroups'] = 'Single discussion topic cannot be used with separate groups';
$string['cannotuseseperategroupsandsingletopic'] = 'Separate groups can\'t be used with a single simple discussion.';
$string['cannotusesingletopicandseperategroups'] = 'A single simple discussion can\'t be used with separate groups.';
$string['cannotviewpostyet'] = 'You can\'t read other students\' posts in this discussion yet because you haven\'t posted.';
$string['cannotviewusersposts'] = 'There are no posts made by this user that you are able to view.';
$string['cleanreadtime'] = 'Mark old posts as read hour';
@ -508,7 +508,7 @@ $string['parentofthispost'] = 'Parent of this post';
$string['permalink'] = 'Permalink';
$string['permanentlinktopost'] = 'Permanent link to this post';
$string['permanentlinktoparentpost'] = 'Permanent link to the parent of this post';
$string['postisprivatereply'] = 'This is a private reply. It is only visible to you and anyone with the capability to view private replies, such as teachers or managers.';
$string['postisprivatereply'] = 'This is a private reply. (Teachers and other users with the capability to view private replies can also see it.)';
$string['pindiscussion'] = 'Pin this discussion';
$string['pinupdated'] = 'The pin option has been updated.';
$string['posttomygroups'] = 'Post a copy to all groups';
@ -602,7 +602,7 @@ $string['privacy:request:delete:post:message'] = 'The content of this post has b
$string['privacy:request:delete:post:subject'] = 'Delete at the request of the author';
$string['privacy:subscribedtoforum'] = 'You are subscribed to this forum.';
$string['privatereply'] = 'Reply privately';
$string['privatereply_help'] = 'A private reply can only be viewed by the author of the post being replied to, and any users with the capability to view private replies.';
$string['privatereply_help'] = 'When you reply privately, your post is also visible to users with the capability to view private replies, such as teachers.';
$string['processingdigest'] = 'Processing email digest for user {$a}';
$string['processingpost'] = 'Processing post {$a}';
$string['prune'] = 'Split';

4
mod/forum/tests/behat/add_forum.feature
View File

@ -57,5 +57,5 @@ Feature: Add forum activities and discussions
| Forum type | single |
| Group mode | 1 |
When I press "Save and display"
Then I should see "Separate groups cannot be used with single discussion topic"
And I should see "Single discussion topic cannot be used with separate groups"
Then I should see "Separate groups can't be used with a single simple discussion."
And I should see "A single simple discussion can't be used with separate groups."

2
mod/forum/tests/behat/forum_subscriptions_availability.feature
View File

@ -97,7 +97,7 @@ Feature: As a teacher I need to see an accurate list of subscribed users
And I am on the "Forced Forum 2" "forum activity editing" page
And I set the following fields to these values:
| Subscription mode | Forced subscription |
| Availability | Hide from students |
| Availability | Hide on course page |
And I press "Save and return to course"
And I am on the "Forced Forum 2" "forum activity" page
And I navigate to "Subscriptions" in current page administration

12
mod/forum/tests/behat/guest_users.feature
View File

@ -28,7 +28,7 @@ Feature: Guest and not logged users could see the option to add new post or repl
| Message | How awesome is this forum discussion? |
And I log out
And I am on "Course 1" course homepage
When I press "Log in as a guest"
When I press "Access as a guest"
And I am on the "Forum" "forum activity" page
Then I should not see "Add discussion topic"
And I should see "Forum discussion 1"
@ -47,7 +47,7 @@ Feature: Guest and not logged users could see the option to add new post or repl
| forum | Forum (single discussion) | C1 | forum | single |
And I log out
And I am on "Course 1" course homepage
When I press "Log in as a guest"
When I press "Access as a guest"
And I am on the "Forum (single discussion)" "forum activity" page
Then I should not see "Add discussion topic"
And I should see "Forum (single discussion)"
@ -62,7 +62,7 @@ Feature: Guest and not logged users could see the option to add new post or repl
| Message | How awesome is this forum discussion? |
And I log out
And I am on "Course 1" course homepage
When I press "Log in as a guest"
When I press "Access as a guest"
And I am on the "Forum" "forum activity" page
Then I should not see "Add discussion topic"
And I should see "Forum discussion 1"
@ -79,7 +79,7 @@ Feature: Guest and not logged users could see the option to add new post or repl
| Message | How awesome is this forum discussion? |
And I log out
And I am on "Course 1" course homepage
When I press "Log in as a guest"
When I press "Access as a guest"
And I am on the "Forum" "forum activity" page
Then I should see "Add discussion topic"
And I click on "Add discussion topic" "link"
@ -107,7 +107,7 @@ Feature: Guest and not logged users could see the option to add new post or repl
| forum | Forum (single discussion) | C1 | forum | single |
And I log out
And I am on "Course 1" course homepage
When I press "Log in as a guest"
When I press "Access as a guest"
And I am on the "Forum (single discussion)" "forum activity" page
And I should see "Forum (single discussion)"
Then I should see "Reply"
@ -130,7 +130,7 @@ Feature: Guest and not logged users could see the option to add new post or repl
| Message | How awesome is this forum discussion? |
And I log out
And I am on "Course 1" course homepage
When I press "Log in as a guest"
When I press "Access as a guest"
And I am on the "Forum" "forum activity" page
Then I should see "Add discussion topic"
And I click on "Add discussion topic" "link"

2
mod/forum/tests/behat/inpage_reply.feature
View File

@ -42,6 +42,6 @@ Feature: Students can reply to a discussion in page.
| post | Discussion contents 1, third message |
| privatereply | 1 |
Then I should see "Discussion contents 1, third message"
Then I should see "This is a private reply. It is only visible to you and anyone with the capability to view private replies, such as teachers or managers."
Then I should see "This is a private reply. (Teachers and other users with the capability to view private replies can also see it.)"
When I reload the page
Then I should see "Discussion contents 1, third message"

4
mod/label/tests/behat/label_visibility.feature
View File

@ -57,8 +57,8 @@ Feature: Check label visibility works
And "Swanky label" actions menu should not have "Make unavailable" item
And I click on "Edit settings" "link" in the "Swanky label" activity
And I expand all fieldsets
And the "Availability" select box should contain "Hide from students"
And the "Availability" select box should not contain "Make available but not shown on course page"
And the "Availability" select box should contain "Hide on course page"
And the "Availability" select box should not contain "Make available but don't show on course page"
And the "Availability" select box should not contain "Show on course page"
And I log out
And I log in as "student"

2
mod/lesson/tests/behat/lesson_user_override.feature
View File

@ -329,7 +329,7 @@ Feature: Lesson user override
Scenario: Create a user override when the lesson is not available to the student
Given I am on the "Test lesson name" "lesson activity editing" page logged in as teacher1
And I expand all fieldsets
And I set the field "Availability" to "Hide from students"
And I set the field "Availability" to "Hide on course page"
And I click on "Save and display" "button"
When I navigate to "Overrides" in current page administration
And I follow "Add user override"

4
mod/quiz/accessrule/seb/lang/en/quizaccess_seb.php
View File

@ -64,7 +64,7 @@ $string['fileparsefailed'] = 'The uploaded file could not be saved as a SEB conf
$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.";
$string['invalidkeys'] = 'The Safe Exam Browser keys could not be validated. Check that you\'re using Safe Exam Browser with the correct configuration file.';
$string['invalidtemplate'] = "Invalid SEB config template";
$string['manage_templates'] = 'Safe Exam Browser templates';
$string['managetemplates'] = 'Manage templates';
@ -180,7 +180,7 @@ $string['seb_use_upload'] = 'Yes – Upload my own config';
$string['seb_userconfirmquit'] = 'Ask user to confirm quitting';
$string['seb_userconfirmquit_help'] = 'If enabled, users have to confirm quitting of SEB when a quit link is detected.';
$string['sebdownloadbutton'] = 'Download Safe Exam Browser';
$string['sebkeysvalidationfailed'] = 'SEB keys validation failed';
$string['sebkeysvalidationfailed'] = 'Error validating SEB keys';
$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';

8
mod/quiz/accessrule/seb/tests/rule_test.php
View File

@ -344,8 +344,8 @@ class rule_test extends \advanced_testcase {
// Check that correct error message is returned.
$errormsg = $this->make_rule()->prevent_access();
$this->assertNotEmpty($errormsg);
$this->assertStringContainsString("The config key or browser exam keys could not be validated. "
. "Please ensure you are using the Safe Exam Browser with correct configuration file.", $errormsg);
$this->assertStringContainsString("The Safe Exam Browser keys could not be validated. "
. "Check that you're using Safe Exam Browser with the correct configuration file.", $errormsg);
$this->assertStringContainsString($this->get_seb_download_link(), $errormsg);
$this->assertStringContainsString($this->get_seb_launch_link(), $errormsg);
$this->assertStringContainsString($this->get_seb_config_download_link(), $errormsg);
@ -601,8 +601,8 @@ class rule_test extends \advanced_testcase {
// Check that correct error message is returned.
$errormsg = $this->make_rule()->prevent_access();
$this->assertNotEmpty($errormsg);
$this->assertStringContainsString("The config key or browser exam keys could not be validated. "
. "Please ensure you are using the Safe Exam Browser with correct configuration file.", $errormsg);
$this->assertStringContainsString("The Safe Exam Browser keys could not be validated. "
. "Check that you're using Safe Exam Browser with the correct configuration file.", $errormsg);
if ($downloadseblink) {
$this->assertStringContainsString($this->get_seb_download_link(), $errormsg);