diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-03-21 17:21:46 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-04-02 08:06:21 +0200 |
commit | eb42774e587816b1fbcafbcea59ed65df703882a (patch) | |
tree | fdb62cf17355b47fa485941f3c3fffd604896daa /source/dirs_test.go | |
parent | f27977809ce5d5dce4db41db6323a4ad1b095985 (diff) |
Add support for a content dir set per language
A sample config:
```toml
defaultContentLanguage = "en"
defaultContentLanguageInSubdir = true
[Languages]
[Languages.en]
weight = 10
title = "In English"
languageName = "English"
contentDir = "content/english"
[Languages.nn]
weight = 20
title = "På Norsk"
languageName = "Norsk"
contentDir = "content/norwegian"
```
The value of `contentDir` can be any valid path, even absolute path references. The only restriction is that the content dirs cannot overlap.
The content files will be assigned a language by
1. The placement: `content/norwegian/post/my-post.md` will be read as Norwegian content.
2. The filename: `content/english/post/my-post.nn.md` will be read as Norwegian even if it lives in the English content folder.
The content directories will be merged into a big virtual filesystem with one simple rule: The most specific language file will win.
This means that if both `content/norwegian/post/my-post.md` and `content/english/post/my-post.nn.md` exists, they will be considered duplicates and the version inside `content/norwegian` will win.
Note that translations will be automatically assigned by Hugo by the content file's relative placement, so `content/norwegian/post/my-post.md` will be a translation of `content/english/post/my-post.md`.
If this does not work for you, you can connect the translations together by setting a `translationKey` in the content files' front matter.
Fixes #4523
Fixes #4552
Fixes #4553
Diffstat (limited to 'source/dirs_test.go')
-rw-r--r-- | source/dirs_test.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/dirs_test.go b/source/dirs_test.go index f4650669c..46236120e 100644 --- a/source/dirs_test.go +++ b/source/dirs_test.go @@ -101,6 +101,8 @@ func TestStaticDirs(t *testing.T) { for i, test := range tests { msg := fmt.Sprintf("Test %d", i) v := viper.New() + v.Set("contentDir", "content") + fs := hugofs.NewMem(v) cfg := test.setup(v, fs) cfg.Set("workingDir", filepath.FromSlash("/work")) @@ -134,6 +136,7 @@ func TestStaticDirsFs(t *testing.T) { v.Set("workingDir", filepath.FromSlash("/work")) v.Set("theme", "mytheme") v.Set("themesDir", "themes") + v.Set("contentDir", "content") v.Set("staticDir", []string{"s1", "s2"}) v.Set("languagesSorted", helpers.Languages{helpers.NewDefaultLanguage(v)}) |