diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2023-07-07 18:41:10 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2023-07-08 16:08:46 +0200 |
commit | 92e86702eab5d68cd4eda87069fba906139f5c08 (patch) | |
tree | 6edb31f509cb321b3ab9d038bfd6d50ea07f6fac /hugolib/paths | |
parent | 6c9ea022a9022a281031eed75ceb00c4c03f2b5a (diff) |
Fix defaultContentLanguageInSubdir with only 1 language
Fixes #10064
Diffstat (limited to 'hugolib/paths')
-rw-r--r-- | hugolib/paths/paths.go | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/hugolib/paths/paths.go b/hugolib/paths/paths.go index 9e15d3ab4..b0d9e3c1b 100644 --- a/hugolib/paths/paths.go +++ b/hugolib/paths/paths.go @@ -102,6 +102,7 @@ func (p *Paths) Lang() string { return p.Cfg.Language().Lang } +// TODO1 check this. func (p *Paths) GetTargetLanguageBasePath() string { if len(p.Cfg.Languages()) > 1 { // In a multihost configuration all assets will be published below the language code. @@ -110,41 +111,8 @@ func (p *Paths) GetTargetLanguageBasePath() string { return p.GetLanguagePrefix() } -func (p *Paths) GetURLLanguageBasePath() string { - if len(p.Cfg.Languages()) > 1 { - return "" - } - return p.GetLanguagePrefix() -} - func (p *Paths) GetLanguagePrefix() string { - if len(p.Cfg.Languages()) < 2 { - return "" - } - defaultLang := p.Cfg.DefaultContentLanguage() - defaultInSubDir := p.Cfg.DefaultContentLanguageInSubdir() - currentLang := p.Cfg.Language().Lang - if currentLang == "" || (currentLang == defaultLang && !defaultInSubDir) { - return "" - } - return currentLang -} - -// GetLangSubDir returns the given language's subdir if needed. -func (p *Paths) GetLangSubDir(lang string) string { - if len(p.Cfg.Languages()) < 2 { - return "" - } - - if p.Cfg.IsMultihost() { - return "" - } - - if lang == "" || (lang == p.Cfg.DefaultContentLanguage() && !p.Cfg.DefaultContentLanguageInSubdir()) { - return "" - } - - return lang + return p.Cfg.LanguagePrefix() } // AbsPathify creates an absolute path if given a relative path. If already |