From 8203fd16ce3356d69b0cc51287d0a1fc25318b2d Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 16 Aug 2016 14:41:47 -0400 Subject: PLT-3647 Email Batching (#3718) * PLT-3647 Added config settings for email batching * PLT-3647 Refactored generation of email notification * PLT-3647 Added serverside code for email batching * PLT-3647 Updated settings UI to enable email batching * PLT-3647 Removed debug code * PLT-3647 Fixed 0-padding of minutes in batched notification * PLT-3647 Updated clientside UI for when email batching is disabled * Go fmt * PLT-3647 Changed email batching to be disabled by default * Updated batched email message * Added email batching toggle to system console * Changed Email Notifications > Immediate setting to a 30 second batch interval * Go fmt * Fixed link to Mattermost icon in batched email notification * Updated users to use 30 second email batching by default * Fully disabled email batching when clustering is enabled * Fixed email batching setting in the system console * Fixed casing of 'Send Email notifications' -> 'Send email notifications' * Updating UI Improvements for email batching (#3736) * Updated text for notification settings and SiteURL. * Prevented enabling email batching when SiteURL isn't set in the system console * Re-added a couple debug messages * Added warning text when clustering is enabled --- i18n/en.json | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 1 deletion(-) (limited to 'i18n') diff --git a/i18n/en.json b/i18n/en.json index 0010b6059..823a6f259 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -627,6 +627,72 @@ "id": "api.context.unknown.app_error", "translation": "An unknown error has occurred. Please contact support." }, + { + "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error", + "translation": "Email batching job's receiving channel was full. Please increase the EmailBatchingBufferSize." + }, + { + "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error", + "translation": "Email batching has been disabled by the system administrator" + }, + { + "id": "api.email_batching.check_pending_emails.status.app_error", + "translation": "Unable to find status of recipient for batched email notification" + }, + { + "id": "api.email_batching.check_pending_emails.finished_running", + "translation": "Email batching job ran. %v user(s) still have notifications pending." + }, + { + "id": "api.email_batching.render_batched_post.channel.app_error", + "translation": "Unable to find channel of post for batched email notification" + }, + { + "id": "api.email_batching.render_batched_post.date", + "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" + }, + { + "id": "api.email_batching.render_batched_post.direct_message", + "translation": "Direct Message" + }, + { + "id": "api.email_batching.render_batched_post.go_to_post", + "translation": "Go to Post" + }, + { + "id": "api.email_batching.render_batched_post.sender.app_error", + "translation": "Unable to find sender of post for batched email notification" + }, + { + "id": "api.email_batching.send_batched_email_notification.body_text", + "translation": { + "one": "You have a new message.", + "other": "You have {{.Count}} new messages." + } + }, + { + "id": "api.email_batching.send_batched_email_notification.preferences.app_error", + "translation": "Unable to find display preferences of recipient for batched email notification" + }, + { + "id": "api.email_batching.send_batched_email_notification.send.app_error", + "translation": "Failed to send batched email notification to %v: %v" + }, + { + "id": "api.email_batching.send_batched_email_notification.subject", + "translation": { + "one": "[{{.SiteName}}] New Notification for {{.Month}} {{.Day}}, {{.Year}}", + "other": "[{{.SiteName}}] New Notifications for {{.Month}} {{.Day}}, {{.Year}}" + } + }, + { + "id": "api.email_batching.send_batched_email_notification.user.app_error", + "translation": "Unable to find recipient for batched email notification" + }, + { + "id": "api.email_batching.start.starting", + "translation": "Email batching job starting. Checking for pending emails every %v seconds." + }, { "id": "api.emoji.create.duplicate.app_error", "translation": "Unable to create emoji. Another emoji with the same name already exists." @@ -1031,6 +1097,20 @@ "id": "api.post.delete_post.permissions.app_error", "translation": "You do not have the appropriate permissions" }, + { + "id": "api.post.get_message_for_notification.files_sent", + "translation": { + "one": "{{.Count}} file sent: {{.Filenames}}", + "other": "{{.Count}} files sent: {{.Filenames}}" + } + }, + { + "id": "api.post.get_message_for_notification.images_sent", + "translation": { + "one": "{{.Count}} image sent: {{.Filenames}}", + "other": "{{.Count}} images sent: {{.Filenames}}" + } + }, { "id": "api.post.get_out_of_channel_mentions.regex.error", "translation": "Failed to compile @mention regex user_id=%v, err=%v" @@ -2763,6 +2843,18 @@ "id": "model.compliance.is_valid.start_end_at.app_error", "translation": "To must be greater than From" }, + { + "id": "model.config.is_valid.cluster_email_batching.app_error", + "translation": "Unable to enable email batching (EmailSettings.EnableEmailBatching) when clustering (ClusterSettings.Enable) is enabled" + }, + { + "id": "model.config.is_valid.email_batching_buffer_size.app_error", + "translation": "Invalid email batching buffer size for email settings. Must be zero or a positive number." + }, + { + "id": "model.config.is_valid.email_batching_interval.app_error", + "translation": "Invalid email batching interval for email settings. Must be 30 seconds or more." + }, { "id": "model.config.is_valid.email_reset_salt.app_error", "translation": "Invalid password reset salt for email settings. Must be 32 chars or more." @@ -2785,7 +2877,7 @@ }, { "id": "model.config.is_valid.file_preview_height.app_error", - "translation": "Invalid preview height for file settings. Must be a zero or positive number." + "translation": "Invalid preview height for file settings. Must be zero or a positive number." }, { "id": "model.config.is_valid.file_preview_width.app_error", @@ -2947,6 +3039,10 @@ "id": "model.config.is_valid.site_url.app_error", "translation": "Site URL must be a valid URL and start with http:// or https://" }, + { + "id": "model.config.is_valid.site_url_email_batching.app_error", + "translation": "Unable to enable email batching (EmailSettings.EnableEmailBatching) when SiteURL (ServiceSettings.SiteURL) isn't set." + }, { "id": "model.config.is_valid.sitename_length.app_error", "translation": "Site name must be less than or equal to {{.MaxLength}} characters." -- cgit v1.2.3-1-g7c22