github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Small adjustment to SiteInfo init

Browse source 
After a visual inspection to make (pretty) sure it is correct re multiple languages.

Updates #2309
This commit is contained in:
Bjørn Erik Pedersen 2016-08-12 10:12:01 +02:00
parent 2f7e8df5ba
commit 28696b5dca
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
helpers/language.go
View file

@ -83,7 +83,10 @@ func (l *Language) SetParam(k string, v interface{}) {
l.params[k] = v 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 (l *Language) GetString(key string) string { return cast.ToString(l.Get(key)) }
func (ml *Language) GetStringMap(key string) map[string]interface{} { func (ml *Language) GetStringMap(key string) map[string]interface{} {
return cast.ToStringMap(ml.Get(key)) return cast.ToStringMap(ml.Get(key))
} }

4
hugolib/site.go
View file

@ -909,10 +909,10 @@ func (s *Site) initializeSiteInfo() {
Languages: languages, Languages: languages,
defaultContentLanguageInSubdir: defaultContentInSubDir, defaultContentLanguageInSubdir: defaultContentInSubDir,
GoogleAnalytics: lang.GetString("GoogleAnalytics"), GoogleAnalytics: lang.GetString("GoogleAnalytics"),
RSSLink: permalinkStr(viper.GetString("RSSUri")), RSSLink: permalinkStr(lang.GetString("RSSUri")),
BuildDrafts: viper.GetBool("BuildDrafts"), BuildDrafts: viper.GetBool("BuildDrafts"),
canonifyURLs: viper.GetBool("CanonifyURLs"), canonifyURLs: viper.GetBool("CanonifyURLs"),
preserveTaxonomyNames: viper.GetBool("PreserveTaxonomyNames"), preserveTaxonomyNames: lang.GetBool("PreserveTaxonomyNames"),
AllPages: &s.AllPages, AllPages: &s.AllPages,
Pages: &s.Pages, Pages: &s.Pages,
rawAllPages: &s.rawAllPages, rawAllPages: &s.rawAllPages,