From 610a70f02680c180b234eaa5d0e4a8b00e2de056 Mon Sep 17 00:00:00 2001 From: Sara Arjona Date: Tue, 22 Aug 2023 14:26:58 +0200 Subject: [PATCH] MDL-79108 completion: Display the correct message in default settings --- .../classes/output/bulk_activity_completion_renderer.php | 1 + course/templates/defaultactivitycompletion.mustache | 9 +++++++-- lang/en/completion.php | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/course/classes/output/bulk_activity_completion_renderer.php b/course/classes/output/bulk_activity_completion_renderer.php index f923baa333f..4e132fbb73e 100644 --- a/course/classes/output/bulk_activity_completion_renderer.php +++ b/course/classes/output/bulk_activity_completion_renderer.php @@ -95,6 +95,7 @@ class core_course_bulk_activity_completion_renderer extends plugin_renderer_base $module->formhtml = $modform->render(); } } + $data->issite = $course->id == SITEID; return parent::render_from_template('core_course/defaultactivitycompletion', $data); } diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache index 505b1756fc2..1485ecfe216 100644 --- a/course/templates/defaultactivitycompletion.mustache +++ b/course/templates/defaultactivitycompletion.mustache @@ -32,12 +32,17 @@ "string": "Manual", "icon": "https://raw.githubusercontent.com/moodle/moodle/master/pix/i/completion-manual-enabled.png" } - }] + }], + "issite": true } }}
-
{{#str}}defaultactivitycompletion, core_completion{{/str}}
+
+ {{#issite}}{{#str}}defaultactivitycompletionsite, core_completion{{/str}}{{/issite}} + {{^issite}}{{#str}}defaultactivitycompletioncourse, core_completion{{/str}}{{/issite}} +
+
diff --git a/lang/en/completion.php b/lang/en/completion.php index 3e8d7bb3b74..8fbc72c3f9b 100644 --- a/lang/en/completion.php +++ b/lang/en/completion.php @@ -145,7 +145,8 @@ $string['datepassed'] = 'Date passed'; $string['days'] = 'Days'; $string['daysoftotal'] = '{$a->days} of {$a->total}'; $string['daysuntilcompletion'] = 'Days until completion'; -$string['defaultactivitycompletion'] = 'These are the default completion conditions for activities in all courses.'; +$string['defaultactivitycompletionsite'] = 'These are the default completion conditions for activities in all courses.'; +$string['defaultactivitycompletioncourse'] = 'These are the default completion conditions for activities in this course.'; $string['defaultcompletion'] = 'Default activity completion'; $string['defaultcompletionupdated'] = 'Changes saved'; $string['deletecompletiondata'] = 'Delete completion data';