From 06666c60f55e7487b34df85d4ac3c6d301319fa6 Mon Sep 17 00:00:00 2001 From: Helen Foster Date: Tue, 1 Oct 2024 18:55:41 +0200 Subject: [PATCH 1/2] MDL-83238 lang: Import fixed English strings (en_fix) --- blocks/myoverview/lang/en/block_myoverview.php | 2 +- lang/en/badges.php | 4 ++-- lang/en/blog.php | 2 +- lang/en/enrol.php | 2 +- lang/en/grades.php | 2 +- lang/en/moodle.php | 17 ++++++----------- lib/editor/tiny/lang/en/editor_tiny.php | 4 ++-- mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php | 6 +++--- mod/feedback/lang/en/feedback.php | 2 +- 9 files changed, 18 insertions(+), 23 deletions(-) diff --git a/blocks/myoverview/lang/en/block_myoverview.php b/blocks/myoverview/lang/en/block_myoverview.php index 08be768497b..62bc0c395d4 100644 --- a/blocks/myoverview/lang/en/block_myoverview.php +++ b/blocks/myoverview/lang/en/block_myoverview.php @@ -88,7 +88,7 @@ $string['sortbylastaccessed'] = 'Sort by last accessed'; $string['sortbyshortname'] = 'Sort by short name'; $string['privacy:request:preference:set'] = 'The value of the setting \'{$a->name}\' was \'{$a->value}\''; $string['viewquickstart'] = 'View Quickstart guide'; -$string['zero_default_title'] = 'You\'re not enrolled in any course'; +$string['zero_default_title'] = 'You\'re not enrolled in any courses.'; $string['zero_default_intro'] = 'Once you\'re enrolled in a course, it will appear here.'; $string['zero_request_title'] = 'Request your first course'; $string['zero_request_intro'] = 'Need help getting started? Check out the Moodle documentation or take your first steps with our Quickstart guide.'; diff --git a/lang/en/badges.php b/lang/en/badges.php index 267a56d336e..c45b96459c3 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -424,13 +424,13 @@ $string['newbadge'] = 'Add a new badge'; $string['newimage'] = 'New image'; $string['noalignment'] = 'This badge does not have any external skills or standards specified.'; $string['noawards'] = 'This badge has not been earned yet.'; -$string['nomatchingawards'] = 'There are no matching recipients who have earned this badge yet'; +$string['nomatchingawards'] = 'There are no matching recipients who have earned this badge yet.'; $string['nobackpack'] = 'There is no backpack service connected to this account.
'; $string['nobackpackbadgessummary'] = 'There are no badges in the collections you have selected.'; $string['nobackpackcollectionssummary'] = 'No badge collections have been selected.'; $string['nobackpacks'] = 'There are no backpacks available'; $string['nobadges'] = 'There are currently no badges available for users to earn.'; -$string['nomatchingbadges'] = 'There are no matching badges available for users to earn'; +$string['nomatchingbadges'] = 'There are no matching badges available for users to earn.'; $string['nocompetencies'] = 'No competencies selected.'; $string['nocriteria'] = 'Criteria for this badge have not been set up yet.'; $string['noendorsement'] = 'This badge does not have an endorsement.'; diff --git a/lang/en/blog.php b/lang/en/blog.php index 43e9de3d6de..63d4e7296fb 100644 --- a/lang/en/blog.php +++ b/lang/en/blog.php @@ -115,7 +115,7 @@ $string['incorrectblogfilter'] = 'Incorrect blog filter type specified'; $string['intro'] = 'This RSS feed was automatically generated from one or more blogs.'; $string['invalidgroupid'] = 'Invalid group ID'; $string['invalidurl'] = 'This URL is unreachable'; -$string['linktooriginalentry'] = 'Link to original blog entry'; +$string['linktooriginalentry'] = 'Original blog entry'; $string['maxexternalblogsperuser'] = 'Maximum number of external blogs per user'; $string['myprofileuserblogs'] = 'View all blog entries'; $string['name'] = 'Name'; diff --git a/lang/en/enrol.php b/lang/en/enrol.php index 4b19f85ca20..8ad37ecb54e 100644 --- a/lang/en/enrol.php +++ b/lang/en/enrol.php @@ -45,7 +45,7 @@ $string['customwelcomemessage_help'] = 'Accepted formats: Plain text or Moodle-a
  • User last name {$a->lastname}
  • User course role {$a->courserole}
    • '; -$string['customwelcomemessageplaceholder'] = 'Dear {$a->fullname}, you have successfully been enrolled to course {$a->coursename}'; +$string['customwelcomemessageplaceholder'] = 'Dear {$a->fullname}, you are enrolled in the course {$a->coursename}.'; $string['defaultenrol'] = 'Add instance to new courses'; $string['defaultenrol_desc'] = 'It is possible to add this plugin to all new courses by default.'; $string['deleteinstanceconfirm'] = 'You are about to delete the enrolment method "{$a->name}". All {$a->users} users currently enrolled using this method will be unenrolled and any course-related data such as users\' grades, group membership or forum subscriptions will be deleted. diff --git a/lang/en/grades.php b/lang/en/grades.php index 0bb3339f88a..2274f80a66f 100644 --- a/lang/en/grades.php +++ b/lang/en/grades.php @@ -474,7 +474,7 @@ $string['letterreal'] = 'Letter (real)'; $string['letters'] = 'Letters'; $string['linkedactivity'] = 'Linked activity'; $string['linkedactivity_help'] = 'This setting specifies an activity to which this outcome item is linked. This may be used to measure student performance on criteria not assessed by the activity grade.'; -$string['linktoactivity'] = 'Link to {$a->name} activity {$a->title}'; +$string['linktoactivity'] = '{$a->name} activity {$a->title}'; $string['lock'] = 'Lock'; $string['locked'] = 'Locked'; $string['locked_help'] = 'If ticked, grades can no longer be automatically updated by the related activity.'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 14fd3b8c950..992294743f5 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -1520,22 +1520,17 @@ $string['newusernewpasswordtext'] = 'Hi {$a->firstname}, A new account has been created for you at \'{$a->sitename}\' and you have been issued with a new temporary password. -Your current login information is now: +Your login information is: username: {$a->username} password: {$a->newpassword} (you will have to change your password - when you login for the first time) + when you log in for the first time) -To start using \'{$a->sitename}\', login at +To start using \'{$a->sitename}\', log in at {$a->link} -In most mail programs, this should appear as a blue link -which you can just click on. If that doesn\'t work, -then cut and paste the address into the address -line at the top of your web browser window. - -Cheers from the \'{$a->sitename}\' administrator, -{$a->signoff}'; +If you need help, you can contact the site administrator, +{$a->admin}'; $string['newusers'] = 'New users'; $string['newwindow'] = 'New window'; $string['next'] = 'Next'; @@ -1708,7 +1703,7 @@ $string['pluginsetup'] = 'Setting up plugin tables'; $string['policyaccept'] = 'I understand and agree'; $string['policyagree'] = 'You must agree to this policy to continue using this site. Do you agree?'; $string['policyagreement'] = 'Site policy agreement'; -$string['policyagreementclick'] = 'Link to site policy agreement'; +$string['policyagreementclick'] = 'Site policy agreement'; $string['popup'] = 'popup'; $string['popupwindow'] = 'Open file in new window'; $string['popupwindowname'] = 'Popup window'; diff --git a/lib/editor/tiny/lang/en/editor_tiny.php b/lib/editor/tiny/lang/en/editor_tiny.php index 2823548b2ff..ae78db14276 100644 --- a/lib/editor/tiny/lang/en/editor_tiny.php +++ b/lib/editor/tiny/lang/en/editor_tiny.php @@ -62,7 +62,7 @@ $string['tiny:black'] = 'Black'; $string['tiny:block'] = 'Block'; $string['tiny:block_0'] = 'Block {0}'; $string['tiny:blockquote'] = 'Blockquote'; -$string['tiny:blocks'] = 'Blocks'; +$string['tiny:blocks'] = 'Paragraph styles'; $string['tiny:blue'] = 'Blue'; $string['tiny:blue_component'] = 'Blue component'; $string['tiny:body'] = 'Body'; @@ -346,7 +346,7 @@ $string['tiny:select_all'] = 'Select all'; $string['tiny:select...'] = 'Select...'; $string['tiny:selection'] = 'Selection'; $string['tiny:shortcut'] = 'Shortcut'; -$string['tiny:show_blocks'] = 'Show blocks'; +$string['tiny:show_blocks'] = 'Show paragraph styles'; $string['tiny:show_caption'] = 'Show caption'; $string['tiny:show_invisible_characters'] = 'Show invisible characters'; $string['tiny:size'] = 'Size'; diff --git a/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php b/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php index 28fa1fbf9eb..8df8d10a7ec 100644 --- a/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php +++ b/mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php @@ -206,10 +206,10 @@ $string['config_voicebridge_description'] = 'These settings enable or disable op $string['config_voicebridge_editable'] = 'Conference voice bridge can be edited'; $string['config_voicebridge_editable_description'] = 'A conference voice bridge number can be permanently assigned to a room. When assigned, the number cannot be used for any other room.'; -$string['config_preuploadpresentation'] = 'Pre-upload presentation'; +$string['config_preuploadpresentation'] = 'Presentation file'; $string['config_preuploadpresentation_description'] = 'These settings enable or disable options in the UI and also define default values for these options. The feature works only if the Moodle server is accessible to BigBlueButton.'; -$string['config_preuploadpresentation_editable'] = 'Pre-uploading presentation editable'; -$string['config_preuploadpresentation_editable_description'] = 'Preupload presentation feature is editable in the UI when the room or conference is added or updated.'; +$string['config_preuploadpresentation_editable'] = 'Presentation file on activity page'; +$string['config_preuploadpresentation_editable_description'] = 'Option in activity settings to upload presentation file to show on activity page.'; $string['config_presentation_default'] = 'Default presentation file'; $string['config_presentation_default_description'] = 'A file may be provided for use in all rooms.'; diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php index 42ac0a4a6f3..6bc24bd597b 100644 --- a/mod/feedback/lang/en/feedback.php +++ b/mod/feedback/lang/en/feedback.php @@ -41,7 +41,7 @@ $string['bold'] = 'Bold'; $string['calendarend'] = '{$a} closes'; $string['calendarstart'] = '{$a} opens'; $string['cannotaccess'] = 'You can only access this feedback from a course'; -$string['cannotcreatepagebreak'] = 'Page breaks cannot be added at the beginning of a feedback, and only one page break can be added at the end'; +$string['cannotcreatepagebreak'] = 'A page break cannot be added at the beginning, and only one page break can be added at the end.'; $string['cannotsavetempl'] = 'Saving templates is not allowed'; $string['captcha'] = 'Captcha'; $string['captchanotset'] = 'Captcha hasn\'t been set.'; From 6e61b34ac2ab06fcc15e4356a72052216dd77a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Mon, 30 Sep 2024 20:04:54 +0200 Subject: [PATCH 2/2] MDL-83238 lang: Fix the changed strings in the tests, too --- admin/tool/behat/tests/behat/tabs.feature | 2 +- badges/tests/behat/add_badge.feature | 6 +++--- badges/tests/behat/award_badge.feature | 2 +- badges/tests/behat/manage_badges.feature | 2 +- badges/tests/behat/nobadge_navigation.feature | 2 +- .../tests/behat/block_myoverview_pagination.feature | 2 +- .../tests/behat/block_myoverview_search.feature | 2 +- .../tests/behat/block_myoverview_zerostate.feature | 6 +++--- enrol/manual/tests/behat/welcomemessage.feature | 12 ++++++------ enrol/self/tests/behat/welcomemessage.feature | 12 ++++++------ 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/admin/tool/behat/tests/behat/tabs.feature b/admin/tool/behat/tests/behat/tabs.feature index 308af83cb22..210b916e526 100644 --- a/admin/tool/behat/tests/behat/tabs.feature +++ b/admin/tool/behat/tests/behat/tabs.feature @@ -25,7 +25,7 @@ Feature: Confirm that we can open multiple browser tabs And I open a tab named "CourseViewer4" on the "My courses" page # Switch between all the tabs and confirm their different contents. - Then I should see "You're not enrolled in any course" + Then I should see "You're not enrolled in any courses." And I switch to "CourseViewer2" tab And "Course 3" "heading" should exist And I switch to "CourseViewer1" tab diff --git a/badges/tests/behat/add_badge.feature b/badges/tests/behat/add_badge.feature index bd721204c4b..5375a12a05f 100644 --- a/badges/tests/behat/add_badge.feature +++ b/badges/tests/behat/add_badge.feature @@ -17,7 +17,7 @@ Feature: Add badges to the system And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" Given I click on "Site badges" "link" in the "Navigation" "block" - Then I should see "There are no matching badges available for users to earn" + Then I should see "There are no matching badges available for users to earn." @javascript @_file_upload Scenario: Add a badge @@ -51,7 +51,7 @@ Feature: Add badges to the system And I should see "Math" And I should see "Physics" And I navigate to "Badges > Manage badges" in site administration - And I should not see "There are no matching badges available for users to earn" + And I should not see "There are no matching badges available for users to earn." @javascript @_file_upload Scenario: Add a badge related @@ -163,7 +163,7 @@ Feature: Add badges to the system And I should see "Alignments (0)" And I should not see "Create badge" And I navigate to "Badges > Manage badges" in site administration - And I should not see "There are no matching badges available for users to earn" + And I should not see "There are no matching badges available for users to earn." # See buttons from the "Site badges" page. And I am on homepage When I click on "Site pages" "list_item" in the "Navigation" "block" diff --git a/badges/tests/behat/award_badge.feature b/badges/tests/behat/award_badge.feature index b31018570f7..04daec97711 100644 --- a/badges/tests/behat/award_badge.feature +++ b/badges/tests/behat/award_badge.feature @@ -104,7 +104,7 @@ Feature: Award badges And I add the "Navigation" block if not present And I click on "Site pages" "list_item" in the "Navigation" "block" And I click on "Site badges" "link" in the "Navigation" "block" - Then I should see "There are no matching badges available for users to earn" + Then I should see "There are no matching badges available for users to earn." And I should not see "Manage badges" And I should not see "Add a new badge" diff --git a/badges/tests/behat/manage_badges.feature b/badges/tests/behat/manage_badges.feature index 1dc56ac44d9..0a5065f9999 100644 --- a/badges/tests/behat/manage_badges.feature +++ b/badges/tests/behat/manage_badges.feature @@ -45,7 +45,7 @@ Feature: Manage badges And I navigate to "Badges > Manage badges" in site administration And I press "Delete" action in the "Badge #1" report row And I press "Delete and remove existing issued badges" - Then I should see "There are no matching badges available for users to earn" + Then I should see "There are no matching badges available for users to earn." Scenario Outline: Filter managed badges Given the following "core_badges > Badges" exist: diff --git a/badges/tests/behat/nobadge_navigation.feature b/badges/tests/behat/nobadge_navigation.feature index d04fc35136d..b8ada2fdf5a 100644 --- a/badges/tests/behat/nobadge_navigation.feature +++ b/badges/tests/behat/nobadge_navigation.feature @@ -4,7 +4,7 @@ Feature: Manage badges is not shown when there are no existing badges. Scenario: Check navigation at site level with no badges Given I log in as "admin" When I navigate to "Badges > Manage badges" in site administration - And I should see "There are no matching badges available for users to earn" + And I should see "There are no matching badges available for users to earn." Then "Manage badges" "button" should not exist Scenario: Check navigation at course level with no badges diff --git a/blocks/myoverview/tests/behat/block_myoverview_pagination.feature b/blocks/myoverview/tests/behat/block_myoverview_pagination.feature index bc4f23c734b..54ba2af40f2 100644 --- a/blocks/myoverview/tests/behat/block_myoverview_pagination.feature +++ b/blocks/myoverview/tests/behat/block_myoverview_pagination.feature @@ -35,7 +35,7 @@ Feature: My overview block pagination Scenario: The pagination controls should be hidden if I am not enrolled in any courses When I am on the "My courses" page logged in as "student1" - Then I should see "You're not enrolled in any course" in the "Course overview" "block" + Then I should see "You're not enrolled in any courses." in the "Course overview" "block" And I should not see "Show" in the "Course overview" "block" And ".block_myoverview .dropdown-menu.show" "css_element" should not be visible And ".block_myoverview [data-control='next']" "css_element" should not be visible diff --git a/blocks/myoverview/tests/behat/block_myoverview_search.feature b/blocks/myoverview/tests/behat/block_myoverview_search.feature index 8a0754d7d2c..5e210f277c0 100644 --- a/blocks/myoverview/tests/behat/block_myoverview_search.feature +++ b/blocks/myoverview/tests/behat/block_myoverview_search.feature @@ -40,7 +40,7 @@ Feature: My overview block searching Scenario: There is no search if I am not enrolled in any course When I am on the "My courses" page logged in as "student2" - Then I should see "You're not enrolled in any course" in the "Course overview" "block" + Then I should see "You're not enrolled in any courses." in the "Course overview" "block" And "Search courses" "field" should not exist in the "Course overview" "block" And I log out diff --git a/blocks/myoverview/tests/behat/block_myoverview_zerostate.feature b/blocks/myoverview/tests/behat/block_myoverview_zerostate.feature index 79cece88b26..19856e27d54 100644 --- a/blocks/myoverview/tests/behat/block_myoverview_zerostate.feature +++ b/blocks/myoverview/tests/behat/block_myoverview_zerostate.feature @@ -15,7 +15,7 @@ Feature: Zero state on my overview block Scenario: Users with no permissions don't see any CTA Given I am on the "My courses" page logged in as "user" - When I should see "You're not enrolled in any course" + When I should see "You're not enrolled in any courses." Then I should see "Once you're enrolled in a course, it will appear here." And I should not see "Create course" And I should not see "Request a course" @@ -46,7 +46,7 @@ Feature: Zero state on my overview block | fullname | Course 1 | | shortname | C1 | When I am on the "My courses" page logged in as "manager" - Then I should see "You're not enrolled in any course" + Then I should see "You're not enrolled in any courses." Then I should see "Once you're enrolled in a course, it will appear here." And "Manage courses" "button" should exist And "Create course" "button" should exist @@ -64,7 +64,7 @@ Feature: Zero state on my overview block | fullname | Course 1 | | shortname | C1 | When I am on the "My courses" page logged in as "manager" - Then I should see "You're not enrolled in any course" + Then I should see "You're not enrolled in any courses." Then I should not see "To view all courses on this sie, go to Manage courses" And "Manage courses" "button" should not exist And "Create course" "button" should exist diff --git a/enrol/manual/tests/behat/welcomemessage.feature b/enrol/manual/tests/behat/welcomemessage.feature index 17d5377d5c6..7f421c2ca6d 100644 --- a/enrol/manual/tests/behat/welcomemessage.feature +++ b/enrol/manual/tests/behat/welcomemessage.feature @@ -29,7 +29,7 @@ Feature: A course welcome message will be sent to the user when they are enrolle Then I should see "Send course welcome message" And the field "Send course welcome message" matches value "From the course contact" And I should see "Custom welcome message" - And the field "Custom welcome message" matches value "Dear {$a->fullname}, you have successfully been enrolled to course {$a->coursename}" + And the field "Custom welcome message" matches value "Dear {$a->fullname}, you are enrolled in the course {$a->coursename}." And I should see "Accepted formats: Plain text or Moodle-auto format. HTML tags and multi-lang tags are also accepted, as well as the following placeholders:" And I set the field "Send course welcome message" to "No" And I should not see "Custom welcome message" @@ -71,14 +71,14 @@ Feature: A course welcome message will be sent to the user when they are enrolle And I open the notification popover And I should see "Welcome to Course 1" And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element" - And I should see "Dear First User, you have successfully been enrolled to course Course 1" + And I should see "Dear First User, you are enrolled in the course Course 1." # Login as second user and check the notification. And I am on the "C1" "course" page logged in as user2 And I should see "1" in the "#nav-notification-popover-container [data-region='count-container']" "css_element" And I open the notification popover And I should see "Welcome to Course 2" And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element" - And I should see "Dear Second User, you have successfully been enrolled to course Course 2" + And I should see "Dear Second User, you are enrolled in the course Course 2." @javascript Scenario: Students should receive a welcome message if the setting is enabled - Custom message @@ -87,7 +87,7 @@ Feature: A course welcome message will be sent to the user when they are enrolle And I click on "Edit" "link" in the "Manual enrolments" "table_row" And I set the field "Custom welcome message" to multiline: """ - Dear {$a->fullname}, you have successfully been enrolled to course {$a->coursename}. + Dear {$a->fullname}, you are enrolled in the course {$a->coursename}. Your email address: {$a->email} Your first name: {$a->firstname} Your last name: {$a->lastname} @@ -105,7 +105,7 @@ Feature: A course welcome message will be sent to the user when they are enrolle And I open the notification popover And I should see "Welcome to Course 1" And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element" - And I should see "Dear First User, you have successfully been enrolled to course Course 1" + And I should see "Dear First User, you are enrolled in the course Course 1." And I should see "Your email address: first@example.com" And I should see "Your first name: First" And I should see "Your last name: User" @@ -116,7 +116,7 @@ Feature: A course welcome message will be sent to the user when they are enrolle And I open the notification popover And I should see "Welcome to Course 1" And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element" - And I should see "Dear Second User, you have successfully been enrolled to course Course 1" + And I should see "Dear Second User, you are enrolled in the course Course 1." And I should see "Your email address: second@example.com" And I should see "Your first name: Second" And I should see "Your last name: User" diff --git a/enrol/self/tests/behat/welcomemessage.feature b/enrol/self/tests/behat/welcomemessage.feature index 3cc8e7df22f..f18fe3f37c7 100644 --- a/enrol/self/tests/behat/welcomemessage.feature +++ b/enrol/self/tests/behat/welcomemessage.feature @@ -34,7 +34,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol Then I should see "Send course welcome message" And the field "Send course welcome message" matches value "From the course contact" And I should see "Custom welcome message" - And the field "Custom welcome message" matches value "Dear {$a->fullname}, you have successfully been enrolled to course {$a->coursename}" + And the field "Custom welcome message" matches value "Dear {$a->fullname}, you are enrolled in the course {$a->coursename}." And I should see "Accepted formats: Plain text or Moodle-auto format. HTML tags and multi-lang tags are also accepted, as well as the following placeholders:" And I set the field "Send course welcome message" to "No" And I should not see "Custom welcome message" @@ -62,7 +62,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol And I open the notification popover And I should see "Welcome to Course 1" And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element" - And I should see "Dear First User, you have successfully been enrolled to course Course 1" + And I should see "Dear First User, you are enrolled in the course Course 1." # Login as second user and check the notification. And I log in as "user2" And I am on "Course 2" course homepage @@ -71,7 +71,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol And I open the notification popover And I should see "Welcome to Course 2" And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element" - And I should see "Dear Second User, you have successfully been enrolled to course Course 2" + And I should see "Dear Second User, you are enrolled in the course Course 2." @javascript Scenario: Students should receive a welcome message if the setting is enabled - Custom message @@ -80,7 +80,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol And I click on "Edit" "link" in the "Test student enrolment" "table_row" And I set the field "Custom welcome message" to multiline: """ - Dear {$a->fullname}, you have successfully been enrolled to course {$a->coursename}. + Dear {$a->fullname}, you are enrolled in the course {$a->coursename}. Your email address: {$a->email} Your first name: {$a->firstname} Your last name: {$a->lastname} @@ -95,7 +95,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol And I open the notification popover And I should see "Welcome to Course 1" And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element" - And I should see "Dear First User, you have successfully been enrolled to course Course 1" + And I should see "Dear First User, you are enrolled in the course Course 1." And I should see "Your email address: first@example.com" And I should see "Your first name: First" And I should see "Your last name: User" @@ -108,7 +108,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol And I open the notification popover And I should see "Welcome to Course 1" And I click on "View full notification" "link" in the ".popover-region-notifications" "css_element" - And I should see "Dear Second User, you have successfully been enrolled to course Course 1" + And I should see "Dear Second User, you are enrolled in the course Course 1." And I should see "Your email address: second@example.com" And I should see "Your first name: Second" And I should see "Your last name: User"