From d01261a228fd6cda693623a85832bd567693512e Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 31 Jul 2017 11:51:43 -0400 Subject: 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 --- webapp/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/i18n/en.json') 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 Configuration > SiteURL.", - "admin.email.enableEmailBatchingDesc": "When true, users can have email notifications for multiple direct messages and mentions combined into a single email, configurable in Account Settings > Notifications.", + "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", -- cgit v1.2.3-1-g7c22