Merge branch 'MDL-77761-39' of https://github.com/junpataleta/moodle into MOODLE_39_STABLE

lang/en/editor.php

@@ -53,6 +53,7 @@ $string['cutpastemozilla'] = 'Unfortunately, you cannot currently use normal key
 $string['delete'] = 'Delete';
 $string['editors'] = 'Text editors';
 $string['editorsettings'] = 'Manage editors';
+$string['editorxformat'] = '{$a} format';
 $string['enterurlfirst'] = 'You have to enter an URL first';
 $string['filebrowser'] = 'File Browser';
 $string['findwhat'] = 'Find';

lib/editor/atto/tests/behat/autosave.feature

@@ -21,7 +21,7 @@ Feature: Atto Autosave
     And I click on "Save changes" "button"
     And I am on "Course 1" course homepage
     And I navigate to "Edit settings" in current page administration
-    And I set the field with xpath "//select[@name='summary_editor[format]']" to "1"
+    And I set the field "Course summary format" to "1"
     And I click on "Save and display" "button"
     And I log out
 

lib/form/editor.php

@@ -444,6 +444,7 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element implements templatab
         $context['id'] = $id;
         $context['value'] = $text;
         $context['format'] = $format;
+        $context['formatlabel'] = get_string('editorxformat', 'editor', $this->_label);
 
         if (!is_null($this->getAttribute('onblur')) && !is_null($this->getAttribute('onchange'))) {
             $context['changelistener'] = true;

lib/form/templates/editor_textarea.mustache

@@ -35,6 +35,7 @@
 </div>
 <div>
     {{#hasformats}}
+        <label for="menu{{name}}format" class="sr-only">{{formatlabel}}</label>
         <select name="{{name}}[format]" id="menu{{name}}format" class="custom-select">
         {{#formats}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{text}}</option>

mod/workshop/tests/behat/embedded_images.feature

@@ -21,9 +21,9 @@ Feature: Teachers can embed images into instructions and conclusion fields
       | workshop | C1     | Workshop with embedded images |
     And I am on the "Workshop with embedded images" "workshop activity editing" page logged in as admin
     And I set the following fields to these values:
-      | instructauthorseditor[format]   | 1 |
-      | instructreviewerseditor[format] | 1 |
-      | conclusioneditor[format]        | 1 |
+      | Instructions for submission format  | 1 |
+      | Instructions for assessment format  | 1 |
+      | Conclusion format                   | 1 |
     And I press "Save and display"
     And I log out
     And I log in as "teacher1"