tpl: Add TemplateFuncsNamespaceRegistry

As a first step to remove the hard ties between `tplimpl` and the different namespace packages.

The `lang` package is used as the first example use case.

See #3042
This commit is contained in:
Bjørn Erik Pedersen
2017-04-30 11:34:45 +02:00
parent 8f95172c7a
commit c5373efcf0
6 changed files with 109 additions and 10 deletions

View File

@@ -22,6 +22,10 @@ import (
"github.com/spf13/cast"
"github.com/spf13/hugo/tpl/compare"
"github.com/spf13/hugo/tpl/internal"
// Init the namespaces
_ "github.com/spf13/hugo/tpl/lang"
)
// Get retrieves partial output from the cache based upon the partial name.
@@ -181,8 +185,18 @@ func (t *templateFuncster) initFuncMap() {
"upper": t.strings.ToUpper,
"urlize": t.PathSpec.URLize,
"where": t.collections.Where,
"i18n": t.lang.Translate,
"T": t.lang.T,
}
// Merge the namespace funcs
for _, nsf := range internal.TemplateFuncsNamespaceRegistry {
ns := nsf(t.Deps)
// TODO(bep) namespace ns.Context is a dummy func just to make this work.
// Consider if we can add this context to the rendering context in an easy
// way to make this cleaner. Maybe.
funcMap[ns.Name] = ns.Context
for k, v := range ns.Aliases {
funcMap[k] = v
}
}
t.funcMap = funcMap