mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-28 14:40:43 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Localize time.Format

Browse source 
Fixes #8797
This commit is contained in:
Bjørn Erik Pedersen 2021-07-26 18:28:57 +02:00
parent f9afba9335
commit a57dda854b
11 changed files with 395 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
langs/language.go
View file

@ -18,6 +18,8 @@ import (
"strings"
"sync"
translators "github.com/bep/gotranslators"
"github.com/go-playground/locales"
"github.com/gohugoio/hugo/common/maps"
"github.com/gohugoio/hugo/config"
)
@ -68,6 +70,11 @@ type Language struct {
params map[string]interface{}
paramsMu sync.Mutex
paramsSet bool
// Used for date formatting etc. We don't want this exported to the
// templates.
// TODO(bep) do the same for some of the others.
translator locales.Translator
}
func (l *Language) String() string {
@ -86,8 +93,22 @@ func NewLanguage(lang string, cfg config.Provider) *Language {
localCfg := config.New()
compositeConfig := config.NewCompositeConfig(cfg, localCfg)
translator := translators.Get(lang)
if translator == nil {
translator = translators.Get(cfg.GetString("defaultContentLanguage"))
if translator == nil {
translator = translators.Get("en")
}
}
l := &Language{Lang: lang, ContentDir: cfg.GetString("contentDir"), Cfg: cfg, LocalCfg: localCfg, Provider: compositeConfig, params: params}
l := &Language{
Lang: lang,
ContentDir: cfg.GetString("contentDir"),
Cfg: cfg, LocalCfg: localCfg,
Provider: compositeConfig,
params: params,
translator: translator,
}
return l
}
@ -222,3 +243,10 @@ func (l *Language) IsSet(key string) bool {
}
return l.Cfg.IsSet(key)
}
// Internal access to unexported Language fields.
// This construct is to prevent them from leaking to the templates.
func GetTranslator(l *Language) locales.Translator {
return l.translator
}