From a68d58723be6c2332468b111f83dd92500c97017 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Tue, 19 Nov 2024 16:55:44 +0100
Subject: [PATCH] Revert "Update for latest hugo release (many deprecations)"

This reverts commit e23f88b6a67764cf4c56ce47812edd623f8af200.
---
 layouts/_default/summary.html   | 4 ++--
 layouts/index.rss.xml           | 6 +++---
 layouts/partials/footer.html    | 2 +-
 layouts/partials/head/seo.html  | 6 +++---
 layouts/partials/header.html    | 4 ++--
 layouts/partials/init.html      | 2 +-
 layouts/partials/rss/item.html  | 2 +-
 layouts/posts/rss.xml           | 6 +++---
 layouts/posts/single.html       | 4 ++--
 layouts/shortcodes/version.html | 2 +-
 layouts/taxonomy/rss.xml        | 6 +++---
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 6ef1771d..6d40d6ac 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -24,8 +24,8 @@ <h1 class="single-title" itemprop="name headline">
 
     {{- /* Meta */ -}}
     <div class="post-meta">
-        {{- $author := $params.author | default .Site.Params.Author | default (T "author") -}}
-        {{- $authorLink := $params.authorlink | default .Site.Params.Author.link | default .Site.Home.RelPermalink -}}
+        {{- $author := $params.author | default .Site.Author.name | default (T "author") -}}
+        {{- $authorLink := $params.authorlink | default .Site.Author.link | default .Site.Home.RelPermalink -}}
         <span class="post-author">
             {{- $options := dict "Class" "author" "Destination" $authorLink "Title" "Author" "Rel" "author" "Icon" (dict "Class" "fas fa-user-circle fa-fw") "Content" $author -}}
             {{- partial "plugin/link.html" $options -}}
diff --git a/layouts/index.rss.xml b/layouts/index.rss.xml
index ce30bb90..355c26a5 100644
--- a/layouts/index.rss.xml
+++ b/layouts/index.rss.xml
@@ -15,12 +15,12 @@
                 {{- . -}}
             </language>
         {{- end -}}
-        {{- with .Site.Params.Author.email -}}
+        {{- with .Site.Author.email -}}
             <managingEditor>
-                {{- . }}{{ with $.Site.Params.Author }} ({{ . }}){{ end -}}
+                {{- . }}{{ with $.Site.Author.name }} ({{ . }}){{ end -}}
             </managingEditor>
             <webMaster>
-                {{- . }}{{ with $.Site.Params.Author }} ({{ . }}){{ end -}}
+                {{- . }}{{ with $.Site.Author.name }} ({{ . }}){{ end -}}
             </webMaster>
         {{- end -}}
         {{- with .Site.Copyright -}}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index d755e2de..31f210f2 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -32,7 +32,7 @@
 
                 {{- /* Author */ -}}
                 {{- if ne .Site.Params.footer.author false -}}
-                    <span class="author" itemprop="copyrightHolder">&nbsp;<a href="{{ $.Site.Params.Author.link | default .Site.Home.RelPermalink }}" target="_blank">{{ .Site.Params.Author }}</a></span>
+                    <span class="author" itemprop="copyrightHolder">&nbsp;<a href="{{ $.Site.Author.link | default .Site.Home.RelPermalink }}" target="_blank">{{ .Site.Author.name }}</a></span>
                 {{- end -}}
 
                 {{- /* License */ -}}
diff --git a/layouts/partials/head/seo.html b/layouts/partials/head/seo.html
index b0a9c641..d431ad06 100644
--- a/layouts/partials/head/seo.html
+++ b/layouts/partials/head/seo.html
@@ -26,7 +26,7 @@
         {{- with .Site.LanguageCode -}}
             "inLanguage": "{{ . }}",
         {{- end -}}
