From 4d4c7791acce13e4ec4fcf2b8d763081dd52e219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Mon, 7 Nov 2016 21:16:55 +0100 Subject: [PATCH] hugolib: Must update PathSpec on SiteInfo per language --- hugolib/hugo_sites_test.go | 2 ++ hugolib/site.go | 1 + 2 files changed, 3 insertions(+) diff --git a/hugolib/hugo_sites_test.go b/hugolib/hugo_sites_test.go index 5a44fb5f9..bb92a42cf 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 1a6c50fce..b7f4c28c8 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) }