Update strings

catalyst · Mar 8, 2024 · f1dd887 · f1dd887
1 parent 44ed2ab
commit f1dd887
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/classes/form/override_form.php b/classes/form/override_form.php
@@ -51,13 +51,13 @@ public function definition() {
 
         // Override.
         $mform->addElement('select', 'override', get_string('override', 'tool_heartbeat'), [
-            result::NA => 'Not applicable',
-            result::OK => 'OK',
-            result::INFO => 'Info',
-            result::UNKNOWN => 'Unknown',
-            result::WARNING => 'Warning',
-            result::CRITICAL => 'Critical',
-            result::ERROR => 'Error',
+            result::NA => get_string('statusna'),
+            result::OK => get_string('statusok'),
+            result::INFO => get_string('statusinfo'),
+            result::UNKNOWN => get_string('statusunknown'),
+            result::WARNING => get_string('statuswarning'),
+            result::CRITICAL => get_string('statuscritical'),
+            result::ERROR => get_string('statuserror'),
         ]);
 
         // Note.

diff --git a/classes/object/override.php b/classes/object/override.php
@@ -190,16 +190,18 @@ protected static function mark_expired_as_resolved() {
         $conditions = "expires_at < ? AND resolved_at = 0";
         $overrides = self::get_records_select($conditions, [time()]);
         foreach ($overrides as $override) {
-            $override->resolve($override->get('expires_at'));
+            $override->resolve();
         }
     }
 
     /**
-     * Returns the time until mute ends
+     * Returns the human readable time until mute ends
      *
      * @return string
      */
     public function get_time_until_mute_ends(): string {
-        return date('d/m/Y h:iA', $this->get('expires_at'));
+        $enddate = userdate($this->get('expires_at'), get_string('strftimedate', 'langconfig'));
+        $remainingtime = format_time($this->get('expires_at') - time());
+        return "$enddate ($remainingtime)";
     }
 }