PLT-2687 sending email on upgrade and moving profile pic to new location (#2808)

* Fixing CLI and adding unit tests

* Adding the upgrade_db_30 to the help text

* Adding the upgrade_db_30 to the help text

* Adding the upgrade_db_30 to the help text

* Fixing CLI tests

* PLT-2687 sending email on upgrade and moving profile pic to new location

* Fixing img move

* Fixing moving of profile image

* making upgrade email localizable

* Fixing email template

1 files changed, 10 insertions, 3 deletions

diff --git a/utils/html.go b/utils/html.go
index e89cb12a0..7bb594e07 100644
--- a/utils/html.go
+++ b/utils/html.go
@@ -9,6 +9,7 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
+	"github.com/nicksnyder/go-i18n/i18n"
 	"gopkg.in/fsnotify.v1"
 )
 
@@ -77,9 +78,15 @@ func NewHTMLTemplate(templateName string, locale string) *HTMLTemplate {
 }
 
 func (t *HTMLTemplate) addDefaultProps() {
-	T := GetUserTranslations(t.Locale)
-	t.Props["Footer"] = T("api.templates.email_footer")
-	t.Html["EmailInfo"] = template.HTML(T("api.templates.email_info",
+	var localT i18n.TranslateFunc
+	if len(t.Locale) > 0 {
+		localT = GetUserTranslations(t.Locale)
+	} else {
+		localT = T
+	}
+
+	t.Props["Footer"] = localT("api.templates.email_footer")
+	t.Html["EmailInfo"] = template.HTML(localT("api.templates.email_info",
 		map[string]interface{}{"SupportEmail": Cfg.SupportSettings.SupportEmail, "SiteName": Cfg.TeamSettings.SiteName}))
 }