Merge branch 'MDL-36255-master' of https://github.com/lucaboesch/moodle

diff --cc grade/tests/behat/grade_category_validation.feature
index 702ea0f,12f5e3f..3303bdc
--- 1/grade/tests/behat/grade_category_validation.feature
--- 2/grade/tests/behat/grade_category_validation.feature
+++ b/grade/tests/behat/grade_category_validation.feature
@@@ -17,11 -17,13 +17,13 @@@ Feature: Editing a grade ite
        | teacher1 | C1 | editingteacher |
        | student1 | C1 | student |
      And I log in as "admin"
 -    And I navigate to "Scales" node in "Site administration > Grades"
+     And the "multilang" filter is "on"
+     And the "multilang" filter applies to "content and headings"
 +    And I navigate to "Grades > Scales" in site administration
      And I press "Add a new scale"
      And I set the following fields to these values:
-       | Name  | ABCDEF |
-       | Scale | F,E,D,C,B,A |
+       | Name  | <span lang="en" class="multilang">EN</span><span lang="fr" class="multilang">FR</span> ABCDEF |
+       | Scale | F,E,D,C,B,A                                                                                   |
      And I press "Save changes"
      And I press "Add a new scale"
      And I set the following fields to these values:

diff --cc grade/tests/behat/grade_hidden_items.feature
index f51b43d,7df2f65..7bb31e8
--- 1/grade/tests/behat/grade_hidden_items.feature
--- 2/grade/tests/behat/grade_hidden_items.feature
+++ b/grade/tests/behat/grade_hidden_items.feature
@@@ -34,10 -36,10 +36,10 @@@ Feature: Student and teacher's view of 
        | Item name | calculated |
      And I press "Save changes"
      And I set "=[[a4]]/2" calculation for grade item "calculated" with idnumbers:
-       | Sub category 1 | sub1 |
+       | EN Sub category 1 | sub1 |
 -    And I navigate to "Overview report" node in "Site administration > Grades > Report settings"
 +    And I navigate to "Grades > Report settings > Overview report" in site administration
      And I set the field "s__grade_report_overview_showtotalsifcontainhidden" to "Show totals excluding hidden items"
 -    And I navigate to "User report" node in "Site administration > Grades > Report settings"
 +    And I navigate to "Grades > Report settings > User report" in site administration
      And I set the field "s__grade_report_user_showtotalsifcontainhidden" to "Show totals excluding hidden items"
      And I press "Save changes"
      When I log out

diff --cc grade/tests/behat/grade_item_validation.feature
index 96ba66c,67a63bc..a78a213
--- 1/grade/tests/behat/grade_item_validation.feature
--- 2/grade/tests/behat/grade_item_validation.feature
+++ b/grade/tests/behat/grade_item_validation.feature
@@@ -17,11 -17,13 +17,13 @@@ Feature: Grade item validatio
        | teacher1 | C1 | editingteacher |
        | student1 | C1 | student |
      And I log in as "admin"
 -    And I navigate to "Scales" node in "Site administration > Grades"
+     And the "multilang" filter is "on"
+     And the "multilang" filter applies to "content and headings"
 +    And I navigate to "Grades > Scales" in site administration
      And I press "Add a new scale"
      And I set the following fields to these values:
-       | Name  | ABCDEF |
-       | Scale | F,E,D,C,B,A |
+       | Name  | <span lang="en" class="multilang">EN</span><span lang="fr" class="multilang">FR</span> ABCDEF |
+       | Scale | F,E,D,C,B,A                                                                                   |
      And I press "Save changes"
      And I press "Add a new scale"
      And I set the following fields to these values:

diff --cc grade/tests/behat/grade_scales.feature
index 0503f9f,6ff6027..258217d
--- 1/grade/tests/behat/grade_scales.feature
--- 2/grade/tests/behat/grade_scales.feature
+++ b/grade/tests/behat/grade_scales.feature
@@@ -9,11 -11,11 +11,11 @@@ Feature: View gradebook when scales ar
      And I set the following administration settings values:
        | grade_report_showranges    | 1 |
        | grade_aggregations_visible | Mean of grades,Weighted mean of grades,Simple weighted mean of grades,Mean of grades (with extra credits),Median of grades,Lowest grade,Highest grade,Mode of grades,Natural |
 -    And I navigate to "Scales" node in "Site administration > Grades"
 +    And I navigate to "Grades > Scales" in site administration
      And I press "Add a new scale"
      And I set the following fields to these values:
-       | Name  | Letterscale |
-       | Scale | F,D,C,B,A   |
+       | Name  | <span lang="en" class="multilang">EN</span><span lang="fr" class="multilang">FR</span> Letterscale |
+       | Scale | F,D,C,B,A                                                                                          |
      And I press "Save changes"
      And I log out
      And the following "courses" exist:

diff --cc grade/tests/behat/grade_single_item_scales.feature
index 1d7a84c,87943c4..b038517
--- 1/grade/tests/behat/grade_single_item_scales.feature
--- 2/grade/tests/behat/grade_single_item_scales.feature
+++ b/grade/tests/behat/grade_single_item_scales.feature
@@@ -9,11 -11,11 +11,11 @@@ Feature: View gradebook when single ite
      And I set the following administration settings values:
        | grade_report_showranges    | 1 |
        | grade_aggregations_visible | Mean of grades,Weighted mean of grades,Simple weighted mean of grades,Mean of grades (with extra credits),Median of grades,Lowest grade,Highest grade,Mode of grades,Natural |
 -    And I navigate to "Scales" node in "Site administration > Grades"
 +    And I navigate to "Grades > Scales" in site administration
      And I press "Add a new scale"
      And I set the following fields to these values:
-       | Name  | Singleitem |
-       | Scale | Ace!       |
+       | Name  | <span lang="en" class="multilang">EN</span><span lang="fr" class="multilang">FR</span> Singleitem |
+       | Scale | Ace!                                                                                              |
      And I press "Save changes"
      And I log out
      And the following "courses" exist: