git.maquefel.me Git - brevno-suite/hugo/commit

author	Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
	Thu, 15 Mar 2018 08:37:30 +0000 (09:37 +0100)
committer	Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
	Fri, 16 Mar 2018 09:10:01 +0000 (10:10 +0100)
commit	ffaec4ca8c4c6fd05b195879ccd65acf2fd5a6ac
tree	28d4a68d5b41d5ccd769208856d0e3b4f086ebe5	tree \| snapshot
parent	91fb8f1b59cce50de914d66dac1d406655c3c43b	commit \| diff

Add a way to merge pages by language

As an example:

```html
{{ $pages := .Site.RegularPages | lang.Merge $frSite.RegularPages | lang.Merge $enSite.RegularPages }}
```

Will "fill in the gaps" in the current site with, from left to right, content from the French site, and lastly the English.

Fixes #4463

13 files changed:

hugolib/hugo_sites_build.go		diff \| blob \| history
hugolib/hugo_sites_build_test.go		diff \| blob \| history
hugolib/page.go		diff \| blob \| history
hugolib/pageCache.go		diff \| blob \| history
hugolib/pageCache_test.go		diff \| blob \| history
hugolib/pageSort.go		diff \| blob \| history
hugolib/pages_language_merge.go	[new file with mode: 0644]	blob
hugolib/pages_language_merge_test.go	[new file with mode: 0644]	blob
hugolib/shortcode_test.go		diff \| blob \| history
hugolib/site.go		diff \| blob \| history
hugolib/site_test.go		diff \| blob \| history
hugolib/testhelpers_test.go		diff \| blob \| history
tpl/lang/lang.go		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom