diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
commit | ff6c42309c4dd328b5841cfeef6b59ea59a4379c (patch) | |
tree | c2c3b4938588549ea69653a46d98b27f6fe37b80 /app/email.go | |
parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
parent | e73f1d73143ebba9c7e80d21c45bba9b61f2611c (diff) | |
download | chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.gz chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.bz2 chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'app/email.go')
-rw-r--r-- | app/email.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/email.go b/app/email.go index 7a50fd82a..aa05cefdb 100644 --- a/app/email.go +++ b/app/email.go @@ -9,9 +9,9 @@ import ( "net/http" - l4g "github.com/alecthomas/log4go" "github.com/nicksnyder/go-i18n/i18n" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) @@ -282,17 +282,17 @@ func (a *App) SendInviteEmails(team *model.Team, senderName string, invites []st data := model.MapToJson(props) if result := <-a.Srv.Store.Token().Save(token); result.Err != nil { - l4g.Error(utils.T("api.team.invite_members.send.error"), result.Err) + mlog.Error(fmt.Sprintf("Failed to send invite email successfully err=%v", result.Err)) continue } bodyPage.Props["Link"] = fmt.Sprintf("%s/signup_user_complete/?d=%s&t=%s", siteURL, url.QueryEscape(data), url.QueryEscape(token.Token)) if !a.Config().EmailSettings.SendEmailNotifications { - l4g.Info(utils.T("api.team.invite_members.sending.info"), invite, bodyPage.Props["Link"]) + mlog.Info(fmt.Sprintf("sending invitation to %v %v", invite, bodyPage.Props["Link"])) } if err := a.SendMail(invite, subject, bodyPage.Render()); err != nil { - l4g.Error(utils.T("api.team.invite_members.send.error"), err) + mlog.Error(fmt.Sprintf("Failed to send invite email successfully err=%v", err)) } } } |