Commit e2ce85a2 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug #1114790: Add text for need of logging settings"

parents f96c1131 90b27cca
......@@ -207,14 +207,14 @@ $siteoptionform = array(
'masqueradingreasonrequired' => array(
'type' => 'checkbox',
'title' => get_string('masqueradingreasonrequired', 'admin'),
'description' => get_string('masqueradingreasonrequireddescription', 'admin'),
'description' => get_string('masqueradingreasonrequireddescription1', 'admin'),
'defaultvalue' => get_config('masqueradingreasonrequired'),
'disabled' => in_array('masqueradingreasonrequired', $OVERRIDDEN),
),
'masqueradingnotified' => array(
'type' => 'checkbox',
'title' => get_string('masqueradingnotified', 'admin'),
'description' => get_string('masqueradingnotifieddescription', 'admin'),
'description' => get_string('masqueradingnotifieddescription1', 'admin'),
'defaultvalue' => get_config('masqueradingnotified'),
'disabled' => in_array('masqueradingnotified', $OVERRIDDEN),
),
......
......@@ -1045,9 +1045,9 @@ $string['lastlogin'] = 'Last login';
// Masquerading reasons and notification
$string['masqueradingreasonrequired'] = 'Require reason for masquerading';
$string['masqueradingreasonrequireddescription'] = 'If checked, administrators will be required to enter a reason for masquerading as other users. This will be logged, and if the setting "Notify users of masquerading" is enabled, included in the notification to the user about the masquerading.';
$string['masqueradingreasonrequireddescription1'] = 'If checked, administrators will be required to enter a reason for masquerading as other users. If the setting "Notify users of masquerading" is enabled, the reason will be included in the notification to the user about the masquerading. The logging of masquerading sessions needs to be turned on in the "Logging settings" for this to work.';
$string['masqueradingnotified'] = 'Notify users of masquerading';
$string['masqueradingnotifieddescription'] = 'If checked, users will be notified when an administrator masqueraded as them. The notification will include who, when and - if enabled under "Require reason for masquerading" - why.';
$string['masqueradingnotifieddescription1'] = 'If checked, users will be notified when an administrator masqueraded as them. The notification will include who, when and - if enabled under "Require reason for masquerading" - why. The logging of masquerading sessions needs to be turned on in the "Logging settings" for this to work.';
$string['masquerade'] = 'Continue';
$string['masqueradereason'] = 'Reason';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment