shithub: hugo

Info  •  Files  •  Log  •  Branches

hugolib: Add .Site.Sites

Fixes #5504

--- a/hugolib/hugo_sites.go

+++ b/hugolib/hugo_sites.go

@@ -55,6 +55,14 @@

 	gitInfo *gitInfo

 }

+func (h *HugoSites) siteInfos() SiteInfos {

+	infos := make(SiteInfos, len(h.Sites))

+	for i, site := range h.Sites {

+		infos[i] = &site.Info

+	}

+	return infos

+}

+

 func (h *HugoSites) pickOneAndLogTheRest(errors []error) error {

 	if len(errors) == 0 {

 		return nil

--- a/hugolib/page.go

+++ b/hugolib/page.go

@@ -369,12 +369,7 @@

 // Sites is a convenience method to get all the Hugo sites/languages configured.

 func (p *Page) Sites() SiteInfos {

-	infos := make(SiteInfos, len(p.s.owner.Sites))

-	for i, site := range p.s.owner.Sites {

-		infos[i] = &site.Info

-	}

-

-	return infos

+	return p.s.owner.siteInfos()

 }

 // SearchKeywords implements the related.Document interface needed for fast page searches.

--- a/hugolib/site.go

+++ b/hugolib/site.go

@@ -424,6 +424,10 @@

 	return s.hugoInfo

 }

+// Sites is a convenience method to get all the Hugo sites/languages configured.

+func (s *SiteInfo) Sites() SiteInfos {

+	return s.s.owner.siteInfos()

+}

 func (s *SiteInfo) String() string {

 	return fmt.Sprintf("Site(%q)", s.Title)

 }

--- a/hugolib/template_test.go

+++ b/hugolib/template_test.go

@@ -242,6 +242,7 @@

 	b := newTestSitesBuilder(t).WithDefaultMultiSiteConfig()

 	homeTpl := `Site: {{ site.Language.Lang }} / {{ .Site.Language.Lang }} / {{ site.BaseURL }}

+Sites: {{ site.Sites.First.Home.Language.Lang }}

 Hugo: {{ hugo.Generator }}

 `

@@ -252,8 +253,14 @@

 	b.CreateSites().Build(BuildCfg{})

-	b.AssertFileContent("public/en/index.html", "Site: en / en / http://example.com/blog",

+	b.AssertFileContent("public/en/index.html",

+		"Site: en / en / http://example.com/blog",

+		"Sites: en",

 		"Hugo: <meta name=\"generator\" content=\"Hugo")

-	b.AssertFileContent("public/fr/index.html", "Site: fr / fr / http://example.com/blog")

+	b.AssertFileContent("public/fr/index.html",

+		"Site: fr / fr / http://example.com/blog",

+		"Sites: en",

+		"Hugo: <meta name=\"generator\" content=\"Hugo",

+	)

 }