From 3242dbf2fb4eef33d8a24c9385b2ab5f38cd8e4c Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Thu, 16 Jul 2026 12:44:43 +0800 Subject: [PATCH] feat: compatible with Hugo 0.158.0+ for language methods --- layouts/_partials/base/comment.html | 8 ++++---- layouts/_partials/base/header.html | 6 +++--- layouts/_partials/init/index.html | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/layouts/_partials/base/comment.html b/layouts/_partials/base/comment.html index 5ab498e9..71eed281 100644 --- a/layouts/_partials/base/comment.html +++ b/layouts/_partials/base/comment.html @@ -157,7 +157,7 @@ {{- dict "Source" $source "Fingerprint" $fingerprint | dict "Page" . "Data" | partial "store/script.html" -}} {{- dict "Source" "js/lib/valine.ts" "Build" true "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "store/script.html" -}} {{- /* Valine lang: https://github.com/xCss/Valine */ -}} - {{- $valineLang := $valine.lang | default .Lang -}} + {{- $valineLang := $valine.lang | default .Language.Name -}} {{- $valineLangs := dict "zh-cn" "zh-cn" "zh-tw" "zh-tw" "en" "en" "en-us" "en" "en-gb" "en" "ja" "ja" "ko" "ko" "ru" "ru" "fr" "fr" "pt-br" "pt" -}} {{- $valineLang = or (index $valineLangs $valineLang) (index $valineLangs (index (split $valineLang "-") 0)) "en" -}} {{- $commentConfig = dict "el" "#valine" "appId" $valine.appId "appKey" $valine.appKey "lang" $valineLang "visitor" $valine.visitor "recordIP" $valine.recordIP "placeholder" ($valine.placeholder | default (T "comment.valinePlaceholder")) "highlight" (ne $valine.highlight false) "enableQQ" $valine.enableQQ | dict "valine" | merge $commentConfig -}} @@ -192,7 +192,7 @@ {{- $source := $cdn.walineJS | default "lib/waline/waline.umd.js" -}} {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "store/script.html" -}} {{- dict "Source" "js/lib/waline.ts" "Build" true "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "store/script.html" -}} - {{- $commentConfig = dict "el" "#waline" "serverURL" $waline.serverURL "lang" .Lang | dict "waline" | merge $commentConfig -}} + {{- $commentConfig = dict "el" "#waline" "serverURL" $waline.serverURL "lang" .Language.Name | dict "waline" | merge $commentConfig -}} {{- $commentConfig = dict "copyright" true "imageUploader" false "highlighter" false "texRenderer" false "search" false | dict "waline" | merge $commentConfig -}} {{- with $waline.pageview -}} {{- $commentConfig = dict "pageview" . | dict "waline" | merge $commentConfig -}} @@ -255,7 +255,7 @@ data-numposts="{{ $facebook.numPosts }}" > {{- /* Facebook locale: https://developers.facebook.com/docs/internationalization */ -}} - {{- $fbLang := $facebook.languageCode | default .Lang -}} + {{- $fbLang := $facebook.languageCode | default .Language.Name -}} {{- $fbLangs := dict "zh" "zh_CN" "zh-cn" "zh_CN" "zh-tw" "zh_TW" "en" "en_US" "ja" "ja_JP" "ko" "ko_KR" "fr" "fr_FR" "de" "de_DE" "es" "es_ES" "pt" "pt_BR" "pt-br" "pt_BR" "ru" "ru_RU" "it" "it_IT" "hi" "hi_IN" "pl" "pl_PL" "ro" "ro_RO" "sr" "sr_RS" "vi" "vi_VN" -}} {{- $fbLang = or (index $fbLangs $fbLang) (index $fbLangs (index (split $fbLang "-") 0)) "en_US" -}} {{- $source := printf "https://connect.facebook.net/%v/sdk.js#xfbml=1&version=v5.0&appId=%v&autoLogAppEvents=1" $fbLang $facebook.appId -}} @@ -325,7 +325,7 @@ {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "store/script.html" -}} {{- dict "Source" "js/lib/twikoo.ts" "Build" true "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "store/script.html" -}} {{- /* Twikoo lang: https://github.com/twikoojs/twikoo/blob/main/src/client/utils/i18n/index.js */ -}} - {{- $lang := $twikoo.lang | default .Lang -}} + {{- $lang := $twikoo.lang | default .Language.Name -}} {{- $langs := slice "zh" "zh-cn" "zh-hk" "zh-tw" "en" "en-us" "en-gb" "uz" "ja" "ja-jp" "ko" "ko-kr" "vi" "vi-vn" "pt" "hr" -}} {{- $base := index (split $lang "-") 0 -}} {{- $lang = or (and (in $langs $lang) $lang) (and (in $langs $base) $base) "en" -}} diff --git a/layouts/_partials/base/header.html b/layouts/_partials/base/header.html index 90c216bb..5b29d91e 100644 --- a/layouts/_partials/base/header.html +++ b/layouts/_partials/base/header.html @@ -120,7 +120,7 @@ {{- if ne . $.Site -}} {{- $link := printf "%v/404.html" .LanguagePrefix -}}
  • - + {{- .Language.Label -}}
    • @@ -129,7 +129,7 @@ {{- else if .IsTranslated -}} {{- range .AllTranslations -}}
  • - {{- if ne .Lang $.Lang -}} + {{- if ne .Language.Name $.Language.Name -}} {{ .Language.Label }} {{- else -}} {{ .Language.Label }} @@ -284,7 +284,7 @@ {{- end -}} {{- else if .IsTranslated -}} {{- range .AllTranslations -}} - {{- end -}} diff --git a/layouts/_partials/init/index.html b/layouts/_partials/init/index.html index 6672618f..fa7cc139 100644 --- a/layouts/_partials/init/index.html +++ b/layouts/_partials/init/index.html @@ -1,4 +1,4 @@ -{{- hugo.Store.Set "version" "v1.0.0-mrmd49g5" -}} +{{- hugo.Store.Set "version" "v1.0.0-mrn0yyrp" -}} {{- .Store.Set "this" dict -}} {{- partial "init/detection-env.html" . -}}