tpl: Golint fixes

diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go
index 96a3ea639157ebb1d81b2321c6a73e533e642862..281e5cd643add766d885182e4917b94f5ff28472 100644 (file)
--- a/tpl/template_funcs.go
+++ b/tpl/template_funcs.go
@@ -2051,7 +2051,7 @@ func initFuncMap() {
                "upper":        func(a string) string { return strings.ToUpper(a) },
                "urlize":       helpers.CurrentPathSpec().URLize,
                "where":        where,
-               "i18n":         I18nTranslate,
-               "T":            I18nTranslate,
+               "i18n":         i18nTranslate,
+               "T":            i18nTranslate,
        }
 }

diff --git a/tpl/template_i18n.go b/tpl/template_i18n.go
index 00cdd78777a7b7fb0cd660a42d96fd20fa44de8c..9b681b4cde907fecc9c01765a716723b0a140709 100644 (file)
--- a/tpl/template_i18n.go
+++ b/tpl/template_i18n.go
@@ -23,6 +23,7 @@ import (
 )
 
 var (
+       // Logi18nWarnings set to true to print warnings about missing language strings
        Logi18nWarnings   bool
        i18nWarningLogger = helpers.NewDistinctFeedbackLogger()
        currentLanguage   *helpers.Language
@@ -49,6 +50,7 @@ func SetTranslateLang(language *helpers.Language) error {
        return nil
 }
 
+// SetI18nTfuncs sets the language bundle to be used for i18n.
 func SetI18nTfuncs(bndl *bundle.Bundle) {
        translator = &translate{translateFuncs: make(map[string]bundle.TranslateFunc)}
        defaultContentLanguage := viper.GetString("defaultContentLanguage")
@@ -89,7 +91,7 @@ func SetI18nTfuncs(bndl *bundle.Bundle) {
        }
 }
 
-func I18nTranslate(id string, args ...interface{}) (string, error) {
+func i18nTranslate(id string, args ...interface{}) (string, error) {
        if translator == nil || translator.current == nil {
                helpers.DistinctErrorLog.Printf("i18n not initialized, check that you have language file (in i18n) that matches the site language or the default language.")
                return "", nil

diff --git a/tpl/template_i18n_test.go b/tpl/template_i18n_test.go
index 241217d8a150fcb31f2f22b7ddc9c7ac36714965..fb7ff5845064d2247f50d8aea160a1c42611df2d 100644 (file)
--- a/tpl/template_i18n_test.go
+++ b/tpl/template_i18n_test.go
@@ -119,7 +119,7 @@ func doTestI18nTranslate(t *testing.T, data map[string][]byte, lang, id string,
        SetI18nTfuncs(i18nBundle)
        SetTranslateLang(helpers.NewLanguage(lang))
 
-       translated, err := I18nTranslate(id, args)
+       translated, err := i18nTranslate(id, args)
        if err != nil {
                t.Errorf("Error translating '%s': %s", id, err)
        }