Merge branch 'MDL-68750-38' of git://github.com/andrewnicols/moodle into MOODLE_38_STABLE

admin/tool/dataprivacy/tests/behat/manage_categories.feature

@@ -12,7 +12,7 @@ Feature: Manage data categories
     And I press "Add category"
     And I set the field "Name" to "Category 1"
     And I set the field "Description" to "Category 1 description"
-    When I click on "Save" "button" in the "Delete category" "dialogue"
+    When I click on "Save" "button" in the "Add category" "dialogue"
     Then I should see "Category 1" in the "List of data categories" "table"
     And I should see "Category 1 description" in the "Category 1" "table_row"
 
@@ -30,5 +30,5 @@ Feature: Manage data categories
     And I choose "Delete" in the open action menu
     And I should see "Delete category"
     And I should see "Are you sure you want to delete the category 'Category 1'?"
-    When I click on "Delete" "button" in the "Confirm" "dialogue"
+    When I click on "Delete" "button" in the "Delete category" "dialogue"
     Then I should not see "Category 1" in the "List of data categories" "table"

admin/tool/dataprivacy/tests/behat/manage_purposes.feature

@@ -52,5 +52,5 @@ Feature: Manage data storage purposes
     And I choose "Delete" in the open action menu
     And I should see "Delete purpose"
     And I should see "Are you sure you want to delete the purpose 'Purpose 1'?"
-    When I click on "Delete" "button" in the "Confirm" "dialogue"
+    When I click on "Delete" "button" in the "Delete purpose" "dialogue"
     Then I should not see "Purpose 1" in the "List of data purposes" "table"

analytics/tests/behat/manage_models.feature

@@ -158,5 +158,5 @@ Feature: Manage analytics models
   Scenario: Delete model
     When I open the action menu in "Students at risk of not meeting the course completion conditions" "table_row"
     And I choose "Delete" in the open action menu
-    And I click on "Delete" "button" in the "Confirm" "dialogue"
+    And I click on "Delete" "button" in the "Delete" "dialogue"
     Then I should not see "Students at risk of not meeting the course completion conditions"

lib/amd/src/tag.js

@@ -265,12 +265,13 @@ define([
                 if (exception.errorcode === 'namesalreadybeeingused') {
                     e.preventDefault(); // This will prevent default error dialogue.
                     str.get_strings([
+                        {key: 'confirm', component: 'core'},
                         {key: 'nameuseddocombine', component: 'tag'},
-                        {key: 'yes'},
-                        {key: 'cancel'},
+                        {key: 'yes', component: 'core'},
+                        {key: 'cancel', component: 'core'},
                     ])
                     .then(function(s) {
-                        return notification.confirm(e.message, s[0], s[1], s[2], function() {
+                        return notification.confirm(s[0], s[1], s[2], s[3], function() {
                             window.location.href = window.location.href + "&newname=" + encodeURIComponent(newvalue) +
                                 "&tagid=" + encodeURIComponent(tagid) +
                                 '&action=renamecombine&sesskey=' + M.cfg.sesskey;

lib/behat/classes/partial_named_selector.php

@@ -161,7 +161,7 @@ XPATH
 .//div[
         contains(concat(' ', normalize-space(@class), ' '), ' modal ')
             and
-        normalize-space(descendant::*[contains(concat(' ', normalize-space(@class), ' '), ' modal-header ')] = %locator%)
+        normalize-space(descendant::*[contains(concat(' ', normalize-space(@class), ' '), ' modal-header ')]) = %locator%
     ]
 XPATH
         , 'group_message' => <<<XPATH