summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2016-08-01 11:21:50 -0400
committerChristopher Speller <crspeller@gmail.com>2016-08-01 11:21:50 -0400
commitbc511dc18642cddc22ca4e3c6eb20f05737e2d5f (patch)
treea8b2f248c0c6831eb7a5499565de44f2ae7ca615 /webapp
parent3bf405c0cd9920caa65f795fccdfab626501de71 (diff)
downloadchat-bc511dc18642cddc22ca4e3c6eb20f05737e2d5f.tar.gz
chat-bc511dc18642cddc22ca4e3c6eb20f05737e2d5f.tar.bz2
chat-bc511dc18642cddc22ca4e3c6eb20f05737e2d5f.zip
Update help text for compliance settings (#3705)
* Update help text for compliance settings * Update en.json
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/compliance_settings.jsx4
-rw-r--r--webapp/i18n/en.json2
2 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/admin_console/compliance_settings.jsx b/webapp/components/admin_console/compliance_settings.jsx
index eac9bf097..f9dc61c1d 100644
--- a/webapp/components/admin_console/compliance_settings.jsx
+++ b/webapp/components/admin_console/compliance_settings.jsx
@@ -76,9 +76,9 @@ export default class ComplianceSettings extends AdminSettings {
/>
}
helpText={
- <FormattedMessage
+ <FormattedHTMLMessage
id='admin.compliance.enableDesc'
- defaultMessage='When true, Mattermost allows compliance reporting'
+ defaultMessage='When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <a href="https://docs.mattermost.com/administration/compliance.html" target="_blank">documentation</a> to learn more.'
/>
}
value={this.state.enable}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 9aa3a8e61..c9f235d2a 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -113,7 +113,7 @@
"admin.compliance.directoryTitle": "Compliance Report Directory:",
"admin.compliance.enableDailyDesc": "When true, Mattermost will generate a daily compliance report.",
"admin.compliance.enableDailyTitle": "Enable Daily Report:",
- "admin.compliance.enableDesc": "When true, Mattermost allows compliance reporting",
+ "admin.compliance.enableDesc": "When true, Mattermost allows compliance reporting from the <strong>Compliance and Auditing</strong> tab. See <a href=\"https://docs.mattermost.com/administration/compliance.html\" target=\"_blank\">documentation</a> to learn more.",
"admin.compliance.enableTitle": "Enable Compliance Reporting:",
"admin.compliance.false": "false",
"admin.compliance.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>Compliance is an enterprise feature. Your current license does not support Compliance. Click <a href=\"http://mattermost.com\" target=\"_blank\">here</a> for information and pricing on enterprise licenses.</p>",