hugolib: Fix IsTranslated for "old" node types

The new logic for creating Page objects from old node types
didn't include itself in the translation logic, so
`IsTranslated` returned falsely false for sites with only two languages.

The `AllTranslations` method also returned too few pages in that case.

This commit fixes that.

Fixes #2812

diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index 452bdca2c3a83af3f91ee8d11e4ba669db50c35a..7b42a0f5aa3ff68f8aeb3a180c02994741e91e7b 100644 (file)
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -180,7 +180,7 @@ func (h *HugoSites) assignMissingTranslations() error {
                // Assign translations
                for _, t1 := range nodes {
                        for _, t2 := range nodes {
-                               if t2.isNewTranslation(t1) {
+                               if t1.isNewTranslation(t2) {
                                        t1.translations = append(t1.translations, t2)
                                }
                        }

diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go
index 242774a9b09f8149a3e29883bb403dc4e9b45e3d..8624a02c8c864fa804f80fe3ccd42e7d54ff8817 100644 (file)
--- a/hugolib/hugo_sites_build_test.go
+++ b/hugolib/hugo_sites_build_test.go
@@ -186,6 +186,49 @@ func assertFileContentRegexp(t *testing.T, filename string, defaultInSubDir bool
        }
 }
 
+func TestMultiSitesWithTwoLanguages(t *testing.T) {
+       testCommonResetState()
+
+       viper.Set("defaultContentLanguage", "nn")
+
+       writeSource(t, "config.toml", `
+[languages]
+[languages.nn]
+languageName = "Nynorsk"
+weight = 1
+title = "Tittel på Nynorsk"
+
+[languages.en]
+title = "Title in English"
+languageName = "English"
+weight = 2
+`,
+       )
+
+       if err := LoadGlobalConfig("", "config.toml"); err != nil {
+               t.Fatalf("Failed to load config: %s", err)
+       }
+
+       // Add some data
+       writeSource(t, "data/hugo.toml", "slogan = \"Hugo Rocks!\"")
+
+       sites, err := NewHugoSitesFromConfiguration()
+
+       if err != nil {
+               t.Fatalf("Failed to create sites: %s", err)
+       }
+
+       require.NoError(t, sites.Build(BuildCfg{}))
+       require.Len(t, sites.Sites, 2)
+
+       nnSite := sites.Sites[0]
+       nnSiteHome := nnSite.getPage(KindHome)
+       require.Len(t, nnSiteHome.AllTranslations(), 2)
+       require.Len(t, nnSiteHome.Translations(), 1)
+       require.True(t, nnSiteHome.IsTranslated())
+
+}
+
 //
 func TestMultiSitesBuild(t *testing.T) {
        for _, config := range []struct {

diff --git a/hugolib/page.go b/hugolib/page.go
index 06daf97bc3cdffcc0ebc403a6c07391d4f56b50c..a9d90c121dd18b153f267f73ade9f388d205e340 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -1626,7 +1626,8 @@ func (p *Page) Lang() string {
 }
 
 func (p *Page) isNewTranslation(candidate *Page) bool {
-       if p == candidate || p.Kind != candidate.Kind {
+
+       if p.Kind != candidate.Kind {
                return false
        }
 
@@ -1634,10 +1635,6 @@ func (p *Page) isNewTranslation(candidate *Page) bool {
                panic("Node type not currently supported for this op")
        }
 
-       if p.language.Lang == candidate.language.Lang {
-               return false
-       }
-
        // At this point, we know that this is a traditional Node (home page, section, taxonomy)
        // It represents the same node, but different language, if the sections is the same.
        if len(p.sections) != len(candidate.sections) {
@@ -1651,8 +1648,8 @@ func (p *Page) isNewTranslation(candidate *Page) bool {
        }
 
        // Finally check that it is not already added.
-       for _, translation := range candidate.translations {
-               if p == translation {
+       for _, translation := range p.translations {
+               if candidate == translation {
                        return false
                }
        }