From 34b8804977b321d0e139ff090e0e6e532b0b8a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Weber?= <mail@soeren-weber.de>
Date: Fri, 3 Nov 2023 22:50:02 +0100
Subject: [PATCH] taxonomy: lookup title from overridden taxonomy page #712

---
 exampleSite/content/tags/_index.en.md  |  8 ++++++++
 exampleSite/content/tags/_index.pir.md |  5 +++++
 layouts/_default/index.json            | 11 +++--------
 layouts/_default/index.search.js       | 11 +++--------
 layouts/_default/taxonomy.html         |  5 +----
 layouts/_default/term.html             |  6 ++----
 layouts/partials/breadcrumbs.html      | 11 +++--------
 layouts/partials/header.html           | 11 +++--------
 layouts/partials/opengraph.html        | 22 ++++++----------------
 layouts/partials/term-list.html        |  3 ++-
 layouts/partials/twitter_cards.html    | 11 +++--------
 11 files changed, 39 insertions(+), 65 deletions(-)
 create mode 100644 exampleSite/content/tags/_index.en.md
 create mode 100644 exampleSite/content/tags/_index.pir.md

diff --git a/exampleSite/content/tags/_index.en.md b/exampleSite/content/tags/_index.en.md
new file mode 100644
index 00000000000..7f878e278ab
--- /dev/null
+++ b/exampleSite/content/tags/_index.en.md
@@ -0,0 +1,8 @@
++++
++++
+
+You can define optional content in your overridden taxonomy page. Aswell you can define optional `title` and `singulartitle` that will override the values from your `config.toml` or of your translation files.
+
+## Just an example heading
+
+The TOC will contain this heading and the index headings below.
\ No newline at end of file
diff --git a/exampleSite/content/tags/_index.pir.md b/exampleSite/content/tags/_index.pir.md
new file mode 100644
index 00000000000..c8236e790d4
--- /dev/null
+++ b/exampleSite/content/tags/_index.pir.md
@@ -0,0 +1,5 @@
++++
+title = "Tag-a-taggs"
+singulartitle = "Tagga"
++++
+{{< piratify >}}
\ No newline at end of file
diff --git a/layouts/_default/index.json b/layouts/_default/index.json
index 3e401ff788a..c4d663a17b5 100644
--- a/layouts/_default/index.json
+++ b/layouts/_default/index.json
@@ -4,15 +4,10 @@
   {{- if and .Title .RelPermalink (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableSearchHiddenPages true) ) }}
     {{- $title := .Title }}
     {{- if eq .Kind "taxonomy" }}
-      {{- $title = i18n .Data.Plural }}
-      {{- if not $title }}
-        {{- $title = .Data.Plural }}
-      {{- end }}
+      {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }}
     {{- else if eq .Kind "term" }}
-      {{- $title = i18n .Data.Singular }}
-      {{- if not $title }}
-        {{- $title = .Data.Singular }}
-      {{- end }}
+      {{- $taxonomy_page := .Site.GetPage .Data.Plural }}
+      {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }}
       {{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) (default .Data.Term .Title) }}
     {{- end }}
     {{- $pages = $pages | append (dict
diff --git a/layouts/_default/index.search.js b/layouts/_default/index.search.js
index a542caceb3e..a8dac2e8b38 100644
--- a/layouts/_default/index.search.js
+++ b/layouts/_default/index.search.js
@@ -4,15 +4,10 @@
   {{- if and .Title .RelPermalink (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableSearchHiddenPages true) ) }}
     {{- $title := .Title }}
     {{- if eq .Kind "taxonomy" }}
-      {{- $title = i18n .Data.Plural }}
-      {{- if not $title }}
-        {{- $title = .Data.Plural }}
-      {{- end }}
+      {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }}
     {{- else if eq .Kind "term" }}
-      {{- $title = i18n .Data.Singular }}
-      {{- if not $title }}
-        {{- $title = .Data.Singular }}
-      {{- end }}
+      {{- $taxonomy_page := .Site.GetPage .Data.Plural }}
+      {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }}
       {{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) (default .Data.Term .Title) }}
     {{- end }}
     {{- $pages = $pages | append (dict
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index b0895b4df13..cd8c849f8ec 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -5,10 +5,7 @@
             </header>
 {{- $page := . }}
 
-{{- $title := i18n .Data.Plural }}
-{{- if not $title }}
-  {{- $title = .Data.Plural }}
-{{- end }}
+{{- $title := default (default .Data.Plural (i18n .Data.Plural)) .Title }}
 <h1 id="{{ $title | plainify | anchorize }}">{{ $title }}</h1>
 {{- $lastCapital := "" }}
 {{- $terms := slice }}
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
index 6c03f60156a..60a4d327c6d 100644
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -5,10 +5,8 @@
             </header>
 {{- $page := . }}
 
-{{- $title := i18n .Data.Singular }}
-{{- if not $title }}
-  {{- $title = .Data.Singular }}
-{{- end }}
+{{- $taxonomy_page := .Site.GetPage .Data.Plural }}
+{{- $title := default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }}
 {{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) (default .Data.Term .Title) }}
 <h1 id="{{ $title | plainify | anchorize }}">{{ $title }}</h1>
 {{- .Content }}
diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html
index 34a18bfa8b8..b088c8d5561 100644
--- a/layouts/partials/breadcrumbs.html
+++ b/layouts/partials/breadcrumbs.html
@@ -33,15 +33,10 @@
   {{- $depth = add $depth 1 }}
   {{- $title := $to.Title }}
   {{- if eq $to.Kind "taxonomy" }}
-    {{- $title = i18n $to.Data.Plural }}
-    {{- if not $title }}
-      {{- $title = $to.Data.Plural }}
-    {{- end }}
+    {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }}
   {{- else if eq $to.Kind "term" }}
-    {{- $title = i18n $to.Data.Singular }}
-    {{- if not $title }}
-      {{- $title = $to.Data.Singular }}
-    {{- end }}
+    {{- $taxonomy_page := .Site.GetPage .Data.Plural }}
+    {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }}
     {{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) (default $to.Data.Term $to.Title) }}
   {{- end }}
   {{- if not $title }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 3f01ddc607a..1124851157d 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -14,15 +14,10 @@
     {{- if eq $outputFormat "searchpage" }}
       {{- $title = T "Search" }}
     {{- else if eq .Kind "taxonomy" }}
-      {{- $title = i18n .Data.Plural }}
-      {{- if not $title }}
-        {{- $title = .Data.Plural }}
-      {{- end }}
+      {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }}
     {{- else if eq .Kind "term" }}
-      {{- $title = i18n .Data.Singular }}
-      {{- if not $title }}
-        {{- $title = .Data.Singular }}
-      {{- end }}
+      {{- $taxonomy_page := .Site.GetPage .Data.Plural }}
+      {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }}
       {{- $title = printf "%s %s %s" (default .Data.Term .Title) (default "::" .Site.Params.titleSeparator) $title }}
     {{- end }}
     {{- if and $title .Site.Title (not (eq $title .Site.Title)) }}
diff --git a/layouts/partials/opengraph.html b/layouts/partials/opengraph.html
index 9fd7b3e01b9..5906747fd7f 100644
--- a/layouts/partials/opengraph.html
+++ b/layouts/partials/opengraph.html
@@ -10,15 +10,10 @@
 {{- if eq $outputFormat "searchpage" }}
     {{- $title = T "Search" }}
 {{- else if eq .Kind "taxonomy" }}
-    {{- $title = i18n .Data.Plural }}
-    {{- if not $title }}
-        {{- $title = .Data.Plural }}
-    {{- end }}
+    {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }}
 {{- else if eq .Kind "term" }}
-    {{- $title = i18n .Data.Singular }}
-    {{- if not $title }}
-        {{- $title = .Data.Singular }}
-    {{- end }}
+    {{- $taxonomy_page := .Site.GetPage .Data.Plural }}
+    {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }}
     {{- $title = printf "%s %s %s" (default .Data.Term .Title) (default "::" .Site.Params.titleSeparator) $title }}
 {{- end }}
 {{- if and $title .Site.Title (not (eq $title .Site.Title)) }}
@@ -55,15 +50,10 @@
         {{- if eq $outputFormat "searchpage" }}
             {{- $title = T "Search" }}
         {{- else if eq .Kind "taxonomy" }}
-            {{- $title = i18n .Data.Plural }}
-            {{- if not $title }}
-                {{- $title = .Data.Plural }}
-            {{- end }}
+            {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }}
         {{- else if eq .Kind "term" }}
-            {{- $title = i18n .Data.Singular }}
-            {{- if not $title }}
-                {{- $title = .Data.Singular }}
-            {{- end }}
+            {{- $taxonomy_page := .Site.GetPage .Data.Plural }}
+            {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }}
             {{- $title = printf "%s %s %s" (default .Data.Term .Title) (default "::" .Site.Params.titleSeparator) $title }}
         {{- end }}
         {{- if and $title .Site.Title (not (eq $title .Site.Title)) }}
diff --git a/layouts/partials/term-list.html b/layouts/partials/term-list.html
index ca32835fa2e..4214f165187 100644
--- a/layouts/partials/term-list.html
+++ b/layouts/partials/term-list.html
@@ -29,8 +29,9 @@
     {{- end }}
   {{- end }}
 {{- end }}
+{{- $taxonomy_title := default (default $taxonomy_page.Data.Plural (i18n $taxonomy_page.Data.Plural)) $taxonomy_page.Title }}
 {{- with $term_pages }}
-<div class=" taxonomy-{{ $taxonomy }} term-list cstyle {{ $style }} {{ $class }}" title="{{ $taxonomy_page.Title }}"{{ if $color }}{{ printf " style=\"--VARIABLE-TAGS-BG-color: %s;\"" $color | safeHTMLAttr }}{{ end }}>
+<div class=" taxonomy-{{ $taxonomy }} term-list cstyle {{ $style }} {{ $class }}" title="{{ $taxonomy_title }}"{{ if $color }}{{ printf " style=\"--VARIABLE-TAGS-BG-color: %s;\"" $color | safeHTMLAttr }}{{ end }}>
   {{- if $icon }}
   <i class="{{ $icon }}"></i>
   {{- end }}
diff --git a/layouts/partials/twitter_cards.html b/layouts/partials/twitter_cards.html
index 499caa775ec..e71c05b53a9 100644
--- a/layouts/partials/twitter_cards.html
+++ b/layouts/partials/twitter_cards.html
@@ -6,15 +6,10 @@
 {{- if eq $outputFormat "searchpage" }}
     {{- $title = T "Search" }}
 {{- else if eq .Kind "taxonomy" }}
-    {{- $title = i18n .Data.Plural }}
-    {{- if not $title }}
-        {{- $title = .Data.Plural }}
-    {{- end }}
+    {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }}
 {{- else if eq .Kind "term" }}
-    {{- $title = i18n .Data.Singular }}
-    {{- if not $title }}
-        {{- $title = .Data.Singular }}
-    {{- end }}
+    {{- $taxonomy_page := .Site.GetPage .Data.Plural }}
+    {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }}
     {{- $title = printf "%s %s %s" (default .Data.Term .Title) (default "::" .Site.Params.titleSeparator) $title }}
 {{- end }}
 {{- if and $title .Site.Title (not (eq $title .Site.Title)) }}