diff options
| author | Jonathan <jonfritz@gmail.com> | 2017-07-31 11:51:43 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-07-31 11:51:43 -0400 |
| commit | d01261a228fd6cda693623a85832bd567693512e (patch) | |
| tree | 473326274476f3ae54382e59403fd8b5e9c832f1 /webapp/i18n/en.json | |
| parent | 8d7dcf44e2c6951a501c74dca21d453f2f9966e4 (diff) | |
| download | chat-d01261a228fd6cda693623a85832bd567693512e.tar.gz chat-d01261a228fd6cda693623a85832bd567693512e.tar.bz2 chat-d01261a228fd6cda693623a85832bd567693512e.zip | |
PLT-7177: Change the default email frequency to 15 minutes if batching is enabled on the server. (#7036)
* PLT-7177: Found default preference that needs to be changed
* PLT-7177: Front end behaves as desired
* PLT-7177: Changed default batching interval on server side
* PLT-7177: Added unit tests for new default interval
* PLT-7177: Removed unused import
* PLT-7177: Renamed constants to increase clarity
Diffstat (limited to 'webapp/i18n/en.json')
| -rwxr-xr-x | webapp/i18n/en.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index deec452d2..e138660b0 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -267,7 +267,7 @@ "admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.", "admin.email.enableEmailBatching.clusterEnabled": "Email batching cannot be enabled when High Availability mode is enabled.", "admin.email.enableEmailBatching.siteURL": "Email batching cannot be enabled unless the SiteURL is configured in <b>Configuration > SiteURL</b>.", - "admin.email.enableEmailBatchingDesc": "When true, users can have email notifications for multiple direct messages and mentions combined into a single email, configurable in <b>Account Settings > Notifications</b>.", + "admin.email.enableEmailBatchingDesc": "When true, users will have email notifications for multiple direct messages and mentions combined into a single email. Batching will occur at a default interval of 15 minutes, configurable in Account Settings > Notifications.", "admin.email.enableEmailBatchingTitle": "Enable Email Batching:", "admin.email.fullPushNotification": "Send full message snippet", "admin.email.genericPushNotification": "Send generic description with user and channel names", |