From af209c3f49aea497dd71b55247142004c4f28ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Weber?= Date: Wed, 14 Feb 2024 22:31:30 +0100 Subject: [PATCH] taxonomy: display translated title #772 --- layouts/_default/index.json | 2 +- layouts/_default/index.search.js | 2 +- layouts/_default/taxonomy.html | 2 +- layouts/partials/breadcrumbs.html | 2 +- layouts/partials/header.html | 2 +- layouts/partials/opengraph.html | 4 ++-- layouts/partials/term-list.html | 2 +- layouts/partials/twitter_cards.html | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/layouts/_default/index.json b/layouts/_default/index.json index f460fb9b67..17cef41d36 100644 --- a/layouts/_default/index.json +++ b/layouts/_default/index.json @@ -4,7 +4,7 @@ {{- if and .Title .RelPermalink (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableSearchHiddenPages true) ) }} {{- $title := .Title }} {{- if eq .Kind "taxonomy" }} - {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }} + {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Params.Title }} {{- else if eq .Kind "term" }} {{- $taxonomy_page := .Site.GetPage .Data.Plural }} {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }} diff --git a/layouts/_default/index.search.js b/layouts/_default/index.search.js index e0951c0350..3b8d8a35c5 100644 --- a/layouts/_default/index.search.js +++ b/layouts/_default/index.search.js @@ -4,7 +4,7 @@ {{- if and .Title .RelPermalink (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableSearchHiddenPages true) ) }} {{- $title := .Title }} {{- if eq .Kind "taxonomy" }} - {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }} + {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Params.Title }} {{- else if eq .Kind "term" }} {{- $taxonomy_page := .Site.GetPage .Data.Plural }} {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }} diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index f5ef97da75..960fcb08b6 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -5,7 +5,7 @@ {{- $page := . }} -{{- $title := default (default .Data.Plural (i18n .Data.Plural)) .Title }} +{{- $title := default (default .Data.Plural (i18n .Data.Plural)) .Params.Title }}

{{ $title }}

{{- .Content }} {{- $lastCapital := "" }} diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html index 90a7c5a911..09e7c730d0 100644 --- a/layouts/partials/breadcrumbs.html +++ b/layouts/partials/breadcrumbs.html @@ -33,7 +33,7 @@ {{- $depth = add $depth 1 }} {{- $title := $to.Title }} {{- if eq $to.Kind "taxonomy" }} - {{- $title = default (default $to.Data.Plural (i18n $to.Data.Plural)) .Title }} + {{- $title = default (default $to.Data.Plural (i18n $to.Data.Plural)) $to.Params.Title }} {{- else if eq $to.Kind "term" }} {{- $taxonomy_page := $to.Site.GetPage $to.Data.Plural }} {{- $title = default (default $to.Data.Singular (i18n $to.Data.Singular)) $taxonomy_page.Params.SingularTitle }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 96b3440779..b557ba7b75 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -20,7 +20,7 @@ {{- if eq $outputFormat "searchpage" }} {{- $title = T "Search" }} {{- else if eq .Kind "taxonomy" }} - {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }} + {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Params.Title }} {{- else if eq .Kind "term" }} {{- $taxonomy_page := .Site.GetPage .Data.Plural }} {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }} diff --git a/layouts/partials/opengraph.html b/layouts/partials/opengraph.html index 36fabffae9..8525069012 100644 --- a/layouts/partials/opengraph.html +++ b/layouts/partials/opengraph.html @@ -10,7 +10,7 @@ {{- if eq $outputFormat "searchpage" }} {{- $title = T "Search" }} {{- else if eq .Kind "taxonomy" }} - {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }} + {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Params.Title }} {{- else if eq .Kind "term" }} {{- $taxonomy_page := .Site.GetPage .Data.Plural }} {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }} @@ -50,7 +50,7 @@ {{- if eq $outputFormat "searchpage" }} {{- $title = T "Search" }} {{- else if eq .Kind "taxonomy" }} - {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }} + {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Params.Title }} {{- else if eq .Kind "term" }} {{- $taxonomy_page := .Site.GetPage .Data.Plural }} {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }} diff --git a/layouts/partials/term-list.html b/layouts/partials/term-list.html index 39e012ab03..beacfc1356 100644 --- a/layouts/partials/term-list.html +++ b/layouts/partials/term-list.html @@ -35,7 +35,7 @@ {{- end }} {{- end }} {{- end }} -{{- $taxonomy_title := default (default $taxonomy_page.Data.Plural (i18n $taxonomy_page.Data.Plural)) $taxonomy_page.Title }} +{{- $taxonomy_title := default (default $taxonomy_page.Data.Plural (i18n $taxonomy_page.Data.Plural)) $taxonomy_page.Params.Title }} {{- with $term_pages }}
{{- if $icon }} diff --git a/layouts/partials/twitter_cards.html b/layouts/partials/twitter_cards.html index 1e110ff5fa..59f2180255 100644 --- a/layouts/partials/twitter_cards.html +++ b/layouts/partials/twitter_cards.html @@ -6,7 +6,7 @@ {{- if eq $outputFormat "searchpage" }} {{- $title = T "Search" }} {{- else if eq .Kind "taxonomy" }} - {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Title }} + {{- $title = default (default .Data.Plural (i18n .Data.Plural)) .Params.Title }} {{- else if eq .Kind "term" }} {{- $taxonomy_page := .Site.GetPage .Data.Plural }} {{- $title = default (default .Data.Singular (i18n .Data.Singular)) $taxonomy_page.Params.SingularTitle }}