From 3eb313fef495a39731dafa6bddbf77760090230d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Tue, 17 Jul 2018 11:18:29 +0200 Subject: Simplify .Site.GetPage etc. This commit is a follow up to a recent overhaul of the GetPage/ref/relref implemenation. The most important change in this commit is the update to `.Site.GetPage`: * To reduce the amount of breakage in the wild to its minimum, I have reworked .Site.GetPage with some rules: * We cannot support more than 2 arguments, i.e. .Site.GetPage "page" "posts" "mypage.md" will now throw an error. I think this is the most uncommon syntax and should be OK. It is an easy fix to change the above to .Site.GetPage "/posts/mypage.md" or similar. * .Site.GetPage "home", .Site.GetPage "home" "" and .Site.GetPage "home" "/" will give you the home page. This means that if you have page in root with the name home.md you need to do .Site.GetPage "/home.md" or similar This commit also fixes some multilingual issues, most notable it is now possible to do cross-language ref/relref lookups by prepending the language code to the path, e.g. `/jp/posts/mypage.md`. This commit also reverts the site building tests related to this to "Hugo 0.44 state", to get better control of the changes made. Closes #4147 Closes #4727 Closes #4728 Closes #4728 Closes #4726 Closes #4652 --- hugolib/taxonomy_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'hugolib/taxonomy_test.go') diff --git a/hugolib/taxonomy_test.go b/hugolib/taxonomy_test.go index 828f0c410..0445de58f 100644 --- a/hugolib/taxonomy_test.go +++ b/hugolib/taxonomy_test.go @@ -167,7 +167,7 @@ permalinkeds: } for taxonomy, count := range taxonomyTermPageCounts { - term, _ := s.getPage(nil, taxonomy) + term := s.getPage(KindTaxonomyTerm, taxonomy) require.NotNil(t, term) require.Len(t, term.Pages, count) @@ -176,7 +176,7 @@ permalinkeds: } } - cat1, _ := s.getPage(nil, "categories/cat1") + cat1 := s.getPage(KindTaxonomy, "categories", "cat1") require.NotNil(t, cat1) if uglyURLs { require.Equal(t, "/blog/categories/cat1.html", cat1.RelPermalink()) @@ -184,8 +184,8 @@ permalinkeds: require.Equal(t, "/blog/categories/cat1/", cat1.RelPermalink()) } - pl1, _ := s.getPage(nil, "permalinkeds/pl1") - permalinkeds, _ := s.getPage(nil, "permalinkeds") + pl1 := s.getPage(KindTaxonomy, "permalinkeds", "pl1") + permalinkeds := s.getPage(KindTaxonomyTerm, "permalinkeds") require.NotNil(t, pl1) require.NotNil(t, permalinkeds) if uglyURLs { @@ -198,11 +198,11 @@ permalinkeds: // Issue #3070 preserveTaxonomyNames if preserveTaxonomyNames { - helloWorld, _ := s.getPage(nil, "others/Hello Hugo world") + helloWorld := s.getPage(KindTaxonomy, "others", "Hello Hugo world") require.NotNil(t, helloWorld) require.Equal(t, "Hello Hugo world", helloWorld.title) } else { - helloWorld, _ := s.getPage(nil, "others/hello-hugo-world") + helloWorld := s.getPage(KindTaxonomy, "others", "hello-hugo-world") require.NotNil(t, helloWorld) require.Equal(t, "Hello Hugo World", helloWorld.title) } -- cgit v1.2.3