Merge pull request #2330 from hmhealey/plt2073

PLT-2073 Replaced FeedbackEmail with SupportEmail in the email footer

api/api.go

@@ -36,7 +36,7 @@ func (me *ServerTemplatePage) Render() string {
 	T := utils.GetUserTranslations(me.Locale)
 	me.Props["Footer"] = T("api.templates.email_footer")
 	me.Html["EmailInfo"] = template.HTML(T("api.templates.email_info",
-		map[string]interface{}{"FeedbackEmail": me.ClientCfg["FeedbackEmail"], "SiteName": me.ClientCfg["SiteName"]}))
+		map[string]interface{}{"SupportEmail": me.ClientCfg["SupportEmail"], "SiteName": me.ClientCfg["SiteName"]}))
 
 	if err := ServerTemplates.ExecuteTemplate(&text, me.TemplateName, me); err != nil {
 		l4g.Error(utils.T("api.api.render.error"), me.TemplateName, err)

i18n/en.json

@@ -1113,7 +1113,7 @@
   },
   {
     "id": "api.templates.email_info",
-    "translation": "Any questions at all, mail us any time: <a href='mailto:{{.FeedbackEmail}}' style='text-decoration: none; color:#2389D7;'>{{.FeedbackEmail}}</a>.<br>Best wishes,<br>The {{.SiteName}} Team<br>"
+    "translation": "Any questions at all, mail us any time: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Best wishes,<br>The {{.SiteName}} Team<br>"
   },
   {
     "id": "api.templates.error.link",

i18n/es.json

@@ -1113,7 +1113,7 @@
   },
   {
     "id": "api.templates.email_info",
-    "translation": "Si tienes alguna pregunta, escribenos en cualquier momento a: <a href=\"mailto:{{.FeedbackEmail}}\" style=\"text-decoration: none; color:#2389D7;\">{{.FeedbackEmail}}</a>.<br>Los mejores deseos,<br>El Equipo {{.SiteName}}<br>"
+    "translation": "Si tienes alguna pregunta, escribenos en cualquier momento a: <a href=\"mailto:{{.SupportEmail}}\" style=\"text-decoration: none; color:#2389D7;\">{{.SupportEmail}}</a>.<br>Los mejores deseos,<br>El Equipo {{.SiteName}}<br>"
   },
   {
     "id": "api.templates.error.link",

i18n/pt.json

@@ -1113,7 +1113,7 @@
   },
   {
     "id": "api.templates.email_info",
-    "translation": "Qualquer dúvida, envie-nos a qualquer momento: <a href='mailto:{{.FeedbackEmail}}' style='text-decoration: none; color:#2389D7;'>{{.FeedbackEmail}}</a>.<br>Nossos melhores cumprimentos,<br>Equipe {{.SiteName}}<br>"
+    "translation": "Qualquer dúvida, envie-nos a qualquer momento: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Nossos melhores cumprimentos,<br>Equipe {{.SiteName}}<br>"
   },
   {
     "id": "api.templates.error.link",
@@ -3587,4 +3587,4 @@
     "id": "web.watcher_fail.error",
     "translation": "Falha ao adicionar diretório observador %v"
   }
-]
+]