Small adjustment to SiteInfo init - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 28696b5dca6b14cfb0935901163d07ce216f9903
DIR parent 2f7e8df5babaed8017d7af85ae50269bcd3eb0c5
HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Fri, 12 Aug 2016 10:12:01 +0200
Small adjustment to SiteInfo init
After a visual inspection to make (pretty) sure it is correct re multiple languages.
Updates #2309
Diffstat:
M helpers/language.go | 3 +++
M hugolib/site.go | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
---
DIR diff --git 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))
}
DIR diff --git 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,