Bug #5995 - poor English in expiry notice; merged from MOODLE_16_STABLE

diff --git a/enrol/manual/enrol.php b/enrol/manual/enrol.php
index 0e216a8461dd72eda14fec567a3291cef5e31766..e231e5d35b65f010212a924e44ed14030f5304f2 100644 (file)
--- a/enrol/manual/enrol.php
+++ b/enrol/manual/enrol.php
@@ -370,6 +370,8 @@ function cron() {
             $a->extendurl = $CFG->wwwroot . '/user/index.php?id=' . $course->id;
             $a->current = array();
             $a->past = array();
+            $a->studentstr = $course->student;
+            $a->teacherstr = $course->teacher;
             $a->current = $a->past = array();
             $expiry = time() + $course->expirythreshold;
             $sql = "SELECT * FROM {$CFG->prefix}user u INNER JOIN {$CFG->prefix}user_students s ON u.id=s.userid WHERE s.course = $course->id AND s.timeend > 0 AND s.timeend <= $expiry";

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 33a6fa7234b55b7bf37c9dc95781a58886f48ea9..93e0a3610bb8599860bf72254c40db3398442b4a 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -505,11 +505,11 @@ You may go to the following page to extend their enrolment period:
 $a->extendurl
 ';
 $string['expirynotifystudents'] = 'Notify students';
-$string['expirynotifystudentsemail'] = 'Dear student:
+$string['expirynotifystudentsemail'] = 'Dear $a->studentstr:
 
-This is a notification that your enrolment for course $a->course will be expired in $a->threshold days.
+This is a notification that your enrolment in the course $a->course will expire in $a->threshold days.
 
-Please contact your tutor for any further enqiries.
+Please contact your $a->teacherstr for any further enquiries.
 ';
 $string['expirythreshold'] = 'Threshold';
 $string['extendenrol'] = 'Extend enrolment';