diff options
author | Bjørn Erik Pedersen <[email protected]> | 2018-03-21 17:21:46 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <[email protected]> | 2018-04-02 08:06:21 +0200 |
commit | eb42774e587816b1fbcafbcea59ed65df703882a (patch) | |
tree | fdb62cf17355b47fa485941f3c3fffd604896daa /source/sourceSpec.go | |
parent | f27977809ce5d5dce4db41db6323a4ad1b095985 (diff) | |
download | hugo-eb42774e587816b1fbcafbcea59ed65df703882a.tar.gz hugo-eb42774e587816b1fbcafbcea59ed65df703882a.zip |
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/sourceSpec.go')
-rw-r--r-- | source/sourceSpec.go | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/source/sourceSpec.go b/source/sourceSpec.go index e40010162..634306e5f 100644 --- a/source/sourceSpec.go +++ b/source/sourceSpec.go @@ -18,17 +18,18 @@ import ( "path/filepath" "regexp" - "github.com/gohugoio/hugo/config" + "github.com/spf13/afero" + "github.com/gohugoio/hugo/helpers" - "github.com/gohugoio/hugo/hugofs" "github.com/spf13/cast" ) // SourceSpec abstracts language-specific file creation. // TODO(bep) rename to Spec type SourceSpec struct { - Cfg config.Provider - Fs *hugofs.Fs + *helpers.PathSpec + + Fs afero.Fs // This is set if the ignoreFiles config is set. ignoreFilesRe []*regexp.Regexp @@ -38,8 +39,9 @@ type SourceSpec struct { DisabledLanguages map[string]bool } -// NewSourceSpec initializes SourceSpec using languages from a given configuration. -func NewSourceSpec(cfg config.Provider, fs *hugofs.Fs) *SourceSpec { +// NewSourceSpec initializes SourceSpec using languages the given filesystem and PathSpec. +func NewSourceSpec(ps *helpers.PathSpec, fs afero.Fs) *SourceSpec { + cfg := ps.Cfg defaultLang := cfg.GetString("defaultContentLanguage") languages := cfg.GetStringMap("languages") @@ -69,10 +71,17 @@ func NewSourceSpec(cfg config.Provider, fs *hugofs.Fs) *SourceSpec { } } - return &SourceSpec{ignoreFilesRe: regexps, Cfg: cfg, Fs: fs, Languages: languages, DefaultContentLanguage: defaultLang, DisabledLanguages: disabledLangsSet} + return &SourceSpec{ignoreFilesRe: regexps, PathSpec: ps, Fs: fs, Languages: languages, DefaultContentLanguage: defaultLang, DisabledLanguages: disabledLangsSet} } func (s *SourceSpec) IgnoreFile(filename string) bool { + if filename == "" { + if _, ok := s.Fs.(*afero.OsFs); ok { + return true + } + return false + } + base := filepath.Base(filename) if len(base) > 0 { @@ -99,7 +108,7 @@ func (s *SourceSpec) IgnoreFile(filename string) bool { } func (s *SourceSpec) IsRegularSourceFile(filename string) (bool, error) { - fi, err := helpers.LstatIfOs(s.Fs.Source, filename) + fi, err := helpers.LstatIfPossible(s.Fs, filename) if err != nil { return false, err } @@ -110,7 +119,7 @@ func (s *SourceSpec) IsRegularSourceFile(filename string) (bool, error) { if fi.Mode()&os.ModeSymlink == os.ModeSymlink { link, err := filepath.EvalSymlinks(filename) - fi, err = helpers.LstatIfOs(s.Fs.Source, link) + fi, err = helpers.LstatIfPossible(s.Fs, link) if err != nil { return false, err } |