Merge branch 'master' into advanced-permissions-phase-2

1 files changed, 3 insertions, 3 deletions

diff --git a/utils/i18n.go b/utils/i18n.go
index 72704c241..d7c55e4e6 100644
--- a/utils/i18n.go
+++ b/utils/i18n.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	l4g "github.com/alecthomas/log4go"
+	"github.com/mattermost/mattermost-server/mlog"
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/nicksnyder/go-i18n/i18n"
 )
@@ -67,7 +67,7 @@ func InitTranslationsWithDir(dir string) error {
 func GetTranslationsBySystemLocale() (i18n.TranslateFunc, error) {
 	locale := *settings.DefaultServerLocale
 	if _, ok := locales[locale]; !ok {
-		l4g.Error("Failed to load system translations for '%v' attempting to fall back to '%v'", locale, model.DEFAULT_LOCALE)
+		mlog.Error(fmt.Sprintf("Failed to load system translations for '%v' attempting to fall back to '%v'", locale, model.DEFAULT_LOCALE))
 		locale = model.DEFAULT_LOCALE
 	}
 
@@ -80,7 +80,7 @@ func GetTranslationsBySystemLocale() (i18n.TranslateFunc, error) {
 		return nil, fmt.Errorf("Failed to load system translations")
 	}
 
-	l4g.Info(translations("utils.i18n.loaded"), locale, locales[locale])
+	mlog.Info(fmt.Sprintf("Loaded system translations for '%v' from '%v'", locale, locales[locale]))
 	return translations, nil
 }