diff options
| author | Jonathan <jonfritz@gmail.com> | 2017-09-05 16:39:07 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-05 16:39:07 -0400 |
| commit | 016b5daa1cde1a147701aafce94f67057fbb7aa6 (patch) | |
| tree | fd1e70b4790feeb6a3e26541192d5857a224d22e /i18n | |
| parent | 2977b31a3942ac0e6bd2ad1c38f2c008037c54a6 (diff) | |
| download | chat-016b5daa1cde1a147701aafce94f67057fbb7aa6.tar.gz chat-016b5daa1cde1a147701aafce94f67057fbb7aa6.tar.bz2 chat-016b5daa1cde1a147701aafce94f67057fbb7aa6.zip | |
PLT-7444: If there is activity in Mattermost before the email batch is sent, do not send the email (#7342)
* Changed email batching short-circuit logic to look at last viewed at timestamp in channel member struct instead of in user's status struct, since the latter is only updated if the user's status is set to online
* Fixed unit tests
* Reduced right-hand drift
* Reduced total number of store calls by loading all channel member objects for user exactly once per team that the user received notifications for
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/en.json | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json index 8ada9ce6c..eb7f5e1cc 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -972,10 +972,6 @@ "translation": "Email batching job ran. %v user(s) still have notifications pending." }, { - "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.render_batched_post.channel.app_error", "translation": "Unable to find channel of post for batched email notification" }, |