diff options
| author | enahum <nahumhbl@gmail.com> | 2016-11-14 09:11:54 -0300 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:11:54 -0500 |
| commit | baf1fb6fea7b4afeae7f559f8830bd9493868299 (patch) | |
| tree | e6eb90f0c9c3bdef746d15aa5295b379cd6e6d16 /api/team.go | |
| parent | 323ce8b203c570ed6a1dd57b44d6637ad8207616 (diff) | |
| download | chat-baf1fb6fea7b4afeae7f559f8830bd9493868299.tar.gz chat-baf1fb6fea7b4afeae7f559f8830bd9493868299.tar.bz2 chat-baf1fb6fea7b4afeae7f559f8830bd9493868299.zip | |
PLT-4618 Fix email subjects (#4537)
Diffstat (limited to 'api/team.go')
| -rw-r--r-- | api/team.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/api/team.go b/api/team.go index b1a1ae3cd..e7db79ae2 100644 --- a/api/team.go +++ b/api/team.go @@ -69,8 +69,7 @@ func signupTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - subjectPage := utils.NewHTMLTemplate("signup_team_subject", c.Locale) - subjectPage.Props["Subject"] = c.T("api.templates.signup_team_subject", + subject := c.T("api.templates.signup_team_subject", map[string]interface{}{"SiteName": utils.ClientCfg["SiteName"]}) bodyPage := utils.NewHTMLTemplate("signup_team_body", c.Locale) @@ -89,7 +88,7 @@ func signupTeam(c *Context, w http.ResponseWriter, r *http.Request) { bodyPage.Props["Link"] = fmt.Sprintf("%s/signup_team_complete/?d=%s&h=%s", c.GetSiteURL(), url.QueryEscape(data), url.QueryEscape(hash)) - if err := utils.SendMail(email, subjectPage.Render(), bodyPage.Render()); err != nil { + if err := utils.SendMail(email, subject, bodyPage.Render()); err != nil { c.Err = err return } @@ -717,8 +716,7 @@ func InviteMembers(c *Context, team *model.Team, user *model.User, invites []str senderRole := c.T("api.team.invite_members.member") - subjectPage := utils.NewHTMLTemplate("invite_subject", c.Locale) - subjectPage.Props["Subject"] = c.T("api.templates.invite_subject", + subject := c.T("api.templates.invite_subject", map[string]interface{}{"SenderName": sender, "TeamDisplayName": team.DisplayName, "SiteName": utils.ClientCfg["SiteName"]}) bodyPage := utils.NewHTMLTemplate("invite_body", c.Locale) @@ -744,7 +742,7 @@ func InviteMembers(c *Context, team *model.Team, user *model.User, invites []str l4g.Info(utils.T("api.team.invite_members.sending.info"), invite, bodyPage.Props["Link"]) } - if err := utils.SendMail(invite, subjectPage.Render(), bodyPage.Render()); err != nil { + if err := utils.SendMail(invite, subject, bodyPage.Render()); err != nil { l4g.Error(utils.T("api.team.invite_members.send.error"), err) } } |