From 2305b2597f3658329479645820b985db78da103f Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Mon, 4 Jul 2016 09:30:57 -0400
Subject: 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
---
 utils/i18n.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'utils/i18n.go')

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 {
-- 
cgit v1.2.3-1-g7c22