diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2018-07-31 20:04:36 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2018-07-31 23:33:04 +0200 |
| commit | 6b02f5c0f4e0ba1730aebc5a590a111548233bd5 (patch) | |
| tree | 13eda738080f73db33040eeb2b7103c552434a29 /deps | |
| parent | 88e447c449608523d87c517396bde31a62f392b6 (diff) | |
| download | hugo-6b02f5c0f4e0ba1730aebc5a590a111548233bd5.tar.gz hugo-6b02f5c0f4e0ba1730aebc5a590a111548233bd5.zip | |
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
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/deps.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/deps/deps.go b/deps/deps.go index 5a97ec7f2..a0904483b 100644 --- a/deps/deps.go +++ b/deps/deps.go @@ -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 |