From 40bcd08bc6edd2cb9137eef47946242e925d8193336ec08c2bad1559afce04ef Mon Sep 17 00:00:00 2001 From: Nicholas Johnson Date: Fri, 16 Aug 2024 00:00:00 +0000 Subject: Add backward compatibility for old taxonomy API --- layouts/index.atom.xml | 36 +++++++++++++++++++++++++++++-- layouts/index.gemini_atom.xml | 36 +++++++++++++++++++++++++++++-- layouts/taxonomy/taxonomy.atom.xml | 36 +++++++++++++++++++++++++++++-- layouts/taxonomy/taxonomy.gemini_atom.xml | 36 +++++++++++++++++++++++++++++-- layouts/term/term.atom.xml | 36 +++++++++++++++++++++++++++++-- layouts/term/term.gemini_atom.xml | 36 +++++++++++++++++++++++++++++-- 6 files changed, 204 insertions(+), 12 deletions(-) diff --git a/layouts/index.atom.xml b/layouts/index.atom.xml index d31c3fd..f65c1fe 100644 --- a/layouts/index.atom.xml +++ b/layouts/index.atom.xml @@ -1,3 +1,35 @@ +{{/* Deprecate site.Author.name in favor of site.Params.author.name */}} +{{- $authorName := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .name }} + {{- $authorName = . }} + {{- end }} + {{- else }} + {{- $authorName = . }} + {{- end }} +{{- else }} + {{- with site.Author.name }} + {{- $authorName = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }} + {{- end }} +{{- end }} + +{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}} +{{- $authorEmail := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .email }} + {{- $authorEmail = . }} + {{- end }} + {{- end }} +{{- else }} + {{- with site.Author.email }} + {{- $authorEmail = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }} + {{- end }} +{{- end -}} + {{ "" | safeHTML }} {{ .Permalink }} @@ -6,8 +38,8 @@ - {{ .Site.Params.author.name }} - {{- with .Site.Params.author.email }} + {{ $authorName }} + {{- with $authorEmail }} {{ . }}{{ end }} Hugo -- gohugo.io diff --git a/layouts/index.gemini_atom.xml b/layouts/index.gemini_atom.xml index 014cfdb..fc0a12a 100644 --- a/layouts/index.gemini_atom.xml +++ b/layouts/index.gemini_atom.xml @@ -1,3 +1,35 @@ +{{/* Deprecate site.Author.name in favor of site.Params.author.name */}} +{{- $authorName := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .name }} + {{- $authorName = . }} + {{- end }} + {{- else }} + {{- $authorName = . }} + {{- end }} +{{- else }} + {{- with site.Author.name }} + {{- $authorName = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }} + {{- end }} +{{- end }} + +{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}} +{{- $authorEmail := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .email }} + {{- $authorEmail = . }} + {{- end }} + {{- end }} +{{- else }} + {{- with site.Author.email }} + {{- $authorEmail = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }} + {{- end }} +{{- end -}} + {{ "" | safeHTML }} {{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" }} @@ -6,8 +38,8 @@ - {{ .Site.Params.author.name }} - {{- with .Site.Params.author.email }} + {{ $authorName }} + {{- with $authorEmail }} {{ . }}{{ end }} Hugo -- gohugo.io diff --git a/layouts/taxonomy/taxonomy.atom.xml b/layouts/taxonomy/taxonomy.atom.xml index 5749d56..50d72fa 100644 --- a/layouts/taxonomy/taxonomy.atom.xml +++ b/layouts/taxonomy/taxonomy.atom.xml @@ -1,3 +1,35 @@ +{{/* Deprecate site.Author.name in favor of site.Params.author.name */}} +{{- $authorName := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .name }} + {{- $authorName = . }} + {{- end }} + {{- else }} + {{- $authorName = . }} + {{- end }} +{{- else }} + {{- with site.Author.name }} + {{- $authorName = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }} + {{- end }} +{{- end }} + +{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}} +{{- $authorEmail := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .email }} + {{- $authorEmail = . }} + {{- end }} + {{- end }} +{{- else }} + {{- with site.Author.email }} + {{- $authorEmail = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }} + {{- end }} +{{- end -}} + {{ "" | safeHTML }} {{ .Permalink }} @@ -6,8 +38,8 @@ - {{ .Site.Params.author.name }} - {{- with .Site.Params.author.email }} + {{ $authorName }} + {{- with $authorEmail }} {{ . }}{{ end }} Hugo -- gohugo.io diff --git a/layouts/taxonomy/taxonomy.gemini_atom.xml b/layouts/taxonomy/taxonomy.gemini_atom.xml index a3db9a2..098cc4f 100644 --- a/layouts/taxonomy/taxonomy.gemini_atom.xml +++ b/layouts/taxonomy/taxonomy.gemini_atom.xml @@ -1,3 +1,35 @@ +{{/* Deprecate site.Author.name in favor of site.Params.author.name */}} +{{- $authorName := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .name }} + {{- $authorName = . }} + {{- end }} + {{- else }} + {{- $authorName = . }} + {{- end }} +{{- else }} + {{- with site.Author.name }} + {{- $authorName = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }} + {{- end }} +{{- end }} + +{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}} +{{- $authorEmail := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .email }} + {{- $authorEmail = . }} + {{- end }} + {{- end }} +{{- else }} + {{- with site.Author.email }} + {{- $authorEmail = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }} + {{- end }} +{{- end -}} + {{ "" | safeHTML }} {{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" }} @@ -6,8 +38,8 @@ - {{ .Site.Params.author.name }} - {{- with .Site.Params.author.email }} + {{ $authorName }} + {{- with $authorEmail }} {{ . }}{{ end }} Hugo -- gohugo.io diff --git a/layouts/term/term.atom.xml b/layouts/term/term.atom.xml index 5749d56..50d72fa 100644 --- a/layouts/term/term.atom.xml +++ b/layouts/term/term.atom.xml @@ -1,3 +1,35 @@ +{{/* Deprecate site.Author.name in favor of site.Params.author.name */}} +{{- $authorName := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .name }} + {{- $authorName = . }} + {{- end }} + {{- else }} + {{- $authorName = . }} + {{- end }} +{{- else }} + {{- with site.Author.name }} + {{- $authorName = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }} + {{- end }} +{{- end }} + +{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}} +{{- $authorEmail := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .email }} + {{- $authorEmail = . }} + {{- end }} + {{- end }} +{{- else }} + {{- with site.Author.email }} + {{- $authorEmail = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }} + {{- end }} +{{- end -}} + {{ "" | safeHTML }} {{ .Permalink }} @@ -6,8 +38,8 @@ - {{ .Site.Params.author.name }} - {{- with .Site.Params.author.email }} + {{ $authorName }} + {{- with $authorEmail }} {{ . }}{{ end }} Hugo -- gohugo.io diff --git a/layouts/term/term.gemini_atom.xml b/layouts/term/term.gemini_atom.xml index a3db9a2..a4826bc 100644 --- a/layouts/term/term.gemini_atom.xml +++ b/layouts/term/term.gemini_atom.xml @@ -1,3 +1,35 @@ +{{/*Deprecate site.Author.name in favor of site.Params.author.name */}} +{{- $authorName := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .name }} + {{- $authorName = . }} + {{- end }} + {{- else }} + {{- $authorName = . }} + {{- end }} +{{- else }} + {{- with site.Author.name }} + {{- $authorName = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }} + {{- end }} +{{- end }} + +{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}} +{{- $authorEmail := "" }} +{{- with site.Params.author }} + {{- if reflect.IsMap . }} + {{- with .email }} + {{- $authorEmail = . }} + {{- end }} + {{- end }} +{{- else }} + {{- with site.Author.email }} + {{- $authorEmail = . }} + {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }} + {{- end }} +{{- end -}} + {{ "" | safeHTML }} {{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" }} @@ -6,8 +38,8 @@ - {{ .Site.Params.author.name }} - {{- with .Site.Params.author.email }} + {{ $authorName }} + {{- with $authorEmail }} {{ . }}{{ end }} Hugo -- gohugo.io -- cgit v1.2.3