diff options
| author | enahum <nahumhbl@gmail.com> | 2016-07-04 09:30:57 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-07-04 09:30:57 -0400 |
| commit | 2305b2597f3658329479645820b985db78da103f (patch) | |
| tree | 0754ac5a717f40d3cd4df010d9c7baeeb1abedd9 /utils | |
| parent | 5dfa4fb62979ab9d4eba3c33a29397fe10f7cbc3 (diff) | |
| download | chat-2305b2597f3658329479645820b985db78da103f.tar.gz chat-2305b2597f3658329479645820b985db78da103f.tar.bz2 chat-2305b2597f3658329479645820b985db78da103f.zip | |
PLT-3456 Fix Errors while starting the server (#3445)
* PLT-3456 AppErrors that are triggered before translations are loaded crash server or produce bad error messages.
* Fixing tests
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config_test.go | 1 | ||||
| -rw-r--r-- | utils/i18n.go | 11 | ||||
| -rw-r--r-- | utils/mail.go | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/utils/config_test.go b/utils/config_test.go index 96ef49696..d42f99a69 100644 --- a/utils/config_test.go +++ b/utils/config_test.go @@ -8,6 +8,7 @@ import ( ) func TestConfig(t *testing.T) { + TranslationsPreInit() LoadConfig("config.json") InitTranslations(Cfg.LocalizationSettings) } diff --git a/utils/i18n.go b/utils/i18n.go index b3e10a831..8366ae75d 100644 --- a/utils/i18n.go +++ b/utils/i18n.go @@ -15,9 +15,16 @@ var T i18n.TranslateFunc var locales map[string]string = make(map[string]string) var settings model.LocalizationSettings +// this functions loads translations from filesystem +// and assign english while loading server config +func TranslationsPreInit() { + InitTranslationsWithDir("i18n") + T = TfuncWithFallback("en") +} + func InitTranslations(localizationSettings model.LocalizationSettings) { settings = localizationSettings - InitTranslationsWithDir("i18n") + T = GetTranslationsBySystemLocale() } func InitTranslationsWithDir(dir string) { @@ -30,8 +37,6 @@ func InitTranslationsWithDir(dir string) { i18n.MustLoadTranslationFile(i18nDirectory + filename) } } - - T = GetTranslationsBySystemLocale() } func GetTranslationsBySystemLocale() i18n.TranslateFunc { diff --git a/utils/mail.go b/utils/mail.go index 4a0b987e6..c4532f7b4 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -79,14 +79,14 @@ func TestConnection(config *model.Config) { conn, err1 := connectToSMTPServer(config) if err1 != nil { - l4g.Error(T("utils.mail.test.configured.error"), err1.Message, err1.DetailedError) + l4g.Error(T("utils.mail.test.configured.error"), T(err1.Message), err1.DetailedError) return } defer conn.Close() c, err2 := newSMTPClient(conn, config) if err2 != nil { - l4g.Error(T("utils.mail.test.configured.error"), err2.Message, err2.DetailedError) + l4g.Error(T("utils.mail.test.configured.error"), T(err2.Message), err2.DetailedError) return } defer c.Quit() |