From 3000896f206cefd9e6d4a2f96198929aeea321a0 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Fri, 17 Jan 2025 11:43:29 +0800
Subject: [PATCH] MDL-81780 tool_task: Minor ad-hoc tasks renderer refinements

* Ensure new strings are added alphabetically
* Fix rendering of delete button's aria-label
* Remove unused `deletetask` lang string
---
 admin/tool/task/lang/en/tool_task.php | 5 ++---
 admin/tool/task/renderer.php          | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/admin/tool/task/lang/en/tool_task.php b/admin/tool/task/lang/en/tool_task.php
index 808ddfde9b2..702f2fd07ea 100644
--- a/admin/tool/task/lang/en/tool_task.php
+++ b/admin/tool/task/lang/en/tool_task.php
@@ -22,6 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+$string['actions'] = 'Actions';
 $string['adhoc'] = 'Ad hoc';
 $string['adhoctaskid'] = 'Ad hoc task ID: {$a}';
 $string['adhoctaskrun'] = 'Ad hoc task run initiated';
@@ -52,7 +53,7 @@ $string['crondisabled'] = 'Cron is disabled. No new tasks will be started. The s
 $string['cronok'] = 'Cron is running frequently';
 $string['default'] = 'Default';
 $string['defaultx'] = 'Default: {$a}';
-$string['deletetask'] = 'Delete task';
+$string['deleteadhoctask'] = 'Delete ad hoc task {$a}';
 $string['disabled'] = 'Disabled';
 $string['disabled_help'] = 'Disabled scheduled tasks are not executed from cron, however they can still be executed manually via the CLI tool.';
 $string['edittaskschedule'] = 'Edit task schedule: {$a}';
@@ -143,5 +144,3 @@ $string['taskschedulemonth_help'] = 'Month field for task schedule. The field us
 * <strong>1,5</strong> Every January and May';
 $string['privacy:metadata'] = 'The Scheduled task configuration plugin does not store any personal data.';
 $string['viewlogs'] = 'View logs for {$a}';
-$string['actions'] = 'Actions';
-$string['deleteadhoctask'] = 'Delete ad hoc task {$a->id}';
diff --git a/admin/tool/task/renderer.php b/admin/tool/task/renderer.php
index 1a14556dd81..6b7886cfed1 100644
--- a/admin/tool/task/renderer.php
+++ b/admin/tool/task/renderer.php
@@ -324,7 +324,7 @@ class tool_task_renderer extends plugin_renderer_base {
                     'aria-label' => get_string('deleteadhoctask', 'tool_task', $taskid),
                     'data-confirmation' => 'modal',
                     'data-confirmation-type' => 'delete',
-                    'data-confirmation-title-str' => '["deleteadhoctask", "tool_task",{"id":'.$taskid.'}]',
+                    'data-confirmation-title-str' => '["deleteadhoctask", "tool_task", ' . $taskid . ']',
                     'data-confirmation-content-str' => '["confirmdeletetaskwithid", "tool_task", {"id":'.$taskid.'}]',
                     'data-confirmation-yes-button-str' => '["delete", "core"]',
                 ]