fix(title): terms title error and change delimiter from "|" to "-" (#299

)
dillonzq · May 1, 2020 · 5b689bf · 5b689bf
1 parent 79df5c6
commit 5b689bf
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 14 deletions.
diff --git a/exampleSite/content/posts/basic-markdown-syntax.en.md b/exampleSite/content/posts/basic-markdown-syntax.en.md
@@ -8,7 +8,7 @@ author: "Dillon"
 authorLink: "https://dillonzq.com"
 description: "This article shows the basic Markdown syntax and format."
 
-tags: ["Markdown"]
+tags: ["Markdown", "HTML"]
 categories: ["Markdown"]
 featuredImage: "/images/basic-markdown-syntax/featured-image.png"
 

diff --git a/exampleSite/content/posts/basic-markdown-syntax.fr.md b/exampleSite/content/posts/basic-markdown-syntax.fr.md
@@ -8,7 +8,7 @@ author: "Dillon"
 authorLink: "https://dillonzq.com"
 description: "Cet article présente la syntaxe et le format de base de Markdown."
 
-tags: ["Markdown"]
+tags: ["Markdown", "HTML"]
 categories: ["Markdown"]
 featuredImage: "/images/basic-markdown-syntax/featured-image.png"
 

diff --git a/exampleSite/content/posts/basic-markdown-syntax.zh-cn.md b/exampleSite/content/posts/basic-markdown-syntax.zh-cn.md
@@ -8,7 +8,7 @@ author: "Dillon"
 authorLink: "https://dillonzq.com"
 description: "这篇文章展示了基本的 Markdown 语法和格式."
 
-tags: ["Markdown"]
+tags: ["Markdown", "HTML"]
 categories: ["Markdown"]
 featuredImage: "/images/basic-markdown-syntax/featured-image.png"
 

diff --git a/layouts/404.html b/layouts/404.html
@@ -1,5 +1,5 @@
 {{- define "title" }}
-    {{- T "pageNotFound" | printf "404 %s" }} | {{ .Site.Title -}}
+    {{- T "pageNotFound" | printf "404 %s" }} - {{ .Site.Title -}}
 {{- end -}}
 
 {{- define "content" -}}

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -10,7 +10,7 @@
 {{- end -}}
 
 {{- $params := .Params | merge .Site.Params.page -}}
-{{- .Scratch.Set "version" "0.2.3" -}}
+{{- .Scratch.Set "version" "0.2.4" -}}
 
 {{- if eq hugo.Environment "production" -}}
     {{- .Scratch.Set "cdn" .Site.Params.cdn -}}

diff --git a/layouts/_default/section.html b/layouts/_default/section.html
@@ -1,5 +1,5 @@
 {{- define "title" }}
-    {{- .Params.Title | default (T .Section) | default .Section | printf (T "allSome") }} | {{ .Site.Title -}}
+    {{- .Params.Title | default (T .Section) | default .Section | printf (T "allSome") }} - {{ .Site.Title -}}
 {{- end -}}
 
 {{- define "content" -}}

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -1,4 +1,4 @@
-{{- define "title" }}{{ .Title }} | {{ .Site.Title }}{{ end -}}
+{{- define "title" }}{{ .Title }} - {{ .Site.Title }}{{ end -}}
 
 {{- define "content" -}}
     {{- $params := .Scratch.Get "params" -}}

diff --git a/layouts/posts/rss.xml b/layouts/posts/rss.xml
@@ -1,7 +1,7 @@
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
     <channel>
         <title>
-            {{- .Params.Title | default (T .Section) | default .Section | printf (T "allSome") }} | {{ .Site.Title -}}
+            {{- .Params.Title | default (T .Section) | default .Section | printf (T "allSome") }} - {{ .Site.Title -}}
         </title>
         <link>
             {{- .Permalink -}}

diff --git a/layouts/posts/single.html b/layouts/posts/single.html
@@ -1,4 +1,4 @@
-{{- define "title" }}{{ .Title }} | {{ .Site.Title }}{{ end -}}
+{{- define "title" }}{{ .Title }} - {{ .Site.Title }}{{ end -}}
 
 {{- define "content" -}}
     {{- $params := .Scratch.Get "params" -}}

diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
@@ -1,5 +1,5 @@
 {{- define "title" -}}
-    {{- .Title }} | {{ T .Data.Singular | default .Data.Singular }} | {{ .Site.Title -}}
+    {{- .Title }} - {{ T .Data.Singular | default .Data.Singular }} - {{ .Site.Title -}}
 {{- end -}}
 
 {{- define "content" -}}

diff --git a/layouts/taxonomy/rss.xml b/layouts/taxonomy/rss.xml
@@ -1,13 +1,13 @@
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
     <channel>
         <title>
-            {{- .Params.Title }} | {{ T .Data.Singular | default .Data.Singular }} | {{ .Site.Title -}}
+            {{- .Title }} - {{ T .Data.Singular | default .Data.Singular }} - {{ .Site.Title -}}
         </title>
         <link>
             {{- .Permalink -}}
         </link>
         <description>
-            {{- .Params.Title }} | {{ T .Data.Singular | default .Data.Singular }} | {{ .Site.Title -}}
+            {{- .Title }} - {{ T .Data.Singular | default .Data.Singular }} - {{ .Site.Title -}}
         </description>
         <generator>Hugo -- gohugo.io</generator>
         {{- with .Site.LanguageCode -}}

diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html
@@ -1,5 +1,5 @@
 {{- define "title" -}}
-    {{- .Title | default (T .Data.Plural) | default .Data.Plural }} | {{ .Site.Title -}}
+    {{- .Params.Title | default (T .Data.Plural) | default .Data.Plural | printf (T "allSome") }} - {{ .Site.Title -}}
 {{- end -}}
 
 {{- define "content" -}}
@@ -10,7 +10,7 @@
     <div class="page archive">
         {{- /* Title */ -}}
         <h2 class="single-title animated pulse faster">
-            {{- T "all" }}{{ T $taxonomies | default $taxonomies -}}
+            {{- .Params.Title | default (T $taxonomies) | default $taxonomies | printf (T "allSome") -}}
         </h2>
 
         {{- /* Categories Page */ -}}