From cdfc0502fa48cea8952c109ee1719dd7b34298db Mon Sep 17 00:00:00 2001 From: Helen Foster Date: Mon, 26 Oct 2020 11:42:10 +0100 Subject: [PATCH 1/2] MDL-69998 lang: Import fixed English strings (en_fix) --- enrol/manual/lang/en/enrol_manual.php | 2 +- lang/en/admin.php | 2 +- lang/en/error.php | 2 +- lang/en/group.php | 4 ++-- lang/en/role.php | 2 +- mod/feedback/lang/en/feedback.php | 2 +- repository/onedrive/lang/en/repository_onedrive.php | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/enrol/manual/lang/en/enrol_manual.php b/enrol/manual/lang/en/enrol_manual.php index ca366390a72..a8a5c1c9faa 100644 --- a/enrol/manual/lang/en/enrol_manual.php +++ b/enrol/manual/lang/en/enrol_manual.php @@ -80,6 +80,6 @@ $string['unenroluser'] = 'Do you really want to unenrol "{$a->user}" from course $string['unenrolusers'] = 'Unenrol users'; $string['wscannotenrol'] = 'Plugin instance cannot manually enrol a user in the course id = {$a->courseid}'; $string['wsnoinstance'] = 'Manual enrolment plugin instance doesn\'t exist or is disabled for the course (id = {$a->courseid})'; -$string['wsusercannotassign'] = 'You don\'t have the permission to assign this role ({$a->roleid}) to this user ({$a->userid}) in this course({$a->courseid}).'; +$string['wsusercannotassign'] = 'You don\'t have the permission to assign this role ({$a->roleid}) to this user ({$a->userid}) in this course ({$a->courseid}).'; $string['manualpluginnotinstalled'] = 'The "Manual" plugin has not yet been installed'; $string['privacy:metadata'] = 'The Manual enrolments plugin does not store any personal data.'; diff --git a/lang/en/admin.php b/lang/en/admin.php index ab935a6c667..38de4b769bc 100644 --- a/lang/en/admin.php +++ b/lang/en/admin.php @@ -573,7 +573,7 @@ $string['extramemorylimit'] = 'Extra PHP memory limit'; $string['fatalsessionautostart'] = '

Serious configuration error detected, please notify server administrator.

To operate properly, Moodle requires that administrator changes PHP settings.

session.auto_start must be set to off.

This setting is controlled by editing php.ini, Apache/IIS
configuration or .htaccess file on the server.

