Merge branch 'MDL-35971-master' of git://github.com/junpataleta/moodle

moodle · Jan 14, 2020 · ea990a3 · ea990a3
2 parents f2e7a54 + 010a253
commit ea990a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php
@@ -646,7 +646,7 @@
 $string['sendstudentnotificationsdefault_help'] = 'Set the default value for the "Notify students" checkbox on the grading form.';
 $string['settings'] = 'Settings';
 $string['shortpost'] = 'Short post';
-$string['showingcountoftotaldiscussions'] = 'Showing {$a->count} of {$a->total} discussions';
+$string['showingcountoftotaldiscussions'] = 'List of discussions. Showing {$a->count} of {$a->total} discussions';
 $string['showgraderpanel'] = 'Show grader panel';
 $string['showpreviousrepliescount'] = 'Show previous replies ({$a})';
 $string['showsubscribers'] = 'Show/edit current subscribers';

diff --git a/mod/forum/templates/discussion_list.mustache b/mod/forum/templates/discussion_list.mustache
@@ -91,14 +91,10 @@
             {{{ pagination }}}
         {{/discussion_top_pagination}}
         {{$discussion_list_output}}
-            <span id="discussion-table-description-{{uniqid}}" class="sr-only">
-                {{#str}} showingcountoftotaldiscussions, mod_forum, {"count": "{{visiblediscussioncount}}", "total":"{{totaldiscussioncount}}"} {{/str}}
-            </span>
-            <table
-                class="table discussion-list"
-                aria-label='{{#str}} showingcountoftotaldiscussions, mod_forum, {"count": "{{visiblediscussioncount}}", "total":"{{totaldiscussioncount}}"} {{/str}}'
-                aria-describedby="discussion-table-description-{{uniqid}}"
-            >
+            <table class="table discussion-list">
+                <caption id="discussion-table-description-{{uniqid}}" class="sr-only">
+                    {{#str}} showingcountoftotaldiscussions, mod_forum, {"count": "{{visiblediscussioncount}}", "total":"{{totaldiscussioncount}}"} {{/str}}
+                </caption>
                 {{$discussion_list_header}}
                 <thead>
                     <tr>