mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
Make resources fetched via resources.Get and similar language agnostic
With the newly released Hugo Pipes, resources fetched and processed via `resources.Get` and similar was published to the relevant language sub folder when in multilingual mode. The thought behind that was maximum flexibility with support for `assetDir` per language. In practice this was a bad idea: * You get duplication of identical content, with added processing time * You end up with path issues that seem to be hard to find a way around (`@fa-font-path` is one example) This commit changes that. Now there is only one `assetDir` and if you, as one example, need to generate a CSS per langugage, you need to set the paths yourself. Fixes #5017
This commit is contained in:
parent
88e447c449
commit
6b02f5c0f4
3 changed files with 6 additions and 8 deletions
4
deps/deps.go
vendored
4
deps/deps.go
vendored
|
@ -221,10 +221,14 @@ func (d Deps) ForLanguage(cfg DepsCfg) (*Deps, error) {
|
|||
return nil, err
|
||||
}
|
||||
|
||||
// The resource cache is global so reuse.
|
||||
// TODO(bep) clean up these inits.
|
||||
resourceCache := d.ResourceSpec.ResourceCache
|
||||
d.ResourceSpec, err = resource.NewSpec(d.PathSpec, d.Log, cfg.MediaTypes)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
d.ResourceSpec.ResourceCache = resourceCache
|
||||
|
||||
d.Cfg = l
|
||||
d.Language = l
|
||||
|
|
|
@ -33,6 +33,8 @@ var globalOnlySettings = map[string]bool{
|
|||
strings.ToLower("defaultContentLanguageInSubdir"): true,
|
||||
strings.ToLower("defaultContentLanguage"): true,
|
||||
strings.ToLower("multilingual"): true,
|
||||
strings.ToLower("assetDir"): true,
|
||||
strings.ToLower("resourceDir"): true,
|
||||
}
|
||||
|
||||
// Language manages specific-language configuration.
|
||||
|
|
|
@ -366,14 +366,6 @@ func (r *Spec) newResourceForFs(sourceFs afero.Fs, fd ResourceSourceDescriptor)
|
|||
}
|
||||
}
|
||||
|
||||
if fd.URLBase == "" {
|
||||
fd.URLBase = r.GetURLLanguageBasePath()
|
||||
}
|
||||
|
||||
if fd.TargetPathBase == "" {
|
||||
fd.TargetPathBase = r.GetTargetLanguageBasePath()
|
||||
}
|
||||
|
||||
if fd.RelTargetFilename == "" {
|
||||
fd.RelTargetFilename = fd.Filename()
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue