fix: some title case bugs for section page and list page (#251)

2024-09-20 00:52:49 +02:00 · 2020-04-23 01:22:29 +08:00 · 2020-04-23 01:22:29 +08:00 · d90a2d9406
commit d90a2d9406
parent 07b669c826
37 changed files with 67 additions and 65 deletions
--- a/exampleSite/content/about.en.md
+++ b/exampleSite/content/about.en.md
@ -3,9 +3,10 @@ title: "About LoveIt"
 date: 2019-08-02T11:04:49+08:00
 draft: false

+lightgallery: true
+
 math:
  enable: true
-lightgallery: true
 ---

 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/dillonzq/LoveIt?style=flat-square)](https://github.com/dillonzq/LoveIt/releases)
--- a/exampleSite/content/about.fr.md
+++ b/exampleSite/content/about.fr.md
@ -3,9 +3,10 @@ title: "À propos de LoveIt"
 date: 2019-08-02T11:04:49+08:00
 draft: false

+lightgallery: true
+
 math:
  enable: true
-lightgallery: true
 ---

 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/dillonzq/LoveIt?style=flat-square)](https://github.com/dillonzq/LoveIt/releases)
--- a/exampleSite/content/about.zh-cn.md
+++ b/exampleSite/content/about.zh-cn.md
@ -3,9 +3,10 @@ title: "关于 LoveIt"
 date: 2019-08-02T11:04:49+08:00
 draft: false

+lightgallery: true
+
 math:
  enable: true
-lightgallery: true
 ---

 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/dillonzq/LoveIt?style=flat-square)](https://github.com/dillonzq/LoveIt/releases)
--- a/exampleSite/content/categories/documentation/_index.en.md
+++ b/exampleSite/content/categories/documentation/_index.en.md
@ -1,4 +1,3 @@
 ---
 title: "Documentation"
-slug: "documentation"
 ---
--- a/exampleSite/content/categories/documentation/_index.fr.md
+++ b/exampleSite/content/categories/documentation/_index.fr.md
@ -1,4 +1,3 @@
 ---
 title: "Documentation"
-slug: "documentation"
 ---
--- a/exampleSite/content/categories/documentation/_index.zh-cn.md
+++ b/exampleSite/content/categories/documentation/_index.zh-cn.md
@ -1,4 +1,3 @@
 ---
 title: "文档"
-slug: "documentation"
 ---
--- a/exampleSite/content/posts/basic-markdown-syntax.en.md
+++ b/exampleSite/content/posts/basic-markdown-syntax.en.md
@ -8,9 +8,8 @@ author: "Dillon"
 authorLink: "https://dillonzq.com"
 description: "This article shows the basic Markdown syntax and format."

-tags: ["markdown"]
-categories: ["markdown"]
-
+tags: ["Markdown"]
+categories: ["Markdown"]
 featuredImage: "/images/basic-markdown-syntax/featured-image.png"

 lightgallery: true
--- a/exampleSite/content/posts/basic-markdown-syntax.fr.md
+++ b/exampleSite/content/posts/basic-markdown-syntax.fr.md
@ -8,9 +8,8 @@ author: "Dillon"
 authorLink: "https://dillonzq.com"
 description: "Cet article présente la syntaxe et le format de base de Markdown."

-tags: ["markdown"]
-categories: ["markdown"]
-
+tags: ["Markdown"]
+categories: ["Markdown"]
 featuredImage: "/images/basic-markdown-syntax/featured-image.png"

 lightgallery: true
--- a/exampleSite/content/posts/basic-markdown-syntax.zh-cn.md
+++ b/exampleSite/content/posts/basic-markdown-syntax.zh-cn.md
@ -8,9 +8,8 @@ author: "Dillon"
 authorLink: "https://dillonzq.com"
 description: "这篇文章展示了基本的 Markdown 语法和格式."

-tags: ["markdown"]
-categories: ["markdown"]
-
+tags: ["Markdown"]
+categories: ["Markdown"]
 featuredImage: "/images/basic-markdown-syntax/featured-image.png"

 lightgallery: true
--- a/exampleSite/content/posts/emoji-support.en.md
+++ b/exampleSite/content/posts/emoji-support.en.md
@ -9,8 +9,7 @@ authorLink: "https://dillonzq.com"
 description: "Guide to emoji usage in Hugo and LoveIt."

 tags: ["emoji"]
-categories: ["markdown"]
-
+categories: ["Markdown"]
 featuredImage: "/images/emoji-support/featured-image.jpg"

 lightgallery: true
--- a/exampleSite/content/posts/emoji-support.fr.md
+++ b/exampleSite/content/posts/emoji-support.fr.md
@ -9,11 +9,8 @@ authorLink: "https://dillonzq.com"
 description: "Guide d'utilisation des emoji dans Hugo et LoveIt."

 tags: ["emoji"]
-categories: ["markdown"]
-hiddenFromHomePage: false
-
+categories: ["Markdown"]
 featuredImage: "/images/emoji-support/featured-image.jpg"
-featuredImagePreview: ""

 lightgallery: true
 ---
--- a/exampleSite/content/posts/emoji-support.zh-cn.md
+++ b/exampleSite/content/posts/emoji-support.zh-cn.md
@ -9,8 +9,7 @@ authorLink: "https://dillonzq.com"
 description: "Hugo 和 LoveIt 中的 Emoji 的用法指南."

 tags: ["emoji"]
-categories: ["markdown"]
-
+categories: ["Markdown"]
 featuredImage: "/images/emoji-support/featured-image.jpg"

 lightgallery: true
--- a/exampleSite/content/posts/theme-documentation-basics.en.md
+++ b/exampleSite/content/posts/theme-documentation-basics.en.md
@ -10,12 +10,12 @@ description: "Discover what the Hugo - LoveIt theme is all about and the core-co

 tags: ["installation", "configuration"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-basics/featured-image.jpg"

+lightgallery: true
+
 toc:
  auto: false
-lightgallery: true
 ---

 Discover what the Hugo - **LoveIt** theme is all about and the core-concepts behind it.
--- a/exampleSite/content/posts/theme-documentation-basics.fr.md
+++ b/exampleSite/content/posts/theme-documentation-basics.fr.md
@ -10,12 +10,12 @@ description: "Découvrez en quoi consiste le thème Hugo - LoveIt et les concept

 tags: ["installation", "configuration"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-basics/featured-image.jpg"

+lightgallery: true
+
 toc:
  auto: false
-lightgallery: true
 ---

 Découvrez en quoi consiste le thème Hugo - **LoveIt** et les concepts fondamentaux qui le sous-tendent.
--- a/exampleSite/content/posts/theme-documentation-basics.zh-cn.md
+++ b/exampleSite/content/posts/theme-documentation-basics.zh-cn.md
@ -8,14 +8,14 @@ author: "Dillon"
 authorLink: "https://dillonzq.com"
 description: "探索 Hugo - LoveIt 主题的全部内容和背后的核心概念."

-tags: ["安装", "配置"]
+tags: ["installation", "configuration"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-basics/featured-image.jpg"

+lightgallery: true
+
 toc:
  auto: false
-lightgallery: true
 ---

 探索 Hugo - **LoveIt** 主题的全部内容和背后的核心概念.
--- a/exampleSite/content/posts/theme-documentation-built-in-shortcodes.en.md
+++ b/exampleSite/content/posts/theme-documentation-built-in-shortcodes.en.md
@ -10,7 +10,6 @@ description: "Hugo provides multiple built-in shortcodes for author convenience

 tags: ["shortcodes"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-built-in-shortcodes/featured-image.png"

 lightgallery: true
--- a/exampleSite/content/posts/theme-documentation-built-in-shortcodes.fr.md
+++ b/exampleSite/content/posts/theme-documentation-built-in-shortcodes.fr.md
@ -10,7 +10,6 @@ description: "Hugo fournit plusieurs shortcodes intégrés pour la commodité de

 tags: ["shortcodes"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-built-in-shortcodes/featured-image.png"

 lightgallery: true
--- a/exampleSite/content/posts/theme-documentation-built-in-shortcodes.zh-cn.md
+++ b/exampleSite/content/posts/theme-documentation-built-in-shortcodes.zh-cn.md
@ -10,7 +10,6 @@ description: "Hugo 提供了多个内置的 Shortcodes, 以方便作者保持 Ma

 tags: ["shortcodes"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-built-in-shortcodes/featured-image.png"

 lightgallery: true
--- a/exampleSite/content/posts/theme-documentation-content.en.md
+++ b/exampleSite/content/posts/theme-documentation-content.en.md
@ -8,16 +8,16 @@ author: "Dillon"
 authorLink: "https://dillonzq.com"
 description: "Find out how to create and organize your content quickly and intuitively in LoveIt theme."

-tags: ["content", "markdown"]
+tags: ["content", "Markdown"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-content/featured-image.jpg"

+lightgallery: true
+
 toc:
  auto: false
 math:
  enable: true
-lightgallery: true
 ---

 Find out how to create and organize your content quickly and intuitively in **LoveIt** theme.
--- a/exampleSite/content/posts/theme-documentation-content.fr.md
+++ b/exampleSite/content/posts/theme-documentation-content.fr.md
@ -8,16 +8,16 @@ author: "Dillon"
 authorLink: "https://dillonzq.com"
 description: "Découvrez comment créer et organiser votre contenu rapidement et intuitivement dans le thème LoveIt."

-tags: ["contenu", "markdown"]
+tags: ["content", "Markdown"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-content/featured-image.jpg"

+lightgallery: true
+
 toc:
  auto: false
 math:
  enable: true
-lightgallery: true
 ---

 Découvrez comment créer et organiser votre contenu rapidement et intuitivement dans le thème **LoveIt**.
--- a/exampleSite/content/posts/theme-documentation-content.zh-cn.md
+++ b/exampleSite/content/posts/theme-documentation-content.zh-cn.md
@ -8,16 +8,16 @@ author: "Dillon"
 authorLink: "https://dillonzq.com"
 description: "了解如何在 LoveIt 主题中快速, 直观地创建和组织内容."

-tags: ["内容", "markdown"]
+tags: ["content", "Markdown"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-content/featured-image.jpg"

+lightgallery: true
+
 toc:
  auto: false
 math:
  enable: true
-lightgallery: true
 ---

 了解如何在 **LoveIt** 主题中快速, 直观地创建和组织内容.
--- a/exampleSite/content/posts/theme-documentation-extended-shortcodes.en.md
+++ b/exampleSite/content/posts/theme-documentation-extended-shortcodes.en.md
@ -10,7 +10,6 @@ description: "LoveIt theme provides multiple shortcodes on top of built-in ones

 tags: ["shortcodes"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-extended-shortcodes/featured-image.jpg"
 featuredImagePreview: "/images/theme-documentation-extended-shortcodes/featured-image-preview.jpg"

--- a/exampleSite/content/posts/theme-documentation-extended-shortcodes.fr.md
+++ b/exampleSite/content/posts/theme-documentation-extended-shortcodes.fr.md
@ -10,7 +10,6 @@ description: "Le thème LoveIt fournit plusieurs shortcodes en plus de ceux int

 tags: ["shortcodes"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-extended-shortcodes/featured-image.jpg"
 featuredImagePreview: "/images/theme-documentation-extended-shortcodes/featured-image-preview.jpg"

--- a/exampleSite/content/posts/theme-documentation-extended-shortcodes.zh-cn.md
+++ b/exampleSite/content/posts/theme-documentation-extended-shortcodes.zh-cn.md
@ -10,7 +10,6 @@ description: "LoveIt 主题在 Hugo 内置的 shortcode 的基础上提供多个

 tags: ["shortcodes"]
 categories: ["documentation"]
-
 featuredImage: "/images/theme-documentation-extended-shortcodes/featured-image.jpg"
 featuredImagePreview: "/images/theme-documentation-extended-shortcodes/featured-image-preview.jpg"

--- a/exampleSite/content/tags/configuration/_index.zh-cn.md
+++ b/exampleSite/content/tags/configuration/_index.zh-cn.md
@ -0,0 +1,3 @@
+---
+title: "配置"
+---
--- a/exampleSite/content/tags/content/_index.fr.md
+++ b/exampleSite/content/tags/content/_index.fr.md
@ -0,0 +1,3 @@
+---
+title: "contenu"
+---
--- a/exampleSite/content/tags/content/_index.zh-cn.md
+++ b/exampleSite/content/tags/content/_index.zh-cn.md
@ -0,0 +1,3 @@
+---
+title: "内容"
+---
--- a/exampleSite/content/tags/installation/_index.zh-cn.md
+++ b/exampleSite/content/tags/installation/_index.zh-cn.md
@ -0,0 +1,3 @@
+---
+title: "安装"
+---
--- 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" -}}
    <div class="page archive">
        {{- /* Title */ -}}
        <h2 class="single-title animated pulse faster">
-            {{- T .Section | default .Section | humanize | printf (T "allSome") -}}
+            {{- .Title | default (T .Section) | default .Section | printf (T "allSome") -}}
        </h2>

        {{- /* Paginate */ -}}
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@ -33,8 +33,9 @@
                {{- T "included" -}}
                {{- range $index, $value := . -}}
                    {{- if gt $index 0 }}&nbsp;{{ end -}}
-                    <a href="{{ `/categories/` | relLangURL }}{{ urlize $value }}">
-                        <i class="far fa-folder fa-fw"></i>{{ $value | humanize }}
+                    {{- $category := printf "/categories/%s" $value | $.Site.GetPage -}}
+                    <a href="{{ $category.RelPermalink }}">
+                        <i class="far fa-folder fa-fw"></i>{{ $category.Title }}
                    </a>
                {{- end -}}
            </span>
@ -58,7 +59,8 @@
                <i class="fas fa-tags fa-fw"></i>&nbsp;
                {{- range $index, $value := . -}}
                    {{- if gt $index 0 }},&nbsp;{{ end -}}
-                    <a href="{{ `/tags/` | relLangURL }}{{ urlize $value }}">{{ $value }}</a>
+                    {{- $tag := printf "/tags/%s" $value | $.Site.GetPage -}}
+                    <a href="{{ $tag.RelPermalink }}">{{ $tag.Title }}</a>
                {{- end -}}
            </div>
        {{- end -}}
--- a/layouts/index.rss.xml
+++ b/layouts/index.rss.xml
--- a/layouts/partials/single/footer.html
+++ b/layouts/partials/single/footer.html
@ -48,7 +48,8 @@
                <i class="fas fa-tags fa-fw"></i>&nbsp;
                {{- range $index, $value := . -}}
                    {{- if gt $index 0 }},&nbsp;{{ end -}}
-                    <a href="{{ `/tags/` | relLangURL }}{{ urlize $value }}">{{ $value }}</a>
+                    {{- $tag := printf "/tags/%s" $value | $.Site.GetPage -}}
+                    <a href="{{ $tag.RelPermalink }}">{{ $tag.Title }}</a>
                {{- end -}}
            {{- end -}}
        </section>
--- a/layouts/posts/rss.xml
+++ b/layouts/posts/rss.xml
@ -1,13 +1,13 @@
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
    <channel>
        <title>
-            {{- T .Section | default .Section | printf (T "allSome") }} | {{ .Site.Title -}}
+            {{- .Title | default (T .Section) | default .Section | printf (T "allSome") }} | {{ .Site.Title -}}
        </title>
        <link>
            {{- .Permalink -}}
        </link>
        <description>
-            {{- T .Section | default .Section | printf (T "allSome") }} | {{ .Site.Title -}}
+            {{- .Title | default (T .Section) | default .Section | printf (T "allSome") }} | {{ .Site.Title -}}
        </description>
        <generator>Hugo -- gohugo.io</generator>
        {{- with .Site.LanguageCode -}}
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@ -36,8 +36,9 @@
                        {{- T "included" -}}
                        {{- range $index, $value := . -}}
                            {{- if gt $index 0 }}&nbsp;{{ end -}}
-                            <a href="{{ `/categories/` | relLangURL }}{{ urlize $value }}">
-                                <i class="far fa-folder fa-fw"></i>{{ $value | humanize }}
+                            {{- $category := printf "/categories/%s" $value | $.Site.GetPage -}}
+                            <a href="{{ $category.RelPermalink }}">
+                                <i class="far fa-folder fa-fw"></i>{{ $category.Title }}
                            </a>
                        {{- end -}}
                    </span>
--- 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 @@
        <h2 class="single-title animated pulse faster">
            {{- $taxonomy := .Data.Singular -}}
            {{- if eq $taxonomy "category" -}}
-                <i class="far fa-folder-open fa-fw"></i>&nbsp;{{ humanize .Title }}
+                <i class="far fa-folder-open fa-fw"></i>&nbsp;{{ .Title }}
            {{- else if eq $taxonomy "tag" -}}
-                <i class="fas fa-tag fa-fw"></i>&nbsp;{{ humanize .Title }}
+                <i class="fas fa-tag fa-fw"></i>&nbsp;{{ .Title }}
            {{- else -}}
-                {{- printf "%s - %s" (T $taxonomy | default (humanize $taxonomy)) .Title -}}
+                {{- printf "%s - %s" (T $taxonomy | default $taxonomy) .Title -}}
            {{- end -}}
        </h2>

--- 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>
-            {{- .Title }} | {{ T .Data.Singular | default (humanize .Data.Singular) }} | {{ .Site.Title -}}
+            {{- .Title }} | {{ T .Data.Singular | default .Data.Singular }} | {{ .Site.Title -}}
        </title>
        <link>
            {{- .Permalink -}}
        </link>
        <description>
-            {{- .Title }} | {{ T .Data.Singular | default (humanize .Data.Singular) }} | {{ .Site.Title -}}
+            {{- .Title }} | {{ T .Data.Singular | default .Data.Singular }} | {{ .Site.Title -}}
        </description>
        <generator>Hugo -- gohugo.io</generator>
        {{- with .Site.LanguageCode -}}
--- 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 @@
    <div class="page archive">
        {{- /* Title */ -}}
        <h2 class="single-title animated pulse faster">
-            {{- T "all" | humanize}}{{ T $taxonomies | default $taxonomies | humanize -}}
+            {{- T "all" }}{{ T $taxonomies | default $taxonomies -}}
        </h2>

        {{- /* Categories Page */ -}}
@ -24,7 +24,7 @@
                        <div class="card-item-wrapper">
                            <h3 class="card-item-title">
                                <a href="{{ .RelPermalink }}">
-                                    <i class="far fa-folder fa-fw"></i>&nbsp;{{ $term | humanize}}
+                                    <i class="far fa-folder fa-fw"></i>&nbsp;{{ .Page.Title }}
                                </a>
                            </h3>
                            {{- range first 5 $pages -}}
@ -49,7 +49,7 @@
        {{- else if eq $taxonomies "tags" -}}
            <div class="tag-cloud-tags">
                {{- range $.Site.Taxonomies.tags.ByCount -}}
-                    <a href="{{ .Page.RelPermalink }}"> {{ .Page.Title }} <sup>{{ .Count }}</sup></a>
+                    <a href="{{ .Page.RelPermalink }}">{{ .Page.Title }} <sup>{{ .Count }}</sup></a>
                {{- end -}}
            </div>
        {{- end -}}