From 28696b5dca6b14cfb0935901163d07ce216f9903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 12 Aug 2016 10:12:01 +0200 Subject: [PATCH] Small adjustment to SiteInfo init After a visual inspection to make (pretty) sure it is correct re multiple languages. Updates #2309 --- helpers/language.go | 3 +++ hugolib/site.go | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/helpers/language.go b/helpers/language.go index 994129308..a64809f9f 100644 --- a/helpers/language.go +++ b/helpers/language.go @@ -83,7 +83,10 @@ func (l *Language) SetParam(k string, v interface{}) { l.params[k] = v } +func (l *Language) GetBool(key string) bool { return cast.ToBool(l.Get(key)) } + func (l *Language) GetString(key string) string { return cast.ToString(l.Get(key)) } + func (ml *Language) GetStringMap(key string) map[string]interface{} { return cast.ToStringMap(ml.Get(key)) } diff --git a/hugolib/site.go b/hugolib/site.go index aa89b6929..dd020f75c 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -909,10 +909,10 @@ func (s *Site) initializeSiteInfo() { Languages: languages, defaultContentLanguageInSubdir: defaultContentInSubDir, GoogleAnalytics: lang.GetString("GoogleAnalytics"), - RSSLink: permalinkStr(viper.GetString("RSSUri")), + RSSLink: permalinkStr(lang.GetString("RSSUri")), BuildDrafts: viper.GetBool("BuildDrafts"), canonifyURLs: viper.GetBool("CanonifyURLs"), - preserveTaxonomyNames: viper.GetBool("PreserveTaxonomyNames"), + preserveTaxonomyNames: lang.GetBool("PreserveTaxonomyNames"), AllPages: &s.AllPages, Pages: &s.Pages, rawAllPages: &s.rawAllPages,