'; $string['filescleanupperiod'] = 'Clean up trash pool files'; $string['filescleanupperiod_help'] = 'How often trash pool files are deleted. These are files that are associated with a context that no longer exists, for example when a course is deleted. Please note: This setting can result in missing files in a course which is backed up, deleted and then restored if the setting \'Include files\' (backup_auto_files) in \'Automated backup settings\' is disabled.'; -$string['fileconversioncleanuptask'] = 'Cleanup of temporary records for file conversions.'; +$string['fileconversioncleanuptask'] = 'Cleanup of temporary records for file conversions'; $string['filecreated'] = 'New file created'; $string['filesizeunits'] = 'file size units'; $string['filestoredin'] = 'Save file into folder :'; diff --git a/lang/en/error.php b/lang/en/error.php index 6e9ae1508a6..8b01a934495 100644 --- a/lang/en/error.php +++ b/lang/en/error.php @@ -347,7 +347,7 @@ $string['invalidmodule'] = 'Invalid module'; $string['invalidmoduleid'] = 'Invalid module ID: {$a}'; $string['invalidmodulename'] = 'Invalid module name: {$a}'; $string['invalidnum'] = 'Invalid numeric value'; -$string['invalidnumkey'] = '$conditions array may not contain numeric keys, please fix the code!'; +$string['invalidnumkey'] = 'The array $conditions may not contain numeric keys. Please fix the code!'; $string['invalidoutcome'] = 'Incorrect outcome ID'; $string['invalidpagesize'] = 'Invalid page size'; $string['invalidpasswordpolicy'] = 'Invalid password policy'; diff --git a/lang/en/group.php b/lang/en/group.php index ab1ce3eb3dd..2f344729f23 100644 --- a/lang/en/group.php +++ b/lang/en/group.php @@ -165,8 +165,8 @@ $string['nogroupsassigned'] = 'No groups assigned'; $string['nopermissionforcreation'] = 'Can\'t create group "{$a}" as you don\'t have the required permissions'; $string['nosmallgroups'] = 'Prevent last small group'; $string['notingroup'] = 'Ignore users in groups'; -$string['notingrouping'] = '[Not in a grouping]'; -$string['notingrouplist'] = '[Not in a group]'; +$string['notingrouping'] = 'Not in a grouping'; +$string['notingrouplist'] = 'Not in a group'; $string['nousersinrole'] = 'There are no suitable users in the selected role'; $string['number'] = 'Group/member count'; $string['numgroups'] = 'Number of groups'; diff --git a/lang/en/role.php b/lang/en/role.php index 72edb507613..57763e0d80a 100644 --- a/lang/en/role.php +++ b/lang/en/role.php @@ -289,7 +289,7 @@ $string['mainadmin'] = 'Main administrator'; $string['mainadminset'] = 'Set main admin'; $string['manageadmins'] = 'Manage site administrators'; $string['manager'] = 'Manager'; -$string['managerdescription'] = 'Managers can access course and modify them, they usually do not participate in courses.'; +$string['managerdescription'] = 'Managers can access courses and modify them, but usually do not participate in them.'; $string['manageroles'] = 'Manage roles'; $string['maybeassignedin'] = 'Context types where this role may be assigned'; $string['morethan'] = 'More than {$a}'; diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php index ae333ebe0c6..c1bc05ead93 100644 --- a/mod/feedback/lang/en/feedback.php +++ b/mod/feedback/lang/en/feedback.php @@ -247,7 +247,7 @@ $string['resetting_data'] = 'Reset feedback responses'; $string['resetting_feedbacks'] = 'Resetting feedbacks'; $string['response_nr'] = 'Response number'; $string['responses'] = 'Responses'; -$string['responsetime'] = 'Responsestime'; +$string['responsetime'] = 'Responses time'; $string['save_as_new_item'] = 'Save as new question'; $string['save_as_new_template'] = 'Save as new template'; $string['save_entries'] = 'Submit your answers'; diff --git a/repository/onedrive/lang/en/repository_onedrive.php b/repository/onedrive/lang/en/repository_onedrive.php index dfa298a2868..3e6c5999192 100644 --- a/repository/onedrive/lang/en/repository_onedrive.php +++ b/repository/onedrive/lang/en/repository_onedrive.php @@ -39,7 +39,7 @@ $string['mysitenotfound'] = 'You have never logged into OneDrive before. You mus $string['oauth2serviceslink'] = 'OAuth 2 services configuration'; $string['owner'] = 'Owned by: {$a}'; $string['pluginname'] = 'Microsoft OneDrive'; -$string['removetempaccesstask'] = 'Remove temporary write access from controlled links.'; +$string['removetempaccesstask'] = 'Remove temporary write access from controlled links'; $string['searchfor'] = 'Search for {$a}'; $string['servicenotenabled'] = 'Access not configured.'; $string['skydrivefilesexist'] = 'Files found in the Microsoft SkyDrive repository. This repository has been deprecated by Microsoft, however the files may be imported to the Microsoft OneDrive repository.'; From 3eb031e0185d1d84d0e2a6b910061a11ee3183af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Mon, 26 Oct 2020 11:34:28 +0100 Subject: [PATCH 2/2] MDL-69998 lang: Fix reworded strings in Behat test scenarios --- group/tests/behat/overview.feature | 10 +++++----- .../tests/behat/question_types_non_anon.feature | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/group/tests/behat/overview.feature b/group/tests/behat/overview.feature index 04195632419..5eb8d74d156 100644 --- a/group/tests/behat/overview.feature +++ b/group/tests/behat/overview.feature @@ -67,8 +67,8 @@ Feature: Group overview # Following groups should exist in groupings. Then the group overview should include groups "Group 1, Group 2" in grouping "Grouping 1" And the group overview should include groups "Group 2,Group 3" in grouping "Grouping 2" - And the group overview should include groups "Group 4" in grouping "[Not in a grouping]" - And the group overview should include groups "No group" in grouping "[Not in a group]" + And the group overview should include groups "Group 4" in grouping "Not in a grouping" + And the group overview should include groups "No group" in grouping "Not in a group" # Following members should exit in group. And "Student 0" "text" should exist in the "Group 1" "table_row" And "Student 1" "text" should exist in the "Group 1" "table_row" @@ -121,8 +121,8 @@ Feature: Group overview And I select "No grouping" from the "Grouping" singleselect And I select "All" from the "group" singleselect # Following groups should exist in groupings. - And the group overview should include groups "Group 4" in grouping "[Not in a grouping]" - And the group overview should include groups "No group" in grouping "[Not in a group]" + And the group overview should include groups "Group 4" in grouping "Not in a grouping" + And the group overview should include groups "No group" in grouping "Not in a group" # Following groups should not exits And "Group 1" "table_row" should not exist And "Group 2" "table_row" should not exist @@ -185,7 +185,7 @@ Feature: Group overview And I select "All" from the "Grouping" singleselect And I select "No group" from the "group" singleselect # Following groups should exist in groupings. - And the group overview should include groups "No group" in grouping "[Not in a group]" + And the group overview should include groups "No group" in grouping "Not in a group" # Following groups should not exits And "Group 1" "table_row" should not exist And "Group 2" "table_row" should not exist diff --git a/mod/feedback/tests/behat/question_types_non_anon.feature b/mod/feedback/tests/behat/question_types_non_anon.feature index 20542740917..dbcfb606a09 100644 --- a/mod/feedback/tests/behat/question_types_non_anon.feature +++ b/mod/feedback/tests/behat/question_types_non_anon.feature @@ -33,7 +33,7 @@ Feature: Test creating different types of feedback questions for non-anonymous f And I add a "Information" question to the feedback with: | Question | this is a response time question | | Label | curtime | - | Information type | Responsestime | + | Information type | Responses time | And I add a "Label" question to the feedback with: | Contents | label text | And I add a "Longer text answer" question to the feedback with: