From 92e86702eab5d68cd4eda87069fba906139f5c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 7 Jul 2023 18:41:10 +0200 Subject: Fix defaultContentLanguageInSubdir with only 1 language Fixes #10064 --- config/allconfig/configlanguage.go | 10 ++++++++++ config/configProvider.go | 1 + 2 files changed, 11 insertions(+) (limited to 'config') diff --git a/config/allconfig/configlanguage.go b/config/allconfig/configlanguage.go index be549126b..534276c25 100644 --- a/config/allconfig/configlanguage.go +++ b/config/allconfig/configlanguage.go @@ -41,6 +41,16 @@ func (c ConfigLanguage) LanguagesDefaultFirst() langs.Languages { return c.m.LanguagesDefaultFirst } +func (c ConfigLanguage) LanguagePrefix() string { + if c.DefaultContentLanguageInSubdir() && c.DefaultContentLanguage() == c.Language().Lang { + return c.Language().Lang + } + if !c.IsMultiLingual() || c.DefaultContentLanguage() == c.Language().Lang { + return "" + } + return c.Language().Lang +} + func (c ConfigLanguage) BaseURL() urls.BaseURL { return c.config.C.BaseURL } diff --git a/config/configProvider.go b/config/configProvider.go index 5d6acce9f..946830056 100644 --- a/config/configProvider.go +++ b/config/configProvider.go @@ -27,6 +27,7 @@ type AllProvider interface { Language() *langs.Language Languages() langs.Languages LanguagesDefaultFirst() langs.Languages + LanguagePrefix() string BaseURL() urls.BaseURL BaseURLLiveReload() urls.BaseURL Environment() string -- cgit v1.2.3