From 9ef1745639f5c91da1164bedd8d442a0e8fb3ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Wed, 18 Dec 2019 09:01:09 +0100 Subject: [PATCH] MDL-67527 lang: Propagate the string fixes to Behat and other places --- .../form/rubric/lang/en/gradingform_rubric.php | 2 +- .../rubric/tests/behat/grade_calculation.feature | 2 +- .../tests/behat/file_type_restriction.feature | 2 +- mod/workshop/tests/behat/submission_types.feature | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/grade/grading/form/rubric/lang/en/gradingform_rubric.php b/grade/grading/form/rubric/lang/en/gradingform_rubric.php index f74f4b9c4f8..b799a66f122 100644 --- a/grade/grading/form/rubric/lang/en/gradingform_rubric.php +++ b/grade/grading/form/rubric/lang/en/gradingform_rubric.php @@ -75,7 +75,7 @@ $string['rubricmappingexplained'] = 'The minimum possible score for this rubric If a scale is used for grading, the score will be rounded and converted to the scale elements as if they were consecutive integers. -This grade calculation may be changed by editing the form and ticking the box \'Calculate grade based on the rubric having a minimum score of 0\'.'; +This grade calculation may be changed by editing the form and ticking the box \'Calculate grade having a minimum score of the minimum achievable grade for the rubric\'.'; $string['rubricnotcompleted'] = 'Please choose something for each criterion'; $string['rubricoptions'] = 'Rubric options'; $string['rubricstatus'] = 'Current rubric status'; diff --git a/grade/grading/form/rubric/tests/behat/grade_calculation.feature b/grade/grading/form/rubric/tests/behat/grade_calculation.feature index 8cf1d3957dd..0e264b67ee2 100644 --- a/grade/grading/form/rubric/tests/behat/grade_calculation.feature +++ b/grade/grading/form/rubric/tests/behat/grade_calculation.feature @@ -29,7 +29,7 @@ Feature: Converting rubric score to grades And I set the following fields to these values: | Name | Assignment 1 rubric | | Description | Rubric test description | - | Calculate grade based on the rubric having a minimum score of 0 | | + | Calculate grade having a minimum score of the minimum achievable grade for the rubric | | And I define the following rubric: | Criterion 1 | Level 11 | 20 | Level 12 | 25 | Level 13 | 40 | Level 14 | 50 | | Criterion 2 | Level 21 | 20 | Level 22 | 25 | Level 23 | 30 | | | diff --git a/mod/workshop/tests/behat/file_type_restriction.feature b/mod/workshop/tests/behat/file_type_restriction.feature index 5ceedd9c22b..9a985a7524b 100644 --- a/mod/workshop/tests/behat/file_type_restriction.feature +++ b/mod/workshop/tests/behat/file_type_restriction.feature @@ -38,7 +38,7 @@ Feature: File types of the submission and feedback attachments can be limitted And I log in as "student1" And I am on "Course1" course homepage And I follow "TestWorkshop" - And I press "Start preparing your submission" + And I press "Add submission" And I set the following fields to these values: | Title | Submission1 | | Submission content | See the attached file | diff --git a/mod/workshop/tests/behat/submission_types.feature b/mod/workshop/tests/behat/submission_types.feature index d5970f1383e..36280231a66 100644 --- a/mod/workshop/tests/behat/submission_types.feature +++ b/mod/workshop/tests/behat/submission_types.feature @@ -73,7 +73,7 @@ Feature: Submission types And I follow "All required" And I follow "Switch to the submission phase" And I press "Continue" - And I press "Start preparing your submission" + And I press "Add submission" And I set the field "Title" to "Test submission" When I press "Save changes" Then I should see "You must supply a value here." in the "Submission content" "form_row" @@ -95,7 +95,7 @@ Feature: Submission types And I follow "Optional file" And I follow "Switch to the submission phase" And I press "Continue" - And I press "Start preparing your submission" + And I press "Add submission" And I set the field "Title" to "Test submission" When I press "Save changes" Then I should see "You must supply a value here." in the "Submission content" "form_row" @@ -115,7 +115,7 @@ Feature: Submission types And I follow "Optional text" And I follow "Switch to the submission phase" And I press "Continue" - And I press "Start preparing your submission" + And I press "Add submission" And I set the field "Title" to "Test submission" When I press "Save changes" Then I should see "You must supply a value here." in the "Attachment" "form_row" @@ -134,7 +134,7 @@ Feature: Submission types And I follow "Only text" And I follow "Switch to the submission phase" And I press "Continue" - When I press "Start preparing your submission" + When I press "Add submission" Then "Attachment" "field" should not exist And I set the field "Title" to "Test submission" And I press "Save changes" @@ -155,7 +155,7 @@ Feature: Submission types And I follow "Only file" And I follow "Switch to the submission phase" And I press "Continue" - When I press "Start preparing your submission" + When I press "Add submission" Then "Submission content" "field" should not exist And I set the field "Title" to "Test submission" And I press "Save changes" @@ -177,7 +177,7 @@ Feature: Submission types And I follow "Neither required" And I follow "Switch to the submission phase" And I press "Continue" - And I press "Start preparing your submission" + And I press "Add submission" And I set the field "Title" to "Test submission" When I press "Save changes" Then I should see "You need to add a file or enter some text." in the "Attachment" "form_row"