diff --git a/demo/config/_default/hugo.toml b/demo/config/_default/hugo.toml index 58faa84..646da2a 100644 --- a/demo/config/_default/hugo.toml +++ b/demo/config/_default/hugo.toml @@ -1,5 +1,5 @@ baseURL = "https://demo.stack.cai.im/" -languageCode = "en-us" +locale = "en-us" title = "Hugo Theme Stack" # Theme i18n support # See i18n folder for available languages diff --git a/demo/config/_default/languages.toml b/demo/config/_default/languages.toml index d77bf36..bba9268 100644 --- a/demo/config/_default/languages.toml +++ b/demo/config/_default/languages.toml @@ -1,31 +1,31 @@ [en] - languageName = "English" - title = "Hugo Theme Stack" - weight = 1 + label = "English" + title = "Hugo Theme Stack" + weight = 1 [en.params.sidebar] subtitle = "Card-style Hugo theme designed for bloggers" [zh] - languageName = "简体中文" - title = "Hugo 主题 Stack" - weight = 2 + label = "简体中文" + title = "Hugo 主题 Stack" + weight = 2 [zh.params.sidebar] subtitle = "为博客设计的卡片式 Hugo 主题" [zh-hant-tw] - languageName = "正體中文" - title = "Hugo 主題 Stack" - weight = 3 + label = "正體中文" + title = "Hugo 主題 Stack" + weight = 3 [zh-hant-tw.params.sidebar] subtitle = "為博客設計的卡片式 Hugo 主題" [ja] - languageName = "日本語" - title = "Hugo Theme Stack" - weight = 4 + label = "日本語" + title = "Hugo Theme Stack" + weight = 4 [ja.params.sidebar] subtitle = "ブログ用のカードスタイルの Hugo テーマ" diff --git a/layouts/_partials/article/components/details.html b/layouts/_partials/article/components/details.html index f145819..b311ec5 100644 --- a/layouts/_partials/article/components/details.html +++ b/layouts/_partials/article/components/details.html @@ -58,7 +58,7 @@
{{ partial "helper/icon" "language" }} {{ range $Page.Translations }} - {{ .Language.LanguageName }} + {{ .Language.Label }} {{ end }}
{{ end }} diff --git a/layouts/_partials/sidebar/left.html b/layouts/_partials/sidebar/left.html index 8319a49..1730f22 100644 --- a/layouts/_partials/sidebar/left.html +++ b/layouts/_partials/sidebar/left.html @@ -64,7 +64,7 @@ {{ end }}
    • - {{- $currentLanguageCode := .Language.Lang -}} + {{- $currentLanguageCode := .Language.Name -}} {{ if hugo.IsMultilingual }}
    1. {{ partial "helper/icon" "language" }} @@ -72,11 +72,11 @@ {{ range .Site.Home.AllTranslations }} {{ $target := . }} {{ range $.AllTranslations }} - {{ if eq .Language.Lang $target.Language.Lang }} + {{ if eq .Language.Name $target.Language.Name }} {{ $target = . }} {{ end }} {{ end }} - + {{ end }}
      2. diff --git a/layouts/baseof.html b/layouts/baseof.html index 83fdaa3..d1ef3ee 100644 --- a/layouts/baseof.html +++ b/layouts/baseof.html @@ -1,5 +1,5 @@ - + {{- partial "head/head.html" . -}} {{- block "head" . -}}{{ end }} diff --git a/layouts/rss.xml b/layouts/rss.xml index 1f13ac6..dbb6ed1 100644 --- a/layouts/rss.xml +++ b/layouts/rss.xml @@ -30,7 +30,7 @@ {{ .Permalink }} Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{ . }} {{ end }}{{ end }}on {{ .Site.Title }} Hugo -- gohugo.io - {{ site.Language.LanguageCode }}{{ with $authorEmail }} + {{ site.Language.Locale }}{{ with $authorEmail }} {{.}}{{ with $authorName }} ({{ . }}){{ end }}{{ end }}{{ with $authorEmail }} {{ . }}{{ with $authorName }} ({{ . }}){{ end }}{{ end }}{{ with .Site.Copyright }} {{ . }}{{ end }}{{ if not .Date.IsZero }}