Merge branch 'MDL-85535-500' of https://github.com/junpataleta/moodle into MOODLE_500_STABLE

mod/forum/lang/en/forum.php

@@ -63,6 +63,7 @@ $string['blockperiod'] = 'Time period for blocking';
 $string['blockperiod_help'] = 'Students can be blocked from posting more than a given number of posts in a given time period. Users with the capability mod/forum:postwithoutthrottling are exempt from post limits.';
 $string['blockperioddisabled'] = 'Don\'t block';
 $string['blogforum'] = 'Standard forum displayed in a blog-like format';
+$string['browsediscussions'] = 'Browse discussions';
 $string['bynameondate'] = 'by {$a->name} - {$a->date}';
 $string['cachedef_forum_count_discussions'] = 'Forum discussions count';
 $string['cachedef_forum_is_tracked'] = 'Forum tracking status for user';

mod/forum/renderer.php

@@ -43,7 +43,10 @@ class mod_forum_renderer extends plugin_renderer_base {
     public function neighbouring_discussion_navigation($prev, $next) {
         $html = '';
         if ($prev || $next) {
-            $html .= html_writer::start_tag('div', array('class' => 'discussion-nav clearfix'));
+            $html .= html_writer::start_tag('nav', [
+                'class' => 'discussion-nav clearfix',
+                'aria-label' => get_string('browsediscussions', 'mod_forum'),
+            ]);
             $html .= html_writer::start_tag('ul');
             if ($prev) {
                 $url = new moodle_url('/mod/forum/discuss.php', array('d' => $prev->id));
@@ -62,7 +65,7 @@ class mod_forum_renderer extends plugin_renderer_base {
                 $html .= html_writer::end_tag('li');
             }
             $html .= html_writer::end_tag('ul');
-            $html .= html_writer::end_tag('div');
+            $html .= html_writer::end_tag('nav');
         }
         return $html;
     }

mod/forum/templates/forum_discussion.mustache

@@ -43,8 +43,6 @@
 
 <div id="discussion-container-{{uniqid}}" data-content="forum-discussion">
 {{#html}}
-    {{{neighbourlinks}}}
-
     <div class="d-flex flex-column flex-sm-row mb-1">
         <div>{{{exportdiscussion}}}</div>
         <div class="{{#exportdiscussion}}ms-2{{/exportdiscussion}}">{{{modeselectorform}}}</div>