mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-17 21:01:26 +02:00
@@ -35,7 +35,6 @@ type LanguagesConfig struct {
|
||||
}
|
||||
|
||||
func LoadLanguageSettings(cfg config.Provider, oldLangs Languages) (c LanguagesConfig, err error) {
|
||||
|
||||
defaultLang := strings.ToLower(cfg.GetString("defaultContentLanguage"))
|
||||
if defaultLang == "" {
|
||||
defaultLang = "en"
|
||||
@@ -160,7 +159,6 @@ func LoadLanguageSettings(cfg config.Provider, oldLangs Languages) (c LanguagesC
|
||||
return c, errors.New("baseURL must be set on all or none of the languages")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return c, nil
|
||||
@@ -172,7 +170,6 @@ func toSortedLanguages(cfg config.Provider, l map[string]interface{}) (Languages
|
||||
|
||||
for lang, langConf := range l {
|
||||
langsMap, err := maps.ToStringMapE(langConf)
|
||||
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Language config is not a map: %T", langConf)
|
||||
}
|
||||
|
@@ -27,9 +27,7 @@ import (
|
||||
|
||||
type translateFunc func(translationID string, templateData interface{}) string
|
||||
|
||||
var (
|
||||
i18nWarningLogger = helpers.NewDistinctFeedbackLogger()
|
||||
)
|
||||
var i18nWarningLogger = helpers.NewDistinctFeedbackLogger()
|
||||
|
||||
// Translator handles i18n translations.
|
||||
type Translator struct {
|
||||
@@ -60,7 +58,6 @@ func (t Translator) Func(lang string) translateFunc {
|
||||
return func(translationID string, args interface{}) string {
|
||||
return ""
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (t Translator) initFuncs(bndl *i18n.Bundle) {
|
||||
@@ -72,7 +69,6 @@ func (t Translator) initFuncs(bndl *i18n.Bundle) {
|
||||
currentLangKey := strings.ToLower(strings.TrimPrefix(currentLangStr, artificialLangTagPrefix))
|
||||
localizer := i18n.NewLocalizer(bndl, currentLangStr)
|
||||
t.translateFuncs[currentLangKey] = func(translationID string, templateData interface{}) string {
|
||||
|
||||
var pluralCount interface{}
|
||||
|
||||
if templateData != nil {
|
||||
|
@@ -244,7 +244,6 @@ func doTestI18nTranslate(t testing.TB, test i18nTest, cfg config.Provider) strin
|
||||
tp := prepareTranslationProvider(t, test, cfg)
|
||||
f := tp.t.Func(test.lang)
|
||||
return f(test.id, test.args)
|
||||
|
||||
}
|
||||
|
||||
func prepareTranslationProvider(t testing.TB, test i18nTest, cfg config.Provider) *TranslationProvider {
|
||||
@@ -298,7 +297,6 @@ func getConfig() *viper.Viper {
|
||||
v.Set("allModules", modules.Modules{mod})
|
||||
|
||||
return v
|
||||
|
||||
}
|
||||
|
||||
func TestI18nTranslate(t *testing.T) {
|
||||
@@ -339,5 +337,4 @@ func BenchmarkI18nTranslate(b *testing.B) {
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -73,7 +73,6 @@ func (tp *TranslationProvider) Update(d *deps.Deps) error {
|
||||
d.Translate = tp.t.Func(d.Language.Lang)
|
||||
|
||||
return nil
|
||||
|
||||
}
|
||||
|
||||
const artificialLangTagPrefix = "art-x-"
|
||||
@@ -138,5 +137,4 @@ func errWithFileContext(inerr error, r source.File) error {
|
||||
herrors.SimpleLineMatcher)
|
||||
|
||||
return err
|
||||
|
||||
}
|
||||
|
@@ -122,7 +122,6 @@ func (l Languages) Less(i, j int) bool {
|
||||
}
|
||||
|
||||
return wj == 0 || wi < wj
|
||||
|
||||
}
|
||||
|
||||
func (l Languages) Swap(i, j int) { l[i], l[j] = l[j], l[i] }
|
||||
@@ -256,5 +255,4 @@ func (l *Language) IsSet(key string) bool {
|
||||
}
|
||||
}
|
||||
return l.Cfg.IsSet(key)
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user