From: Bjørn Erik Pedersen Date: Mon, 7 Nov 2016 20:16:55 +0000 (+0100) Subject: hugolib: Must update PathSpec on SiteInfo per language X-Git-Tag: v0.18~134 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4d4c7791acce13e4ec4fcf2b8d763081dd52e219;p=brevno-suite%2Fhugo hugolib: Must update PathSpec on SiteInfo per language --- diff --git a/hugolib/hugo_sites_test.go b/hugolib/hugo_sites_test.go index 5a44fb5f..bb92a42c 100644 --- a/hugolib/hugo_sites_test.go +++ b/hugolib/hugo_sites_test.go @@ -78,6 +78,8 @@ func doTestMultiSitesMainLangInRoot(t *testing.T, defaultInSubDir bool) { require.Equal(t, "", frSite.Info.LanguagePrefix) } + require.Equal(t, "/blog/en/foo", enSite.Info.pathSpec.RelURL("foo", true)) + doc1en := enSite.Pages[0] doc1fr := frSite.Pages[0] diff --git a/hugolib/site.go b/hugolib/site.go index 1a6c50fc..b7f4c28c 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -823,6 +823,7 @@ func (s *Site) setCurrentLanguageConfig() error { viper.Set("currentContentLanguage", s.Language) // Cache the current config. helpers.InitConfigProviderForCurrentContentLanguage() + s.Info.pathSpec = helpers.CurrentPathSpec() return tpl.SetTranslateLang(s.Language) }