diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ddbecc8bb..995492992 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - name: Install node modules run: npm install @@ -40,7 +40,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - name: Install node modules run: npm install diff --git a/assets/scripts/pages/single.js b/assets/scripts/pages/single.js index 717ae6d06..c145c536c 100644 --- a/assets/scripts/pages/single.js +++ b/assets/scripts/pages/single.js @@ -15,7 +15,7 @@ window.addEventListener('DOMContentLoaded', () => { } } - // =============== Make TOC Compatible wit Bootstrap Scroll Spy ======== + // =============== Make TOC Compatible with Bootstrap Scroll Spy ======== // add "navbar" class to the "nav" element const toc = document.getElementById('TableOfContents') if (toc) { diff --git a/assets/scripts/sections/achievements.js b/assets/scripts/sections/achievements.js index 1ba49fc00..e8358752c 100644 --- a/assets/scripts/sections/achievements.js +++ b/assets/scripts/sections/achievements.js @@ -1,6 +1,6 @@ import { getDeviceState } from '../core' -function fourColumRow (gallery, entries, i) { +function fourColumnRow (gallery, entries, i) { const entry1 = document.createElement('div') entry1.classList.add('col-lg-6', 'm-0', 'p-0') entry1.appendChild(entries[i].cloneNode(true)) @@ -140,7 +140,7 @@ function showAchievements () { if (isLaptop) { if (i + 4 <= len) { if (rowNumber % 2) { - fourColumRow(gallery, entries, i) + fourColumnRow(gallery, entries, i) } else { fourColumnReversedRow(gallery, entries, i) } diff --git a/assets/styles/override.scss b/assets/styles/override.scss index 7772f0221..2fcf7136e 100644 --- a/assets/styles/override.scss +++ b/assets/styles/override.scss @@ -1,6 +1,6 @@ /* override this file for custom css */ -/* you can import boostrap mixins */ +/* you can import bootstrap mixins */ // @import 'bootstrap/scss/mixins'; // Example usage // .some-class { diff --git a/content/notes/search.bn.md b/content/notes/search.bn.md index ba89a8acc..4ff1787a0 100644 --- a/content/notes/search.bn.md +++ b/content/notes/search.bn.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.cn.md b/content/notes/search.cn.md index a694d38d8..3965696d4 100644 --- a/content/notes/search.cn.md +++ b/content/notes/search.cn.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.de.md b/content/notes/search.de.md index a694d38d8..3965696d4 100644 --- a/content/notes/search.de.md +++ b/content/notes/search.de.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.fr.md b/content/notes/search.fr.md index a694d38d8..3965696d4 100644 --- a/content/notes/search.fr.md +++ b/content/notes/search.fr.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.hi.md b/content/notes/search.hi.md index a694d38d8..3965696d4 100644 --- a/content/notes/search.hi.md +++ b/content/notes/search.hi.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.id.md b/content/notes/search.id.md index a694d38d8..3965696d4 100644 --- a/content/notes/search.id.md +++ b/content/notes/search.id.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.it.md b/content/notes/search.it.md index a694d38d8..3965696d4 100644 --- a/content/notes/search.it.md +++ b/content/notes/search.it.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.jp.md b/content/notes/search.jp.md index a694d38d8..3965696d4 100644 --- a/content/notes/search.jp.md +++ b/content/notes/search.jp.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.ko.md b/content/notes/search.ko.md index a694d38d8..3965696d4 100644 --- a/content/notes/search.ko.md +++ b/content/notes/search.ko.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.md b/content/notes/search.md index d8fe7e9a5..349c9a4f0 100644 --- a/content/notes/search.md +++ b/content/notes/search.md @@ -24,7 +24,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.ru.md b/content/notes/search.ru.md index a694d38d8..3965696d4 100644 --- a/content/notes/search.ru.md +++ b/content/notes/search.ru.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/notes/search.vn.md b/content/notes/search.vn.md index a694d38d8..3965696d4 100644 --- a/content/notes/search.vn.md +++ b/content/notes/search.vn.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.bn.md b/content/search/search.bn.md index ba89a8acc..4ff1787a0 100644 --- a/content/search/search.bn.md +++ b/content/search/search.bn.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.cn.md b/content/search/search.cn.md index a694d38d8..3965696d4 100644 --- a/content/search/search.cn.md +++ b/content/search/search.cn.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.de.md b/content/search/search.de.md index a694d38d8..783188fbe 100644 --- a/content/search/search.de.md +++ b/content/search/search.de.md @@ -1,5 +1,5 @@ --- -title: "Search Results" +title: "Suchergebnisse" date: 2010-06-08T08:06:25+06:00 weight: 999999 sitemap: @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.fr.md b/content/search/search.fr.md index a694d38d8..3965696d4 100644 --- a/content/search/search.fr.md +++ b/content/search/search.fr.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.hi.md b/content/search/search.hi.md index a694d38d8..3965696d4 100644 --- a/content/search/search.hi.md +++ b/content/search/search.hi.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.id.md b/content/search/search.id.md index a694d38d8..3965696d4 100644 --- a/content/search/search.id.md +++ b/content/search/search.id.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.it.md b/content/search/search.it.md index a694d38d8..3965696d4 100644 --- a/content/search/search.it.md +++ b/content/search/search.it.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.jp.md b/content/search/search.jp.md index a694d38d8..3965696d4 100644 --- a/content/search/search.jp.md +++ b/content/search/search.jp.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.ko.md b/content/search/search.ko.md index a694d38d8..3965696d4 100644 --- a/content/search/search.ko.md +++ b/content/search/search.ko.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.md b/content/search/search.md index a694d38d8..3965696d4 100644 --- a/content/search/search.md +++ b/content/search/search.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.ru.md b/content/search/search.ru.md index a694d38d8..3965696d4 100644 --- a/content/search/search.ru.md +++ b/content/search/search.ru.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/content/search/search.vn.md b/content/search/search.vn.md index a694d38d8..3965696d4 100644 --- a/content/search/search.vn.md +++ b/content/search/search.vn.md @@ -26,7 +26,7 @@ Search depends on additional output content type of JSON in config.toml home = ["HTML", "JSON"] \``` -## Searching additional fileds +## Searching additional fields To search additional fields defined in front matter, you must add it in 2 places. diff --git a/exampleSite/go.mod b/exampleSite/go.mod index e2b9b7ccd..06dc58ffa 100644 --- a/exampleSite/go.mod +++ b/exampleSite/go.mod @@ -3,8 +3,8 @@ module github.com/hugo-toha/toha/exampleSite go 1.19 require ( - github.com/hugo-toha/hugo-toha.github.io v0.0.0-20231031082630-2c32a26d2207 // indirect - github.com/hugo-toha/toha/v4 v4.0.0-20231113175302-e5230e8c93d8 // indirect + github.com/hugo-toha/hugo-toha.github.io v0.0.0-20240319164719-d8a7e99b594d // indirect + github.com/hugo-toha/toha/v4 v4.4.0 // indirect ) replace github.com/hugo-toha/toha/v4 => ../ diff --git a/exampleSite/go.sum b/exampleSite/go.sum index 9101a35b7..77eca3cd6 100644 --- a/exampleSite/go.sum +++ b/exampleSite/go.sum @@ -1,2 +1,4 @@ -github.com/hugo-toha/hugo-toha.github.io v0.0.0-20231031082630-2c32a26d2207 h1:T71lEaGpHYpdy8yKM5vaVwm+CJGt8wjHvPgVM+GjCJM= -github.com/hugo-toha/hugo-toha.github.io v0.0.0-20231031082630-2c32a26d2207/go.mod h1:aTn1lQX1rbcbfbwNuWHG/L5DPtD+bEzQro49QyFlbEg= +github.com/hugo-toha/hugo-toha.github.io v0.0.0-20240319164719-d8a7e99b594d h1:TWNaAG2e1EZDvtl64fjyriR/qc8m7qaKnN13DgKzkFk= +github.com/hugo-toha/hugo-toha.github.io v0.0.0-20240319164719-d8a7e99b594d/go.mod h1:BRsZS1LeIc+eSM2OWSOeXDNeZUNRcTlJtw1bL874AfQ= +github.com/hugo-toha/toha/v4 v4.4.0 h1:RdRpjfsPgE+VXb/m3Rl+1n86pVZTrplsDvtXYK3wNh0= +github.com/hugo-toha/toha/v4 v4.4.0/go.mod h1:p/K34lqlqmhzfPd4cx66od7sjlROBqhMxG30mJz+aKQ= diff --git a/exampleSite/config.yaml b/exampleSite/hugo.yaml similarity index 100% rename from exampleSite/config.yaml rename to exampleSite/hugo.yaml diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 9485de38b..80ef106da 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -4,7 +4,7 @@ {{ define "sidebar" }} {{ $homePage:="#" }} - {{ if site.IsMultiLingual }} + {{ if hugo.IsMultilingual }} {{ $homePage = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }} {{ end }} diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 0e5e0d0c0..3c59b4307 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -19,9 +19,9 @@ {{ .Permalink }} Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }} Hugo -- gohugo.io{{ with .Site.LanguageCode }} - {{.}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Copyright }} + {{.}}{{end}}{{ with .Site.Params.Author.email }} + {{.}}{{ with $.Site.Params.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Params.Author.email }} + {{.}}{{ with $.Site.Params.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Copyright }} {{.}}{{end}}{{ if not .Date.IsZero }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} {{- with .OutputFormats.Get "RSS" -}} @@ -33,7 +33,7 @@ {{ .Title }} {{ .Permalink }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} + {{ with .Site.Params.Author.email }}{{.}}{{ with $.Site.Params.Author.name }} ({{.}}){{end}}{{end}} {{ .Permalink }} {{ .Summary | html }} diff --git a/layouts/_default/search.html b/layouts/_default/search.html index 371c80899..cfbdf8522 100644 --- a/layouts/_default/search.html +++ b/layouts/_default/search.html @@ -4,7 +4,7 @@ {{ define "sidebar" }} {{ $homePage:="#" }} - {{ if site.IsMultiLingual }} + {{ if hugo.IsMultilingual }} {{ $homePage = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }} {{ end }} diff --git a/layouts/categories/list.html b/layouts/categories/list.html index 5a79b8fd2..feca7bff4 100644 --- a/layouts/categories/list.html +++ b/layouts/categories/list.html @@ -4,7 +4,7 @@ {{ define "sidebar" }} {{ $homePage:="#" }} - {{ if site.IsMultiLingual }} + {{ if hugo.IsMultilingual }} {{ $homePage = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }} {{ end }} diff --git a/layouts/notes/list.html b/layouts/notes/list.html index 4dea0f0f9..649229187 100644 --- a/layouts/notes/list.html +++ b/layouts/notes/list.html @@ -4,7 +4,7 @@ {{ define "sidebar" }} {{ $homePage:="#" }} - {{ if site.IsMultiLingual }} + {{ if hugo.IsMultilingual }} {{ $homePage = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }} {{ end }} diff --git a/layouts/notes/single.html b/layouts/notes/single.html index c4a0bc525..6f5d35c72 100644 --- a/layouts/notes/single.html +++ b/layouts/notes/single.html @@ -4,7 +4,7 @@ {{ define "sidebar" }} {{ $homePage:="#" }} - {{ if site.IsMultiLingual }} + {{ if hugo.IsMultilingual }} {{ $homePage = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }} {{ end }} diff --git a/layouts/partials/helpers/get-author-name.html b/layouts/partials/helpers/get-author-name.html index d19c0cfbf..5b4c2c851 100644 --- a/layouts/partials/helpers/get-author-name.html +++ b/layouts/partials/helpers/get-author-name.html @@ -1,7 +1,7 @@ {{/* Uses the top level site's config for a single author across all locales */}} {{ $authorName:= site.Params.author.name }} -{{/* Overrides with the locale specifc author if provided */}} +{{/* Overrides with the locale specific author if provided */}} {{ if (index site.Data site.Language.Lang).author }} {{ $authorName = (index site.Data site.Language.Lang).author.name }} {{ end }} diff --git a/layouts/partials/navigators/lang-selector.html b/layouts/partials/navigators/lang-selector.html index 162247adc..2f5c94c5b 100644 --- a/layouts/partials/navigators/lang-selector.html +++ b/layouts/partials/navigators/lang-selector.html @@ -1,5 +1,5 @@ {{ $pageURL:= .RelPermalink }} -{{ if site.IsMultiLingual }} +{{ if hugo.IsMultilingual }} {{ $pageURL = strings.TrimPrefix (path.Join "/" .Language.Lang) $pageURL }} {{ end }}