From d90a2d9406aa883548b48bb6da8e828d2d8e4dad Mon Sep 17 00:00:00 2001 From: Dillon Date: Thu, 23 Apr 2020 01:22:29 +0800 Subject: fix: some title case bugs for section page and list page (#251) --- layouts/_default/section.html | 4 +-- layouts/_default/summary.html | 8 +++-- layouts/inde.rss.xml | 64 ------------------------------------- layouts/index.rss.xml | 64 +++++++++++++++++++++++++++++++++++++ layouts/partials/single/footer.html | 3 +- layouts/posts/rss.xml | 4 +-- layouts/posts/single.html | 5 +-- layouts/taxonomy/list.html | 8 ++--- layouts/taxonomy/rss.xml | 4 +-- layouts/taxonomy/terms.html | 8 ++--- 10 files changed, 88 insertions(+), 84 deletions(-) delete mode 100644 layouts/inde.rss.xml create mode 100644 layouts/index.rss.xml (limited to 'layouts') diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 2d037bc..89ebcba 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -1,12 +1,12 @@ {{- define "title" }} - {{- T .Section | default .Section | printf (T "allSome") }} | {{ .Site.Title -}} + {{- .Title | default (T .Section) | default .Section | printf (T "allSome") }} | {{ .Site.Title -}} {{- end -}} {{- define "content" -}}
{{- /* Title */ -}}

- {{- T .Section | default .Section | humanize | printf (T "allSome") -}} + {{- .Title | default (T .Section) | default .Section | printf (T "allSome") -}}

{{- /* Paginate */ -}} diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index df0445c..419a869 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -33,8 +33,9 @@ {{- T "included" -}} {{- range $index, $value := . -}} {{- if gt $index 0 }} {{ end -}} - - {{ $value | humanize }} + {{- $category := printf "/categories/%s" $value | $.Site.GetPage -}} + + {{ $category.Title }} {{- end -}} @@ -58,7 +59,8 @@   {{- range $index, $value := . -}} {{- if gt $index 0 }}, {{ end -}} - {{ $value }} + {{- $tag := printf "/tags/%s" $value | $.Site.GetPage -}} + {{ $tag.Title }} {{- end -}}
{{- end -}} diff --git a/layouts/inde.rss.xml b/layouts/inde.rss.xml deleted file mode 100644 index 263082b..0000000 --- a/layouts/inde.rss.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - {{- .Site.Title -}} - - - {{- .Permalink -}} - - - {{- .Site.Params.description | default .Site.Title -}} - - Hugo -- gohugo.io - {{- with .Site.LanguageCode -}} - - {{- . -}} - - {{- end -}} - {{- with .Site.Author.email -}} - - {{- . }}{{ with $.Site.Author.name }} ({{ . }}){{ end -}} - - - {{- . }}{{ with $.Site.Author.name }} ({{ . }}){{ end -}} - - {{- end -}} - {{- with .Site.Copyright -}} - - {{- . -}} - - {{- end -}} - {{- if not .Date.IsZero -}} - - {{- .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" -}} - - {{- end -}} - - {{- range where .Site.RegularPages "Type" "posts" | first (.Site.Params.home.rss | default 10) -}} - - - {{- .Title -}} - - - {{- .Permalink -}} - - - {{- .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" -}} - - - {{- .Params.author | default $.Site.Author.name | default (T "author") -}} - - - {{- .Permalink -}} - - - {{- with .Summary -}} - {{- dict "content" . "ruby" true "fraction" true "fontawesome" true | partial "function/content.html" | plainify -}} - {{- else -}} - {{- .Description | plainify -}} - {{- end -}} - - - {{- end -}} - - diff --git a/layouts/index.rss.xml b/layouts/index.rss.xml new file mode 100644 index 0000000..263082b --- /dev/null +++ b/layouts/index.rss.xml @@ -0,0 +1,64 @@ + + + + {{- .Site.Title -}} + + + {{- .Permalink -}} + + + {{- .Site.Params.description | default .Site.Title -}} + + Hugo -- gohugo.io + {{- with .Site.LanguageCode -}} + + {{- . -}} + + {{- end -}} + {{- with .Site.Author.email -}} + + {{- . }}{{ with $.Site.Author.name }} ({{ . }}){{ end -}} + + + {{- . }}{{ with $.Site.Author.name }} ({{ . }}){{ end -}} + + {{- end -}} + {{- with .Site.Copyright -}} + + {{- . -}} + + {{- end -}} + {{- if not .Date.IsZero -}} + + {{- .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" -}} + + {{- end -}} + + {{- range where .Site.RegularPages "Type" "posts" | first (.Site.Params.home.rss | default 10) -}} + + + {{- .Title -}} + + + {{- .Permalink -}} + + + {{- .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" -}} + + + {{- .Params.author | default $.Site.Author.name | default (T "author") -}} + + + {{- .Permalink -}} + + + {{- with .Summary -}} + {{- dict "content" . "ruby" true "fraction" true "fontawesome" true | partial "function/content.html" | plainify -}} + {{- else -}} + {{- .Description | plainify -}} + {{- end -}} + + + {{- end -}} + + diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html index f76e5a6..249f9ff 100644 --- a/layouts/partials/single/footer.html +++ b/layouts/partials/single/footer.html @@ -48,7 +48,8 @@   {{- range $index, $value := . -}} {{- if gt $index 0 }}, {{ end -}} - {{ $value }} + {{- $tag := printf "/tags/%s" $value | $.Site.GetPage -}} + {{ $tag.Title }} {{- end -}} {{- end -}} diff --git a/layouts/posts/rss.xml b/layouts/posts/rss.xml index 49aba41..7d148d1 100644 --- a/layouts/posts/rss.xml +++ b/layouts/posts/rss.xml @@ -1,13 +1,13 @@ - {{- T .Section | default .Section | printf (T "allSome") }} | {{ .Site.Title -}} + {{- .Title | default (T .Section) | default .Section | printf (T "allSome") }} | {{ .Site.Title -}} {{- .Permalink -}} - {{- T .Section | default .Section | printf (T "allSome") }} | {{ .Site.Title -}} + {{- .Title | default (T .Section) | default .Section | printf (T "allSome") }} | {{ .Site.Title -}} Hugo -- gohugo.io {{- with .Site.LanguageCode -}} diff --git a/layouts/posts/single.html b/layouts/posts/single.html index 2e3abc2..e271537 100644 --- a/layouts/posts/single.html +++ b/layouts/posts/single.html @@ -36,8 +36,9 @@ {{- T "included" -}} {{- range $index, $value := . -}} {{- if gt $index 0 }} {{ end -}} - - {{ $value | humanize }} + {{- $category := printf "/categories/%s" $value | $.Site.GetPage -}} + + {{ $category.Title }} {{- end -}} diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html index cd60dba..d770be0 100644 --- a/layouts/taxonomy/list.html +++ b/layouts/taxonomy/list.html @@ -1,5 +1,5 @@ {{- define "title" -}} - {{- .Title }} | {{ T .Data.Singular | default (humanize .Data.Singular) }} | {{ .Site.Title -}} + {{- .Title }} | {{ T .Data.Singular | default .Data.Singular }} | {{ .Site.Title -}} {{- end -}} {{- define "content" -}} @@ -8,11 +8,11 @@

{{- $taxonomy := .Data.Singular -}} {{- if eq $taxonomy "category" -}} -  {{ humanize .Title }} +  {{ .Title }} {{- else if eq $taxonomy "tag" -}} -  {{ humanize .Title }} +  {{ .Title }} {{- else -}} - {{- printf "%s - %s" (T $taxonomy | default (humanize $taxonomy)) .Title -}} + {{- printf "%s - %s" (T $taxonomy | default $taxonomy) .Title -}} {{- end -}}

diff --git a/layouts/taxonomy/rss.xml b/layouts/taxonomy/rss.xml index 4f9bed6..2d79cfa 100644 --- a/layouts/taxonomy/rss.xml +++ b/layouts/taxonomy/rss.xml @@ -1,13 +1,13 @@ - {{- .Title }} | {{ T .Data.Singular | default (humanize .Data.Singular) }} | {{ .Site.Title -}} + {{- .Title }} | {{ T .Data.Singular | default .Data.Singular }} | {{ .Site.Title -}} {{- .Permalink -}} - {{- .Title }} | {{ T .Data.Singular | default (humanize .Data.Singular) }} | {{ .Site.Title -}} + {{- .Title }} | {{ T .Data.Singular | default .Data.Singular }} | {{ .Site.Title -}} Hugo -- gohugo.io {{- with .Site.LanguageCode -}} diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html index 28062a5..6722c66 100644 --- a/layouts/taxonomy/terms.html +++ b/layouts/taxonomy/terms.html @@ -1,5 +1,5 @@ {{- define "title" -}} - {{- .Title | default (T .Data.Plural) | default (humanize .Data.Plural) }} | {{ .Site.Title -}} + {{- .Title | default (T .Data.Plural) | default .Data.Plural }} | {{ .Site.Title -}} {{- end -}} {{- define "content" -}} @@ -10,7 +10,7 @@
{{- /* Title */ -}}

- {{- T "all" | humanize}}{{ T $taxonomies | default $taxonomies | humanize -}} + {{- T "all" }}{{ T $taxonomies | default $taxonomies -}}

{{- /* Categories Page */ -}} @@ -24,7 +24,7 @@

-  {{ $term | humanize}} +  {{ .Page.Title }}

{{- range first 5 $pages -}} @@ -49,7 +49,7 @@ {{- else if eq $taxonomies "tags" -}}
{{- range $.Site.Taxonomies.tags.ByCount -}} - {{ .Page.Title }} {{ .Count }} + {{ .Page.Title }} {{ .Count }} {{- end -}}
{{- end -}} -- cgit v1.2.3