]> git.maquefel.me Git - brevno-suite/hugo/commitdiff
Restore language.disabled config
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sat, 8 Jul 2023 14:16:06 +0000 (16:16 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sat, 8 Jul 2023 14:51:48 +0000 (16:51 +0200)
Fixes #11219

config/allconfig/allconfig.go
hugolib/config_test.go
langs/config.go

index bab15501b7e70bb864ba8aaa5c3049673a9c0982..86a887155ed445f4555659cf804110915322db46 100644 (file)
@@ -274,6 +274,14 @@ func (c *Config) CompileConfig(logger loggers.Logger) error {
                }
                disabledLangs[lang] = true
        }
+       for lang, language := range c.Languages {
+               if language.Disabled {
+                       disabledLangs[lang] = true
+                       if lang == c.DefaultContentLanguage {
+                               return fmt.Errorf("cannot disable default content language %q", lang)
+                       }
+               }
+       }
 
        ignoredErrors := make(map[string]bool)
        for _, err := range c.IgnoreErrors {
index 567059e6834576e2fd33540cfb3c57f783c21990..cdac0fbab93dc89620512db7c67f0948ece3f3e2 100644 (file)
@@ -1384,3 +1384,30 @@ Home.
        })
 
 }
+
+func TestLanguagesDisabled(t *testing.T) {
+       t.Parallel()
+
+       files := `
+-- hugo.toml --
+[languages]
+[languages.en]
+title = "English Title"
+[languages.sv]
+title = "Swedish Title"
+disabled = true
+-- layouts/index.html --
+Home.
+
+       
+`
+       b := NewIntegrationTestBuilder(
+               IntegrationTestConfig{
+                       T:           t,
+                       TxtarString: files,
+               },
+       ).Build()
+
+       b.Assert(len(b.H.Sites), qt.Equals, 1)
+
+}
index f60ea94a4dd5f2eafdfe0034c50f1bbbf77d30c9..7cca0f5e7b2209e0e088b037489f3ccf6b2789ab 100644 (file)
@@ -39,6 +39,9 @@ type LanguageConfig struct {
        // The language weight. When set to a non-zero value, this will
        // be the main sort criteria for the language.
        Weight int
+
+       // Set to true to disable this language.
+       Disabled bool
 }
 
 func DecodeConfig(m map[string]any) (map[string]LanguageConfig, error) {