diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-08-07 22:01:55 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-09-06 18:32:18 +0300 |
commit | 54141f71dd0ffbd2af326581b78ecafe7f054f51 (patch) | |
tree | a814b50027d9c9a439aa43eeb734f97e189ed968 /hugolib/site_test.go | |
parent | 2079a23dd89734cea39e523faf46e44201151279 (diff) |
Improve language handling in URLs
The current "rendering language" is needed outside of Site. This commit moves the Language type to the helpers package, and then used to get correct correct language configuration in the markdownify template func.
This commit also adds two new template funcs: relLangURL and absLangURL.
See #2309
Diffstat (limited to 'hugolib/site_test.go')
-rw-r--r-- | hugolib/site_test.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/hugolib/site_test.go b/hugolib/site_test.go index f98bc6a7d..b93e08aca 100644 --- a/hugolib/site_test.go +++ b/hugolib/site_test.go @@ -128,7 +128,7 @@ func TestDraftAndFutureRender(t *testing.T) { siteSetup := func(t *testing.T) *Site { s := &Site{ Source: &source.InMemorySource{ByteSource: sources}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } if err := buildSiteSkipRender(s); err != nil { @@ -186,7 +186,7 @@ func TestFutureExpirationRender(t *testing.T) { siteSetup := func(t *testing.T) *Site { s := &Site{ Source: &source.InMemorySource{ByteSource: sources}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } if err := buildSiteSkipRender(s); err != nil { @@ -280,7 +280,7 @@ THE END.`, refShortcode)), s := &Site{ Source: &source.InMemorySource{ByteSource: sources}, targets: targetList{page: &target.PagePub{UglyURLs: uglyURLs}}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } if err := buildAndRenderSite(s, "_default/single.html", "{{.Content}}"); err != nil { @@ -348,7 +348,7 @@ func doTestShouldAlwaysHaveUglyURLs(t *testing.T, uglyURLs bool) { s := &Site{ Source: &source.InMemorySource{ByteSource: sources}, targets: targetList{page: &target.PagePub{UglyURLs: uglyURLs, PublishDir: "public"}}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } if err := buildAndRenderSite(s, @@ -438,7 +438,7 @@ func doTestSectionNaming(t *testing.T, canonify, uglify, pluralize bool) { s := &Site{ Source: &source.InMemorySource{ByteSource: sources}, targets: targetList{page: &target.PagePub{UglyURLs: uglify}}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } if err := buildAndRenderSite(s, @@ -500,7 +500,7 @@ func TestSkipRender(t *testing.T) { s := &Site{ Source: &source.InMemorySource{ByteSource: sources}, targets: targetList{page: &target.PagePub{UglyURLs: true}}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } if err := buildAndRenderSite(s, @@ -555,7 +555,7 @@ func TestAbsURLify(t *testing.T) { s := &Site{ Source: &source.InMemorySource{ByteSource: sources}, targets: targetList{page: &target.PagePub{UglyURLs: true}}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } t.Logf("Rendering with BaseURL %q and CanonifyURLs set %v", viper.GetString("baseURL"), canonify) @@ -649,7 +649,7 @@ func TestOrderedPages(t *testing.T) { viper.Set("baseurl", "http://auth/bub") s := &Site{ Source: &source.InMemorySource{ByteSource: weightedSources}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } if err := buildSiteSkipRender(s); err != nil { @@ -718,7 +718,7 @@ func TestGroupedPages(t *testing.T) { viper.Set("baseurl", "http://auth/bub") s := &Site{ Source: &source.InMemorySource{ByteSource: groupedSources}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } if err := buildSiteSkipRender(s); err != nil { @@ -903,7 +903,7 @@ func TestWeightedTaxonomies(t *testing.T) { viper.Set("taxonomies", taxonomies) s := &Site{ Source: &source.InMemorySource{ByteSource: sources}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } if err := buildSiteSkipRender(s); err != nil { @@ -972,7 +972,7 @@ func setupLinkingMockSite(t *testing.T) *Site { site := &Site{ Source: &source.InMemorySource{ByteSource: sources}, - Language: newDefaultLanguage(), + Language: helpers.NewDefaultLanguage(), } if err := buildSiteSkipRender(site); err != nil { |