diff options
| -rw-r--r-- | app/notification.go | 13 | ||||
| -rw-r--r-- | i18n/en.json | 12 |
2 files changed, 4 insertions, 21 deletions
diff --git a/app/notification.go b/app/notification.go index 6d0de2223..0ea03c9d9 100644 --- a/app/notification.go +++ b/app/notification.go @@ -99,7 +99,7 @@ func (a *App) SendNotifications(post *model.Post, team *model.Team, channel *mod outOfChannelMentions := result.Data.([]*model.User) if channel.Type != model.CHANNEL_GROUP { a.Go(func() { - a.sendOutOfChannelMentions(sender, post, channel.Type, outOfChannelMentions) + a.sendOutOfChannelMentions(sender, post, outOfChannelMentions) }) } } @@ -754,7 +754,7 @@ func (a *App) getMobileAppSessions(userId string) ([]*model.Session, *model.AppE } } -func (a *App) sendOutOfChannelMentions(sender *model.User, post *model.Post, channelType string, users []*model.User) *model.AppError { +func (a *App) sendOutOfChannelMentions(sender *model.User, post *model.Post, users []*model.User) *model.AppError { if len(users) == 0 { return nil } @@ -772,25 +772,16 @@ func (a *App) sendOutOfChannelMentions(sender *model.User, post *model.Post, cha T := utils.GetUserTranslations(sender.Locale) - var localePhrase string - if channelType == model.CHANNEL_OPEN { - localePhrase = T("api.post.check_for_out_of_channel_mentions.link.public") - } else if channelType == model.CHANNEL_PRIVATE { - localePhrase = T("api.post.check_for_out_of_channel_mentions.link.private") - } - ephemeralPostId := model.NewId() var message string if len(users) == 1 { message = T("api.post.check_for_out_of_channel_mentions.message.one", map[string]interface{}{ "Username": usernames[0], - "Phrase": localePhrase, }) } else { message = T("api.post.check_for_out_of_channel_mentions.message.multiple", map[string]interface{}{ "Usernames": strings.Join(usernames[:len(usernames)-1], ", @"), "LastUsername": usernames[len(usernames)-1], - "Phrase": localePhrase, }) } diff --git a/i18n/en.json b/i18n/en.json index 7b101cd72..dac4f5e1d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1697,20 +1697,12 @@ "translation": "Missing file in multipart/form request" }, { - "id": "api.post.check_for_out_of_channel_mentions.link.private", - "translation": "add them to this private channel" - }, - { - "id": "api.post.check_for_out_of_channel_mentions.link.public", - "translation": "add them to the channel" - }, - { "id": "api.post.check_for_out_of_channel_mentions.message.multiple", - "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history." + "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned, but they did not receive notifications because they do not belong to this channel." }, { "id": "api.post.check_for_out_of_channel_mentions.message.one", - "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history." + "translation": "@{{.Username}} was mentioned, but they did not receive notifications because they do not belong to this channel." }, { "id": "api.post.create_post.attach_files.error", |