-        {{- with .Site.Params.Author -}}
+        {{- with .Site.Author.name -}}
             "author": {
                 "@type": "Person",
                 "name": {{ . | safeHTML }}
@@ -122,7 +122,7 @@
         {{- with .Site.Copyright -}}
             "license": {{ . | safeHTML }},
         {{- end -}}
-        {{- $publisher := .Params.author | default .Site.Params.Author | default (T "author") | dict "name" -}}
+        {{- $publisher := .Params.author | default .Site.Author.name | default (T "author") | dict "name" -}}
         {{- $publisher = $params.seo.publisher | default dict | merge $publisher -}}
         "publisher": {
             "@type": "Organization",
@@ -141,7 +141,7 @@
                 {{- end -}}
             {{- end -}}
         },
-        {{- with .Params.author | default .Site.Params.Author | default (T "author") -}}
+        {{- with .Params.author | default .Site.Author.name | default (T "author") -}}
             "author": {
                 "@type": "Person",
                 "name": {{ . | safeHTML }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 10948a0a..46ae8d37 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -39,7 +39,7 @@
                 {{- if .Site.Menus.main -}}
                     <span class="menu-item delimiter"></span>
                 {{- end -}}
-                {{- if hugo.IsMultilingual -}}
+                {{- if .Site.IsMultiLingual -}}
                     <a href="javascript:void(0);" class="menu-item language" title="{{ T "selectLanguage" }}">
                         {{- .Language.LanguageName -}}
                         <i class="fas fa-chevron-right fa-fw" aria-hidden="true"></i>
@@ -149,7 +149,7 @@
             <a href="javascript:void(0);" class="menu-item theme-switch" title="{{ T "switchTheme" }}">
                 <i class="fas fa-adjust fa-fw" aria-hidden="true"></i>
             </a>
-            {{- if hugo.IsMultilingual -}}
+            {{- if .Site.IsMultiLingual -}}
                 <a href="javascript:void(0);" class="menu-item" title="{{ T "selectLanguage" }}">
                     {{- .Language.LanguageName -}}
                     <i class="fas fa-chevron-right fa-fw" aria-hidden="true"></i>
diff --git a/layouts/partials/init.html b/layouts/partials/init.html
index 5b55c83b..afea96e8 100644
--- a/layouts/partials/init.html
+++ b/layouts/partials/init.html
@@ -21,7 +21,7 @@
     {{- else if eq .Params.comment false -}}
         {{- .Scratch.Set "comment" dict -}}
     {{- end -}}
-{{- else if eq .Site .Sites.Default -}}
+{{- else if eq .Site .Sites.First -}}
     {{- warnf "\n\nCurrent environment is \"development\". The \"comment system\", \"CDN\" and \"fingerprint\" will be disabled.\n当前运行环境是 \"development\". \"评论系统\", \"CDN\" 和 \"fingerprint\" 不会启用.\n" -}}
 {{- end -}}
 
diff --git a/layouts/partials/rss/item.html b/layouts/partials/rss/item.html
index a5c73c4e..7af54d24 100644
--- a/layouts/partials/rss/item.html
+++ b/layouts/partials/rss/item.html
@@ -1,4 +1,4 @@
-{{- $params := .Page.Params | merge .Site.Params.Page | merge (dict "author" .Site.Params.Author) -}}
+{{- $params := .Page.Params | merge .Site.Params.Page | merge (dict "author" .Site.Author.name) -}}
 <item>
     <title>
         {{- .Page.Title -}}
diff --git a/layouts/posts/rss.xml b/layouts/posts/rss.xml
index b42b0c73..454cdec4 100644
--- a/layouts/posts/rss.xml
+++ b/layouts/posts/rss.xml
@@ -15,12 +15,12 @@
                 {{- . -}}
             </language>
         {{- end -}}
-        {{- with .Site.Params.Author.email -}}
+        {{- with .Site.Author.email -}}
             <managingEditor>
-                {{- . }}{{ with $.Site.Params.Author }} ({{ . }}){{ end -}}
+                {{- . }}{{ with $.Site.Author.name }} ({{ . }}){{ end -}}
             </managingEditor>
             <webMaster>
-                {{- . }}{{ with $.Site.Params.Author }} ({{ . }}){{ end -}}
+                {{- . }}{{ with $.Site.Author.name }} ({{ . }}){{ end -}}
             </webMaster>
         {{- end -}}
         {{- with .Site.Copyright -}}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 724bcf19..56e816f2 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -30,8 +30,8 @@ <h2 class="single-subtitle">{{ . }}</h2>
         {{- /* Meta */ -}}
         <div class="post-meta">
             <div class="post-meta-line">
-                {{- $author := $params.author | default .Site.Params.Author | default (T "author") -}}
-                {{- $authorLink := $params.authorlink | default .Site.Params.Author.link | default .Site.Home.RelPermalink -}}
+                {{- $author := $params.author | default .Site.Author.name | default (T "author") -}}
+                {{- $authorLink := $params.authorlink | default .Site.Author.link | default .Site.Home.RelPermalink -}}
                 <span class="post-author">
                     {{- $options := dict "Class" "author" "Destination" $authorLink "Title" "Author" "Rel" "author" "Icon" (dict "Class" "fas fa-user-circle fa-fw") "Content" $author -}}
                     {{- partial "plugin/link.html" $options -}}
diff --git a/layouts/shortcodes/version.html b/layouts/shortcodes/version.html
index 67ada16f..63cb87c4 100644
--- a/layouts/shortcodes/version.html
+++ b/layouts/shortcodes/version.html
@@ -3,7 +3,7 @@
 {{- $type := .Get 1 | default "new" | lower -}}
 {{- $label := T $type -}}
 {{- $color := cond (eq $type "changed") "ff9101" "00b1ff" | cond (eq $type "deleted") "ff5252" -}}
-{{- $pathTemplate := cond hugo.IsMultilingual (printf "svg/version/%%v-%%v.%v.svg" .Page.Language.Lang) "svg/version/%v-%v.svg" -}}
+{{- $pathTemplate := cond .Site.IsMultiLingual (printf "svg/version/%%v-%%v.%v.svg" .Page.Language.Lang) "svg/version/%v-%v.svg" -}}
 {{- $path := printf $pathTemplate $version $type -}}
 {{- $resource := resources.Get "svg/version.template.svg" -}}
 {{- $resource = $resource | resources.ExecuteAsTemplate $path (dict "version" $version "label" $label "color" $color) | minify -}}
diff --git a/layouts/taxonomy/rss.xml b/layouts/taxonomy/rss.xml
index 1516972c..a597e569 100644
--- a/layouts/taxonomy/rss.xml
+++ b/layouts/taxonomy/rss.xml
@@ -15,12 +15,12 @@
                 {{- . -}}
             </language>
         {{- end -}}
-        {{- with .Site.Params.Author.email -}}
+        {{- with .Site.Author.email -}}
             <managingEditor>
-                {{- . }}{{ with $.Site.Params.Author }} ({{ . }}){{ end -}}
+                {{- . }}{{ with $.Site.Author.name }} ({{ . }}){{ end -}}
             </managingEditor>
             <webMaster>
-                {{- . }}{{ with $.Site.Params.Author }} ({{ . }}){{ end -}}
+                {{- . }}{{ with $.Site.Author.name }} ({{ . }}){{ end -}}
             </webMaster>
         {{- end -}}
         {{- with .Site.Copyright -}}