Fix YAML loading of multilingual config

And some other minor fixes from code review.

Updates #2309
This commit is contained in:
Bjørn Erik Pedersen
2016-08-10 22:46:02 +02:00
parent 446e606a09
commit d8a256c155
5 changed files with 74 additions and 12 deletions

View File

@@ -777,7 +777,7 @@ func (s *Site) setupPrevNext() {
}
func (s *Site) render() (err error) {
// There are sadly some global template funcs etc. that needs the language information.
// There are sadly some global template funcs etc. that need the language information.
viper.Set("Multilingual", s.multilingualEnabled())
viper.Set("CurrentContentLanguage", s.Language)
if err = tpl.SetTranslateLang(s.Language.Lang); err != nil {