diff options
| author | Jonathan <jonfritz@gmail.com> | 2017-08-05 19:52:35 -0400 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-08-06 07:52:35 +0800 |
| commit | 178ccd16cba26144eac404f413440867b360033c (patch) | |
| tree | 5a2304ee8fbe7586d4101b7e38cd85756e114a05 /webapp/i18n/en.json | |
| parent | 9f3713aa98011596a62315fd3b96fa2e77044081 (diff) | |
| download | chat-178ccd16cba26144eac404f413440867b360033c.tar.gz chat-178ccd16cba26144eac404f413440867b360033c.tar.bz2 chat-178ccd16cba26144eac404f413440867b360033c.zip | |
System Console: Email notification content setting (#7122)
* PLT-7195: Added new config option, new license feature, and config UI to system console. Still need to implement behaviour change in email batching code
* PLT-7195: Modified batch emails to respect email notification content type setting
* PLT-7195: Tweaking the colours a bit
* PLT-7195: Added support for email notification content type setting in immediate (non-batched) notification messages. Attempted to clean up the code somewhat. Unit tests coming in a future commit
* PLT-7195: Added unit tests for non-batched emails
* Checked license when applying email content settings
* Changed return type of getFormattedPostTime
Diffstat (limited to 'webapp/i18n/en.json')
| -rwxr-xr-x | webapp/i18n/en.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 483844a86..ebbb8662f 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -350,6 +350,11 @@ "admin.email.enableSMTPAuthTitle": "Enable SMTP Authentication:", "admin.email.enableSMTPAuthDesc": "When enabled, username and password are used for authenticating to the SMTP server.", "admin.email.testing": "Testing...", + "admin.email.notification.contents.full": "Send full message contents", + "admin.email.notification.contents.generic": "Send generic description with only sender name", + "admin.email.notification.contents.title": "Email Notification Contents: ", + "admin.email.notification.contents.full.description": "Sender name and channel are included in email notifications.</br>Typically used for compliance reasons if Mattermost contains confidential information and policy dictates it cannot be stored in email.", + "admin.email.notification.contents.generic.description": "Only the name of the person who sent the message, with no information about channel name or message contents are included in email notifications.</br>Typically used for compliance reasons if Mattermost contains confidential information and policy dictates it cannot be stored in email.", "admin.false": "false", "admin.file.enableFileAttachments": "Allow File Sharing:", "admin.file.enableFileAttachmentsDesc": "When false, disables file sharing on the server. All file and image uploads on messages are forbidden across clients and devices, including mobile.", |