From 344fd1e8b7a0ecc30312135b64a4fd3d832a50fb Mon Sep 17 00:00:00 2001
From: Srdjan <srdjan@catalyst.net.nz>
Date: Wed, 26 Jul 2023 09:53:47 +1000
Subject: [PATCH] WR408755: Minor changes for publishing

.github/workflows/ci.yml compliance
Converted some strings to {$a} format.
---
 .github/workflows/ci.yml                         | 3 ++-
 collector/cloudwatch/lang/en/cltr_cloudwatch.php | 4 ++--
 collector/cloudwatch/settings.php                | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2dde390..b05968e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,5 +5,6 @@ on: [push, pull_request]
 
 jobs:
   ci:
-    # change this back to @main after testing
     uses: catalyst/catalyst-moodle-workflows/.github/workflows/ci.yml@main
+    secrets:
+      moodle_org_token: ${{ secrets.MOODLE_ORG_TOKEN }}
diff --git a/collector/cloudwatch/lang/en/cltr_cloudwatch.php b/collector/cloudwatch/lang/en/cltr_cloudwatch.php
index cef830b..91b2335 100644
--- a/collector/cloudwatch/lang/en/cltr_cloudwatch.php
+++ b/collector/cloudwatch/lang/en/cltr_cloudwatch.php
@@ -52,5 +52,5 @@
 
 // Missing requirements.
 $string['unsatisfied_requirements'] = 'Unsatisfied Requirements';
-$string['aws:installneeded'] = 'Plugin \'local_aws\' of version '. \cltr_cloudwatch\lib::LOCAL_AWS_VERSION . ' is required.';
-$string['aws:upgradeneeded'] = 'Plugin \'local_aws\' needs to be upgraded to version '. \cltr_cloudwatch\lib::LOCAL_AWS_VERSION . '.';
+$string['aws:installneeded'] = 'Plugin \'local_aws\' of version {$a} is required.';
+$string['aws:upgradeneeded'] = 'Plugin \'local_aws\' needs to be upgraded to version {$a}.';
diff --git a/collector/cloudwatch/settings.php b/collector/cloudwatch/settings.php
index f21666c..c8b4f5e 100644
--- a/collector/cloudwatch/settings.php
+++ b/collector/cloudwatch/settings.php
@@ -77,13 +77,13 @@
         } else {
             $plugininfo = $plugins = \core_plugin_manager::instance()->get_plugin_info('local_aws');
             if (is_null($plugininfo)) {
-                $text = $OUTPUT->notification(get_string('aws:installneeded', 'cltr_cloudwatch'));
+                $text = $OUTPUT->notification(get_string('aws:installneeded', 'cltr_cloudwatch', \cltr_cloudwatch\lib::LOCAL_AWS_VERSION));
                 $settings->add(new \admin_setting_heading('cltr_cloudwatch_aws',
                     get_string('unsatisfied_requirements', 'cltr_cloudwatch'),
                     $text
                 ));
             } else if ($plugininfo->versiondisk < \cltr_cloudwatch\lib::LOCAL_AWS_VERSION) {
-                $text = $OUTPUT->notification(get_string('aws:upgradeneeded', 'cltr_cloudwatch'));
+                $text = $OUTPUT->notification(get_string('aws:upgradeneeded', 'cltr_cloudwatch', \cltr_cloudwatch\lib::LOCAL_AWS_VERSION));
                 $settings->add(new \admin_setting_heading('cltr_cloudwatch_aws',
                     get_string('unsatisfied_requirements', 'cltr_cloudwatch'),
                     $text