Merge pull request #128 from isuru89/release_2.0

Release 2.3.1
isuru89 · Jun 1, 2021 · c071da6 · c071da6
2 parents 8afa526 + 78874a3
commit c071da6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Moodle - Local Reminders
 ---
-![Version](https://img.shields.io/badge/version-v2.3-blue)
+![Version](https://img.shields.io/badge/version-v2.3.1-blue)
 ![Moodle Version](https://img.shields.io/badge/moodle-%3E%3D%203.5-orange)
 ![License](https://img.shields.io/badge/license-GPL%20v3-green)
 [![Build Status](https://github.com/isuru89/moodle-local_reminders/actions/workflows/moodle-ci.yml/badge.svg?branch=release_2.0)](https://github.com/isuru89/moodle-local_reminders/actions/workflows/moodle-ci.yml)
@@ -95,6 +95,10 @@ In addition to above, user can control reminders for calendar event changes per
 
 ## Changelog
 
+### v2.3.1
+  * Removed hard coded string in course settings page (#124)
+  * Fixed incorrect argument pass in calendar update events (#126)
+
 ### v2.3
   * No reminders once completed settings will support all modules which integrated with Moodle Core Completion API (#113)
   * Should honour empty prefix when title prefix is set to empty in settings (#115)

diff --git a/coursesettings_form.php b/coursesettings_form.php
@@ -124,7 +124,7 @@ public function definition() {
                         '<h5><b><a href="'.$eventlink.'">'.$activitytypename.$activityname
                         ."</a></b></h5>$friendlyeventtypetext");
                     $mform->addElement('static', 'duetime'.$daytime.$activity->modulename.$activity->instance,
-                        'Due In',
+                        get_string('activityconfduein', 'local_reminders'),
                         userdate($activity->timestart, get_string('strftimedatetime', 'langconfig'), $tzone));
 
                     $key = "activity_".$activity->id.'_enabled';

diff --git a/lang/en/local_reminders.php b/lang/en/local_reminders.php
@@ -22,6 +22,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+$string['activityconfduein'] = 'Due In';
 $string['activityconfupcomingactivities'] = 'Upcoming Activities';
 $string['activityconfupcomingactivitiesdesc'] = 'Reminders will not be sent for unchecked activities.';
 $string['activityconfnoupcomingactivities'] = 'No upcoming activities for this course.';

diff --git a/lib.php b/lib.php
@@ -535,8 +535,11 @@ function when_calendar_event_updated($updateevent, $changetype) {
         return;
     }
 
+    $ctxinfo = new \stdClass;
+    $ctxinfo->overduemessage = $CFG->local_reminders_overduewarnmessage ?? '';
+    $ctxinfo->overduetitle = $CFG->local_reminders_overduewarnprefix ?? '';
     foreach ($sendusers as $touser) {
-        $eventdata = $reminderref->get_updating_send_event($changetype, $fromuser, $touser);
+        $eventdata = $reminderref->get_updating_send_event($changetype, $fromuser, $touser, $ctxinfo);
 
         $mailresult = message_send($eventdata);
     }

diff --git a/version.php b/version.php
@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021050100;
+$plugin->version   = 2021052500;
 $plugin->requires  = 2018051700;        // Require moodle 3.5 or higher.
-$plugin->release   = '2.3';
+$plugin->release   = '2.3.1';
 $plugin->maturity  = MATURITY_RC;
 $plugin->component = 'local_reminders';