Merging in fixes for MDL-8930 from MOODLE_18_STABLE

diff --git a/lang/en_utf8/lesson.php b/lang/en_utf8/lesson.php
index 92af727270d724fc0365fbfdacfae1fb2db37231..94c65be9939bed40d65049a68b428888ac005284 100644 (file)
--- a/lang/en_utf8/lesson.php
+++ b/lang/en_utf8/lesson.php
@@ -79,7 +79,7 @@ $string['displayofgrade'] = 'Display of grade (for students only)';
 $string['displayreview'] = 'Display review button';
 $string['displayscorewithessays'] = 'You earned $a->score out of $a->tempmaxgrade for the automatically graded questions.<br/>Your $a->essayquestions essay question(s) will be graded and added<br />into your final score at a later date.<br /><br />Your current grade without the essay question(s) is $a->score out of $a->grade';
 $string['displayscorewithoutessays'] = 'Your score is $a->score (out of $a->grade).';
-$string['editlesson'] = 'Edit $a';
+$string['edit'] = 'Edit';
 $string['editlessonsettings'] = 'Edit lesson settings';
 $string['editpagecontent'] = 'Edit page contents';
 $string['email'] = 'Email';

diff --git a/mod/lesson/tabs.php b/mod/lesson/tabs.php
index 385f38e76b24f45ce86e4aff5c77ebdc0d5e7425..3c88a5b0393f7705b7d85643c4a5e0c626b66741 100644 (file)
--- a/mod/lesson/tabs.php
+++ b/mod/lesson/tabs.php
@@ -33,7 +33,7 @@
     $counts->student  = $course->student;
     
     $row[] = new tabobject('view', "$CFG->wwwroot/mod/lesson/view.php?id=$cm->id", get_string('preview', 'lesson'), get_string('previewlesson', 'lesson', format_string($lesson->name)));
-    $row[] = new tabobject('edit', "$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('edit'), get_string('editlesson', 'lesson', format_string($lesson->name)));
+    $row[] = new tabobject('edit', "$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id", get_string('edit', 'lesson'), get_string('edit', 'moodle', format_string($lesson->name)));
     $row[] = new tabobject('reports', "$CFG->wwwroot/mod/lesson/report.php?id=$cm->id", get_string('reports', 'lesson'), get_string('viewreports', 'lesson', $counts));
     if (has_capability('mod/lesson:edit', $context)) {
         $row[] = new tabobject('essay', "$CFG->wwwroot/mod/lesson/essay.php?id=$cm->id", get_string('manualgrading', 'lesson'));