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) --- exampleSite/content/about.en.md | 3 +- exampleSite/content/about.fr.md | 3 +- exampleSite/content/about.zh-cn.md | 3 +- .../content/categories/documentation/_index.en.md | 1 - .../content/categories/documentation/_index.fr.md | 1 - .../categories/documentation/_index.zh-cn.md | 1 - .../content/posts/basic-markdown-syntax.en.md | 5 +- .../content/posts/basic-markdown-syntax.fr.md | 5 +- .../content/posts/basic-markdown-syntax.zh-cn.md | 5 +- exampleSite/content/posts/emoji-support.en.md | 3 +- exampleSite/content/posts/emoji-support.fr.md | 5 +- exampleSite/content/posts/emoji-support.zh-cn.md | 3 +- .../content/posts/theme-documentation-basics.en.md | 4 +- .../content/posts/theme-documentation-basics.fr.md | 4 +- .../posts/theme-documentation-basics.zh-cn.md | 6 +- .../theme-documentation-built-in-shortcodes.en.md | 1 - .../theme-documentation-built-in-shortcodes.fr.md | 1 - ...heme-documentation-built-in-shortcodes.zh-cn.md | 1 - .../posts/theme-documentation-content.en.md | 6 +- .../posts/theme-documentation-content.fr.md | 6 +- .../posts/theme-documentation-content.zh-cn.md | 6 +- .../theme-documentation-extended-shortcodes.en.md | 1 - .../theme-documentation-extended-shortcodes.fr.md | 1 - ...heme-documentation-extended-shortcodes.zh-cn.md | 1 - .../content/tags/configuration/_index.zh-cn.md | 3 + exampleSite/content/tags/content/_index.fr.md | 3 + exampleSite/content/tags/content/_index.zh-cn.md | 3 + .../content/tags/installation/_index.zh-cn.md | 3 + 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 +-- 38 files changed, 131 insertions(+), 129 deletions(-) create mode 100644 exampleSite/content/tags/configuration/_index.zh-cn.md create mode 100644 exampleSite/content/tags/content/_index.fr.md create mode 100644 exampleSite/content/tags/content/_index.zh-cn.md create mode 100644 exampleSite/content/tags/installation/_index.zh-cn.md delete mode 100644 layouts/inde.rss.xml create mode 100644 layouts/index.rss.xml diff --git a/exampleSite/content/about.en.md b/exampleSite/content/about.en.md index 2967154..10fc4b9 100644 --- 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) diff --git a/exampleSite/content/about.fr.md b/exampleSite/content/about.fr.md index 5e55027..639f39e 100644 --- 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) diff --git a/exampleSite/content/about.zh-cn.md b/exampleSite/content/about.zh-cn.md index e2cf691..ac6f93a 100644 --- 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) diff --git a/exampleSite/content/categories/documentation/_index.en.md b/exampleSite/content/categories/documentation/_index.en.md index 3050ea7..b40df67 100644 --- a/exampleSite/content/categories/documentation/_index.en.md +++ b/exampleSite/content/categories/documentation/_index.en.md @@ -1,4 +1,3 @@ --- title: "Documentation" -slug: "documentation" --- diff --git a/exampleSite/content/categories/documentation/_index.fr.md b/exampleSite/content/categories/documentation/_index.fr.md index 3050ea7..b40df67 100644 --- a/exampleSite/content/categories/documentation/_index.fr.md +++ b/exampleSite/content/categories/documentation/_index.fr.md @@ -1,4 +1,3 @@ --- title: "Documentation" -slug: "documentation" --- diff --git a/exampleSite/content/categories/documentation/_index.zh-cn.md b/exampleSite/content/categories/documentation/_index.zh-cn.md index 9168d97..ceb1616 100644 --- 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" --- diff --git a/exampleSite/content/posts/basic-markdown-syntax.en.md b/exampleSite/content/posts/basic-markdown-syntax.en.md index 26456b1..d290703 100644 --- 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 diff --git a/exampleSite/content/posts/basic-markdown-syntax.fr.md b/exampleSite/content/posts/basic-markdown-syntax.fr.md index 13ce18d..20c56af 100644 --- 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 diff --git a/exampleSite/content/posts/basic-markdown-syntax.zh-cn.md b/exampleSite/content/posts/basic-markdown-syntax.zh-cn.md index 9dd866f..4e99c76 100644 --- 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 diff --git a/exampleSite/content/posts/emoji-support.en.md b/exampleSite/content/posts/emoji-support.en.md index d214a6f..28113c2 100644 --- 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 diff --git a/exampleSite/content/posts/emoji-support.fr.md b/exampleSite/content/posts/emoji-support.fr.md index 590f874..0d1b386 100644 --- 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 --- diff --git a/exampleSite/content/posts/emoji-support.zh-cn.md b/exampleSite/content/posts/emoji-support.zh-cn.md index aee970f..4514baa 100644 --- 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 diff --git a/exampleSite/content/posts/theme-documentation-basics.en.md b/exampleSite/content/posts/theme-documentation-basics.en.md index 410e485..a5a7966 100644 --- 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. diff --git a/exampleSite/content/posts/theme-documentation-basics.fr.md b/exampleSite/content/posts/theme-documentation-basics.fr.md index 4ce6b89..f2b7e92 100644 --- 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. diff --git a/exampleSite/content/posts/theme-documentation-basics.zh-cn.md b/exampleSite/content/posts/theme-documentation-basics.zh-cn.md index 17970d2..498de03 100644 --- 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** 主题的全部内容和背后的核心概念. diff --git a/exampleSite/content/posts/theme-documentation-built-in-shortcodes.en.md b/exampleSite/content/posts/theme-documentation-built-in-shortcodes.en.md index 1c82620..1621cc0 100644 --- 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 diff --git a/exampleSite/content/posts/theme-documentation-built-in-shortcodes.fr.md b/exampleSite/content/posts/theme-documentation-built-in-shortcodes.fr.md index 39a3308..4a04869 100644 --- 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 diff --git a/exampleSite/content/posts/theme-documentation-built-in-shortcodes.zh-cn.md b/exampleSite/content/posts/theme-documentation-built-in-shortcodes.zh-cn.md index 4582171..c67eaa4 100644 --- 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 diff --git a/exampleSite/content/posts/theme-documentation-content.en.md b/exampleSite/content/posts/theme-documentation-content.en.md index 5ba6d37..0fe2f62 100644 --- 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. diff --git a/exampleSite/content/posts/theme-documentation-content.fr.md b/exampleSite/content/posts/theme-documentation-content.fr.md index ad079ef..d99d1dc 100644 --- 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**. diff --git a/exampleSite/content/posts/theme-documentation-content.zh-cn.md b/exampleSite/content/posts/theme-documentation-content.zh-cn.md index 1b25c00..aca01c7 100644 --- 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** 主题中快速, 直观地创建和组织内容. diff --git a/exampleSite/content/posts/theme-documentation-extended-shortcodes.en.md b/exampleSite/content/posts/theme-documentation-extended-shortcodes.en.md index 732163a..6411d42 100644 --- 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" diff --git a/exampleSite/content/posts/theme-documentation-extended-shortcodes.fr.md b/exampleSite/content/posts/theme-documentation-extended-shortcodes.fr.md index 502c60d..c4555ef 100644 --- 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" diff --git a/exampleSite/content/posts/theme-documentation-extended-shortcodes.zh-cn.md b/exampleSite/content/posts/theme-documentation-extended-shortcodes.zh-cn.md index 974d72b..a811016 100644 --- 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" diff --git a/exampleSite/content/tags/configuration/_index.zh-cn.md b/exampleSite/content/tags/configuration/_index.zh-cn.md new file mode 100644 index 0000000..83cf3d5 --- /dev/null +++ b/exampleSite/content/tags/configuration/_index.zh-cn.md @@ -0,0 +1,3 @@ +--- +title: "配置" +--- diff --git a/exampleSite/content/tags/content/_index.fr.md b/exampleSite/content/tags/content/_index.fr.md new file mode 100644 index 0000000..92e0664 --- /dev/null +++ b/exampleSite/content/tags/content/_index.fr.md @@ -0,0 +1,3 @@ +--- +title: "contenu" +--- diff --git a/exampleSite/content/tags/content/_index.zh-cn.md b/exampleSite/content/tags/content/_index.zh-cn.md new file mode 100644 index 0000000..80b3bf9 --- /dev/null +++ b/exampleSite/content/tags/content/_index.zh-cn.md @@ -0,0 +1,3 @@ +--- +title: "内容" +--- diff --git a/exampleSite/content/tags/installation/_index.zh-cn.md b/exampleSite/content/tags/installation/_index.zh-cn.md new file mode 100644 index 0000000..74bb1b6 --- /dev/null +++ b/exampleSite/content/tags/installation/_index.zh-cn.md @@ -0,0 +1,3 @@ +--- +title: "安装" +--- 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