Skip to content

Commit edeebf0

Browse files
authored
config: Fix cascade per language in hugo.toml regression
An onfurtunate side effect of the fix in v0.153.4. Fixes #14321
1 parent ea9675f commit edeebf0

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

‎config/allconfig/allconfig.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -915,10 +915,9 @@ func (c *Configs) Init(logger loggers.Logger) error {
915915
// avoid initializing the same config more than once.
916916
for i, l := range c.Languages {
917917
langConfig := c.LanguageConfigMap[l.Lang]
918-
sitesMatrix := sitesmatrix.NewIntSetsBuilder(c.ConfiguredDimensions).WithLanguageIndices(i).WithAllIfNotSet().Build()
919918
for _, s := range allDecoderSetups {
920919
if getInitializer := s.getInitializer; getInitializer != nil {
921-
if err := getInitializer(langConfig).InitConfig(logger, sitesMatrix, c.ConfiguredDimensions); err != nil {
920+
if err := getInitializer(langConfig).InitConfig(logger, nil, c.ConfiguredDimensions); err != nil {
922921
return err
923922
}
924923
}

‎hugolib/cascade_test.go‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -367,20 +367,26 @@ Resource: {{ .Name }}|p1: {{ .Params.p1 }}|
367367
}
368368

369369
// Issue 14310
370+
// Issue 14321
370371
func TestCascadeIssue14310(t *testing.T) {
371372
t.Parallel()
372373

373374
files := `
374375
-- hugo.toml --
375-
disableKinds = ['home','rss','sitemap','taxonomy','term']
376+
disableKinds = ['home', 'rss', 'sitemap', 'taxonomy', 'term']
376377
defaultContentLanguage = 'en'
377378
defaultContentLanguageInSubdir = true
378379
[languages.en]
379-
weight = 1
380+
weight = 1
380381
[languages.de]
381-
weight = 2
382+
weight = 2
383+
[[cascade]]
384+
[cascade.params]
385+
size = 'medium'
386+
[cascade.target]
387+
kind = 'page'
382388
-- layouts/all.html --
383-
{{ .Params.color }}
389+
|color: {{ .Params.color }}|size: {{ .Params.size }}|
384390
-- content/s1/_index.de.md --
385391
---
386392
title: s1 (de)
@@ -407,6 +413,6 @@ title: p1 (en)
407413

408414
b := Test(t, files)
409415

410-
b.AssertFileContent("public/en/s1/p1/index.html", "red (en)")
411-
b.AssertFileContent("public/de/s1/p1/index.html", "red (de)") // fails: file contains "red (en)"
416+
b.AssertFileContent("public/en/s1/p1/index.html", "|color: red (en)|size: medium|") // fails: file contains "|color: red (en)|size: |"
417+
b.AssertFileContent("public/de/s1/p1/index.html", "|color: red (de)|size: medium|")
412418
}

0 commit comments

Comments
 (0)