From cd2ea2e57942de404b50eb824b4b224dd3aceb0a Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Thu, 21 Jan 2021 18:57:32 +0000 Subject: [PATCH] reload email after lang is loaded fixes #37. --- email.go | 1 - lang.go | 10 ++++++---- main.go | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/email.go b/email.go index 505bcf6..a8879d9 100644 --- a/email.go +++ b/email.go @@ -60,7 +60,6 @@ func (sm *SMTP) send(address, fromName, fromAddr string, email *Email) error { ServerName: sm.server, } var err error - fmt.Println(server) // err = e.Send(server, sm.auth) if sm.sslTLS { err = e.SendWithTLS(server, sm.auth, tlsConfig) diff --git a/lang.go b/lang.go index d265bbd..327fd36 100644 --- a/lang.go +++ b/lang.go @@ -1,6 +1,8 @@ package main -import "strings" +import ( + "strings" +) type langMeta struct { Name string `json:"name"` @@ -76,7 +78,7 @@ type emailLang struct { type langSection map[string]string -func (el *langSection) format(field string, vals ...string) string { +func (el langSection) format(field string, vals ...string) string { text := el.get(field) for _, val := range vals { text = strings.Replace(text, "{n}", val, 1) @@ -84,8 +86,8 @@ func (el *langSection) format(field string, vals ...string) string { return text } -func (el *langSection) get(field string) string { - t, ok := (*el)[field] +func (el langSection) get(field string) string { + t, ok := el[field] if !ok { return "" } diff --git a/main.go b/main.go index a1d5937..4525f44 100644 --- a/main.go +++ b/main.go @@ -524,6 +524,9 @@ func start(asDaemon, firstCall bool) { app.info.Fatalf("Failed to load language files: %+v\n", err) } + // Since email depends on language, the email reload in loadConfig won't work first time. + app.email = NewEmailer(app) + app.authJf, _ = mediabrowser.NewServer(serverType, server, "jfa-go", app.version, "auth", "auth", timeoutHandler, cacheTimeout) app.loadStrftime()