From e52422b9221371418cf511d015285d4907d9ddbc Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Sat, 8 Aug 2020 19:04:58 +0200 Subject: [PATCH] Changed 'enrollment' to 'enrolment' to conform to Moodle core (#328) Also minor changes like ordering strings alphabetically and adding full-stops. --- element/date/classes/element.php | 16 ++++++++-------- element/date/lang/en/customcertelement_date.php | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/element/date/classes/element.php b/element/date/classes/element.php index b67b1c0..5c0fb45 100644 --- a/element/date/classes/element.php +++ b/element/date/classes/element.php @@ -59,12 +59,12 @@ define('CUSTOMCERT_DATE_CURRENT_DATE', '-5'); /** * Date - Enrollment start */ -define('CUSTOMCERT_DATE_ENROLLMENT_START', '-6'); +define('CUSTOMCERT_DATE_ENROLMENT_START', '-6'); /** * Date - Entrollment end */ -define('CUSTOMCERT_DATE_ENROLLMENT_END', '-7'); +define('CUSTOMCERT_DATE_ENROLMENT_END', '-7'); require_once($CFG->dirroot . '/lib/grade/constants.php'); @@ -93,8 +93,8 @@ class element extends \mod_customcert\element { if ($completionenabled) { $dateoptions[CUSTOMCERT_DATE_COMPLETION] = get_string('completiondate', 'customcertelement_date'); } - $dateoptions[CUSTOMCERT_DATE_ENROLLMENT_START] = get_string('enrollmentstartdate', 'customcertelement_date'); - $dateoptions[CUSTOMCERT_DATE_ENROLLMENT_END] = get_string('enrollmentenddate', 'customcertelement_date'); + $dateoptions[CUSTOMCERT_DATE_ENROLMENT_START] = get_string('enrolmentstartdate', 'customcertelement_date'); + $dateoptions[CUSTOMCERT_DATE_ENROLMENT_END] = get_string('enrolmentenddate', 'customcertelement_date'); $dateoptions[CUSTOMCERT_DATE_COURSE_START] = get_string('coursestartdate', 'customcertelement_date'); $dateoptions[CUSTOMCERT_DATE_COURSE_END] = get_string('courseenddate', 'customcertelement_date'); @@ -177,8 +177,8 @@ class element extends \mod_customcert\element { $date = $timecompleted->timecompleted; } } - } else if ($dateitem == CUSTOMCERT_DATE_ENROLLMENT_START) { - // Get the enrollment start date + } else if ($dateitem == CUSTOMCERT_DATE_ENROLMENT_START) { + // Get the enrolment start date. $sql = "SELECT ue.timestart FROM {enrol} e JOIN {user_enrolments} ue ON ue.enrolid = e.id WHERE e.courseid = :courseid AND ue.userid = :userid"; @@ -187,8 +187,8 @@ class element extends \mod_customcert\element { $date = $timestart->timestart; } } - } else if ($dateitem == CUSTOMCERT_DATE_ENROLLMENT_END) { - // Get the enrollment end date + } else if ($dateitem == CUSTOMCERT_DATE_ENROLMENT_END) { + // Get the enrolment end date. $sql = "SELECT ue.timeend FROM {enrol} e JOIN {user_enrolments} ue ON ue.enrolid = e.id WHERE e.courseid = :courseid AND ue.userid = :userid"; diff --git a/element/date/lang/en/customcertelement_date.php b/element/date/lang/en/customcertelement_date.php index ece67de..8c34616 100644 --- a/element/date/lang/en/customcertelement_date.php +++ b/element/date/lang/en/customcertelement_date.php @@ -26,8 +26,8 @@ $string['completiondate'] = 'Completion date'; $string['courseenddate'] = 'Course end date'; $string['coursegradedate'] = 'Course grade date'; $string['coursestartdate'] = 'Course start date'; -$string['enrollmentstartdate'] = 'Enrollment start date'; -$string['enrollmentenddate'] = 'Enrollment end date'; +$string['enrolmentenddate'] = 'Enrolment end date'; +$string['enrolmentstartdate'] = 'Enrolment start date'; $string['currentdate'] = 'Current date'; $string['dateformat'] = 'Date format'; $string['dateformat_help'] = 'This is the format of the date that will be displayed';