From 5bdda0bdbf5eca4064d395219d0797aaed24070f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sat, 17 Feb 2024 12:00:40 +0100
Subject: [PATCH] Don't use the same value in .Data.Term.Title as in .Title

Fixes #12041
---
 hugolib/content_map_test.go |  2 +-
 hugolib/page__data.go       |  2 +-
 hugolib/taxonomy_test.go    | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/hugolib/content_map_test.go b/hugolib/content_map_test.go
index c666e2a45..e043d9363 100644
--- a/hugolib/content_map_test.go
+++ b/hugolib/content_map_test.go
@@ -160,7 +160,7 @@ Draft5: {{ if (.Site.GetPage "blog/draftsection/sub/page") }}FOUND{{ end }}|
         Sections: /blog/|/docs/|/overlap/|/overlap2/|:END
 		Categories: /categories/funny/; Funny; 12|/categories/sad/; Sad; 2|:END
         Category Terms:  taxonomy: /categories/funny/; Funny; 12|/categories/sad/; Sad; 2|:END
-		Category Funny:  term; Funny: /blog/subsection/page4/;|/blog/page3/;|/blog/subsection/;|/blog/page2/;|/blog/page1/;|/blog/subsection/page5/;|/docs/page6/;|/blog/bundle/;|/blog/draftsection/page/;|/blog/draftsection/sub/;|/blog/draftsection/sub/page/;|/overlap2/;|:END
+		Category Funny:  term; funny: /blog/subsection/page4/;|/blog/page3/;|/blog/subsection/;|/blog/page2/;|/blog/page1/;|/blog/subsection/page5/;|/docs/page6/;|/blog/bundle/;|/blog/draftsection/page/;|/blog/draftsection/sub/;|/blog/draftsection/sub/page/;|/overlap2/;|:END
  		Pag Num Pages: 9
         Pag Blog Num Pages: 4
         Blog Num RegularPages: 4
diff --git a/hugolib/page__data.go b/hugolib/page__data.go
index 9712f1b4a..256d8a97f 100644
--- a/hugolib/page__data.go
+++ b/hugolib/page__data.go
@@ -44,7 +44,7 @@ func (p *pageData) Data() any {
 			p.data[name.singular] = term
 			p.data["Singular"] = name.singular
 			p.data["Plural"] = name.plural
-			p.data["Term"] = p.Title()
+			p.data["Term"] = p.m.term
 		case kinds.KindTaxonomy:
 			viewCfg := p.s.pageMap.cfg.getTaxonomyConfig(p.Path())
 			p.data["Singular"] = viewCfg.singular
diff --git a/hugolib/taxonomy_test.go b/hugolib/taxonomy_test.go
index ffcb8fb15..17e1b6cd4 100644
--- a/hugolib/taxonomy_test.go
+++ b/hugolib/taxonomy_test.go
@@ -815,3 +815,23 @@ Terms: {{ range site.Taxonomies.tags }}{{ .Page.Title }}: {{ .Count }}|{{ end }}
 
 	b.AssertFileContent("public/index.html", "Terms: A: 1|B: 1|C: 1|Hello World!: 1|$")
 }
+
+func TestTaxonomiesTermTitleAndTerm(t *testing.T) {
+	files := `
+-- hugo.toml --
+baseURL = "https://example.com"
+[taxonomies]
+tag = "tags"
+-- content/_index.md --
+---
+title: "Home"
+tags: ["hellO world"]
+---
+-- layouts/_default/term.html --
+{{ .Title }}|{{ .Kind }}|{{ .Data.Singular }}|{{ .Data.Plural }}|{{ .Page.Data.Term }}|
+`
+
+	b := Test(t, files)
+
+	b.AssertFileContent("public/tags/hello-world/index.html", "HellO World|term|tag|tags|hellO world|")
+}