Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle

diff --git a/admin/tool/monitor/lang/en/tool_monitor.php b/admin/tool/monitor/lang/en/tool_monitor.php
index 474629e..0897a31 100644 (file)
--- a/admin/tool/monitor/lang/en/tool_monitor.php
+++ b/admin/tool/monitor/lang/en/tool_monitor.php
@@ -40,7 +40,7 @@ $string['disablefieldswarning'] = 'Some fields can not be edited as this rule al
 $string['duplicaterule'] = 'Duplicate rule';
 $string['editrule'] = 'Edit rule';
 $string['enablehelp'] = 'Enable/disable event monitoring';
-$string['enablehelp_help'] = 'Event monitoring must be enabled before it can be used. Please note that enabling event monitoring can have associated permformance implications.';
+$string['enablehelp_help'] = 'Event monitoring must be enabled before you can create and subscribe to rules. Note that enabling Event monitoring may affect the performance of your site.';
 $string['event'] = 'Event';
 $string['eventnotfound'] = 'Event not found';
 $string['eventrulecreated'] = 'Rule created';

diff --git a/admin/tool/monitor/managerules.php b/admin/tool/monitor/managerules.php
index c7ff382..62957fc 100644 (file)
--- a/admin/tool/monitor/managerules.php
+++ b/admin/tool/monitor/managerules.php
@@ -132,7 +132,7 @@ if ($status) {
         echo ' ' . html_writer::link($enableurl, get_string('enable'));
         echo $OUTPUT->render($help);
     } else {
-        echo get_string('contactadmin', 'tool_monitor');
+        echo ' ' . get_string('contactadmin', 'tool_monitor');
     }
     echo $OUTPUT->footer(); // Do not render anything else.
     exit();