mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-26 22:04:32 +02:00
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
This commit is contained in:
25
tpl/os/os.go
25
tpl/os/os.go
@@ -25,14 +25,29 @@ import (
|
||||
|
||||
// New returns a new instance of the os-namespaced template functions.
|
||||
func New(deps *deps.Deps) *Namespace {
|
||||
|
||||
// Since Hugo 0.38 we can have multiple content dirs. This can make it hard to
|
||||
// reason about where the file is placed relative to the project root.
|
||||
// To make the {{ readFile .Filename }} variant just work, we create a composite
|
||||
// filesystem that first checks the work dir fs and then the content fs.
|
||||
var rfs afero.Fs
|
||||
if deps.Fs != nil {
|
||||
rfs = deps.Fs.WorkingDir
|
||||
if deps.PathSpec != nil && deps.PathSpec.BaseFs != nil {
|
||||
rfs = afero.NewReadOnlyFs(afero.NewCopyOnWriteFs(deps.PathSpec.BaseFs.ContentFs, deps.Fs.WorkingDir))
|
||||
}
|
||||
}
|
||||
|
||||
return &Namespace{
|
||||
deps: deps,
|
||||
readFileFs: rfs,
|
||||
deps: deps,
|
||||
}
|
||||
}
|
||||
|
||||
// Namespace provides template functions for the "os" namespace.
|
||||
type Namespace struct {
|
||||
deps *deps.Deps
|
||||
readFileFs afero.Fs
|
||||
deps *deps.Deps
|
||||
}
|
||||
|
||||
// Getenv retrieves the value of the environment variable named by the key.
|
||||
@@ -46,10 +61,10 @@ func (ns *Namespace) Getenv(key interface{}) (string, error) {
|
||||
return _os.Getenv(skey), nil
|
||||
}
|
||||
|
||||
// readFile reads the file named by filename relative to the given basepath
|
||||
// readFile reads the file named by filename in the given filesystem
|
||||
// and returns the contents as a string.
|
||||
// There is a upper size limit set at 1 megabytes.
|
||||
func readFile(fs *afero.BasePathFs, filename string) (string, error) {
|
||||
func readFile(fs afero.Fs, filename string) (string, error) {
|
||||
if filename == "" {
|
||||
return "", errors.New("readFile needs a filename")
|
||||
}
|
||||
@@ -79,7 +94,7 @@ func (ns *Namespace) ReadFile(i interface{}) (string, error) {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return readFile(ns.deps.Fs.WorkingDir, s)
|
||||
return readFile(ns.readFileFs, s)
|
||||
}
|
||||
|
||||
// ReadDir lists the directory contents relative to the configured WorkingDir.
|
||||
|
Reference in New Issue
Block a user