From a481942532c9e9acd841f566291d17db4858cea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sat, 8 Jul 2023 16:16:06 +0200 Subject: [PATCH] Restore language.disabled config Fixes #11219 --- config/allconfig/allconfig.go | 8 ++++++++ hugolib/config_test.go | 27 +++++++++++++++++++++++++++ langs/config.go | 3 +++ 3 files changed, 38 insertions(+) diff --git a/config/allconfig/allconfig.go b/config/allconfig/allconfig.go index bab15501b7e..86a887155ed 100644 --- a/config/allconfig/allconfig.go +++ b/config/allconfig/allconfig.go @@ -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 { diff --git a/hugolib/config_test.go b/hugolib/config_test.go index 567059e6834..cdac0fbab93 100644 --- a/hugolib/config_test.go +++ b/hugolib/config_test.go @@ -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) + +} diff --git a/langs/config.go b/langs/config.go index f60ea94a4dd..7cca0f5e7b2 100644 --- a/langs/config.go +++ b/langs/config.go @@ -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) {