Merge branch 'MDL-62225-master' of https://github.com/lucisgit/moodle

diff --git a/mod/assign/feedback/editpdf/classes/renderer.php b/mod/assign/feedback/editpdf/classes/renderer.php
index c1a17a9..9ca16b6 100644 (file)
--- a/mod/assign/feedback/editpdf/classes/renderer.php
+++ b/mod/assign/feedback/editpdf/classes/renderer.php
@@ -139,14 +139,16 @@ class assignfeedback_editpdf_renderer extends plugin_renderer_base {
             $nav_next = 'nav_next';
         }
 
-        $iconalt = get_string('navigateprevious', 'assignfeedback_editpdf');
+        $iconshortcut = $this->get_shortcut('navigate-previous-button');
+        $iconalt = get_string('navigateprevious', 'assignfeedback_editpdf', $iconshortcut);
         $iconhtml = $this->image_icon($nav_prev, $iconalt, 'assignfeedback_editpdf');
         $navigation1 .= html_writer::tag('button', $iconhtml, array('disabled'=>'true',
             'class'=>'navigate-previous-button', 'accesskey' => $this->get_shortcut('navigate-previous-button')));
         $navigation1 .= html_writer::tag('select', null, array('disabled'=>'true',
             'aria-label' => get_string('gotopage', 'assignfeedback_editpdf'), 'class'=>'navigate-page-select',
             'accesskey' => $this->get_shortcut('navigate-page-select')));
-        $iconalt = get_string('navigatenext', 'assignfeedback_editpdf');
+        $iconshortcut = $this->get_shortcut('navigate-next-button');
+        $iconalt = get_string('navigatenext', 'assignfeedback_editpdf', $iconshortcut);
         $iconhtml = $this->image_icon($nav_next, $iconalt, 'assignfeedback_editpdf');
         $navigation1 .= html_writer::tag('button', $iconhtml, array('disabled'=>'true',
             'class'=>'navigate-next-button', 'accesskey' => $this->get_shortcut('navigate-next-button')));

diff --git a/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php b/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
index 1f7fac4..67c1ab1 100644 (file)
--- a/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
+++ b/mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
@@ -65,8 +65,8 @@ $string['jsrequired'] = 'JavaScript is required to annotate a PDF. Please enable
 $string['launcheditor'] = 'Launch PDF editor...';
 $string['line'] = 'Line';
 $string['loadingeditor'] = 'Loading PDF editor';
-$string['navigatenext'] = 'Next page';
-$string['navigateprevious'] = 'Previous page';
+$string['navigatenext'] = 'Next page (Alt/Shift-Alt/Ctrl-Option + {$a})';
+$string['navigateprevious'] = 'Previous page (Alt/Shift-Alt/Ctrl-Option + {$a})';
 $string['oval'] = 'Oval';
 $string['output'] = 'Output:';
 $string['pagenumber'] = 'Page {$a}';