From 815d25ca9d7e1ef40ba9a012ee2b1ce1aa9d14b5 Mon Sep 17 00:00:00 2001 From: George Cushen Date: Fri, 27 Mar 2026 03:30:44 +0000 Subject: [PATCH] feat(hugo): replace deprecated language APIs for Hugo v0.158+ compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace site.LanguageCode → site.Language.Locale and .Language.LanguageCode → .Language.Locale in module layouts, and languageCode → locale in all template language configs. --- modules/blox/hugo.yaml | 30 +++++++++---------- .../_partials/jsonld/collectionpage.html | 2 +- .../layouts/_partials/jsonld/webpage.html | 2 +- modules/blox/layouts/_partials/site_head.html | 4 +-- modules/blox/layouts/baseof.html | 2 +- modules/blox/layouts/index.webmanifest | 2 +- modules/blox/layouts/rss.xml | 2 +- modules/slides/layouts/slides/baseof.html | 2 +- .../slides/layouts/slides/baseof.present.html | 2 +- .../config/_default/languages.yaml | 4 +-- .../config/_default/languages.yaml | 4 +-- .../config/_default/languages.yaml | 4 +-- .../config/_default/languages.yaml | 4 +-- .../config/_default/languages.yaml | 4 +-- .../resume/config/_default/languages.yaml | 4 +-- .../config/_default/languages.yaml | 4 +-- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/modules/blox/hugo.yaml b/modules/blox/hugo.yaml index 4e3d15de..fa3e19d2 100644 --- a/modules/blox/hugo.yaml +++ b/modules/blox/hugo.yaml @@ -20,7 +20,7 @@ markup: parser: # Support Latex math(?) attribute: - block: true # For callouts as quote blocks + block: true # For callouts as quote blocks title: true extensions: # Support Latex math @@ -98,12 +98,12 @@ imaging: hint: picture params: locale: - date_format: 'Jan 2, 2006' - time_format: '3:04 PM' + date_format: "Jan 2, 2006" + time_format: "3:04 PM" address_format: en-us module: hugoVersion: - min: '0.153.0' + min: "0.158.0" extended: true imports: - path: github.com/HugoBlox/kit/modules/analytics @@ -130,22 +130,22 @@ module: - source: blox target: layouts/_partials/hbx/blocks files: - - '**/block.html' + - "**/block.html" # BLOX B) Client islands (compiled with js.Build/js.Batch) - source: blox target: assets/js/hbx/blocks files: - - '**/*.js' - - '**/*.ts' - - '**/*.jsx' - - '**/*.tsx' + - "**/*.js" + - "**/*.ts" + - "**/*.jsx" + - "**/*.tsx" # BLOX C) Block-specific CSS - source: blox target: assets/css/hbx/blocks files: - - '**/*.css' + - "**/*.css" # BLOX D) Shared assets (optional) - source: blox/shared/js @@ -155,8 +155,8 @@ module: - source: blox target: assets/img/hbx/blocks files: - - '**/*.png' - - '**/*.jpg' - - '**/*.jpeg' - - '**/*.svg' - - '**/*.webp' + - "**/*.png" + - "**/*.jpg" + - "**/*.jpeg" + - "**/*.svg" + - "**/*.webp" diff --git a/modules/blox/layouts/_partials/jsonld/collectionpage.html b/modules/blox/layouts/_partials/jsonld/collectionpage.html index e3125614..225b82cd 100644 --- a/modules/blox/layouts/_partials/jsonld/collectionpage.html +++ b/modules/blox/layouts/_partials/jsonld/collectionpage.html @@ -1,7 +1,7 @@ {{- $page := .page -}} {{- $summary := .summary -}} -{{- $language := $page.Language.LanguageCode | default site.LanguageCode | default "en" -}} +{{- $language := $page.Language.Locale | default site.Language.Locale | default "en" -}} {{- $description := $summary | default ($page.Params.summary | default $page.Summary) -}} {{- $description = $description | plainify -}} diff --git a/modules/blox/layouts/_partials/jsonld/webpage.html b/modules/blox/layouts/_partials/jsonld/webpage.html index 91d22050..da119e17 100644 --- a/modules/blox/layouts/_partials/jsonld/webpage.html +++ b/modules/blox/layouts/_partials/jsonld/webpage.html @@ -1,7 +1,7 @@ {{- $page := .page -}} {{- $summary := .summary -}} -{{- $language := $page.Language.LanguageCode | default site.LanguageCode | default "en" -}} +{{- $language := $page.Language.Locale | default site.Language.Locale | default "en" -}} {{- $description := $summary | default ($page.Params.summary | default $page.Summary) -}} {{- $description = $description | plainify -}} diff --git a/modules/blox/layouts/_partials/site_head.html b/modules/blox/layouts/_partials/site_head.html index 44bd7dc1..b8f5c5a4 100644 --- a/modules/blox/layouts/_partials/site_head.html +++ b/modules/blox/layouts/_partials/site_head.html @@ -52,7 +52,7 @@ {{ range .Translations }} {{ end }} - + {{/* Hugo Blox Theme Engine Initialization */}} {{/* Uses get_theme_config helper for backward-compatible config resolution */}} @@ -182,7 +182,7 @@ {{- end -}} - + {{ if .IsPage }} {{ if not .PublishDate.IsZero }} {{ "" | safeHTML }} {{ printf "" (now | time.Format ":date_long") | safeHTML }} -{{- $language_code := site.LanguageCode | default "en-us" -}} +{{- $language_code := site.Language.Locale | default "en-us" -}} diff --git a/modules/blox/layouts/index.webmanifest b/modules/blox/layouts/index.webmanifest index 8c76b459..2a158039 100644 --- a/modules/blox/layouts/index.webmanifest +++ b/modules/blox/layouts/index.webmanifest @@ -3,7 +3,7 @@ { "name": "{{site.Title}}", "short_name": "{{site.Title}}", - "lang": "{{ site.LanguageCode | default "en-us" }}", + "lang": "{{ site.Language.Locale | default "en-us" }}", "theme_color": "{{ $theme_color }}", "background_color": "{{ $theme_color }}", "icons": [{ diff --git a/modules/blox/layouts/rss.xml b/modules/blox/layouts/rss.xml index 7e0bb4d5..c3baf6ea 100644 --- a/modules/blox/layouts/rss.xml +++ b/modules/blox/layouts/rss.xml @@ -16,7 +16,7 @@ {{ end -}} {{ .Title | default site.Title }} HugoBlox Kit (https://hugoblox.com) - {{- with site.LanguageCode }}{{.}}{{end -}} + {{- with site.Language.Locale }}{{.}}{{end -}} {{- with site.Copyright }}{{ replace (replace . "{year}" now.Year) "©" "©" | plainify }}{{end -}} {{- if not .Date.IsZero }}{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end -}} {{- if .Scratch.Get "og_image" }} diff --git a/modules/slides/layouts/slides/baseof.html b/modules/slides/layouts/slides/baseof.html index 8e2352ea..ed84df90 100644 --- a/modules/slides/layouts/slides/baseof.html +++ b/modules/slides/layouts/slides/baseof.html @@ -4,7 +4,7 @@ */}} -{{- $language_code := site.LanguageCode | default "en-us" -}} +{{- $language_code := site.Language.Locale | default "en-us" -}} diff --git a/modules/slides/layouts/slides/baseof.present.html b/modules/slides/layouts/slides/baseof.present.html index 8c5776c0..2bd285d0 100644 --- a/modules/slides/layouts/slides/baseof.present.html +++ b/modules/slides/layouts/slides/baseof.present.html @@ -21,7 +21,7 @@ */}} -{{- $language_code := site.LanguageCode | default "en-us" -}} +{{- $language_code := site.Language.Locale | default "en-us" -}} diff --git a/templates/academic-cv/config/_default/languages.yaml b/templates/academic-cv/config/_default/languages.yaml index 88fa733d..11a461f2 100644 --- a/templates/academic-cv/config/_default/languages.yaml +++ b/templates/academic-cv/config/_default/languages.yaml @@ -4,13 +4,13 @@ # Default language en: - languageCode: en-us + locale: en-us # Uncomment for multi-lingual sites, and move English content into `en` sub-folder. #contentDir: content/en # Uncomment the lines below to configure your website in a second language. #zh: -# languageCode: zh-Hans +# locale: zh-Hans # contentDir: content/zh # title: Chinese website title... # params: diff --git a/templates/data-science-blog/config/_default/languages.yaml b/templates/data-science-blog/config/_default/languages.yaml index 88fa733d..11a461f2 100644 --- a/templates/data-science-blog/config/_default/languages.yaml +++ b/templates/data-science-blog/config/_default/languages.yaml @@ -4,13 +4,13 @@ # Default language en: - languageCode: en-us + locale: en-us # Uncomment for multi-lingual sites, and move English content into `en` sub-folder. #contentDir: content/en # Uncomment the lines below to configure your website in a second language. #zh: -# languageCode: zh-Hans +# locale: zh-Hans # contentDir: content/zh # title: Chinese website title... # params: diff --git a/templates/dev-portfolio/config/_default/languages.yaml b/templates/dev-portfolio/config/_default/languages.yaml index 88fa733d..11a461f2 100644 --- a/templates/dev-portfolio/config/_default/languages.yaml +++ b/templates/dev-portfolio/config/_default/languages.yaml @@ -4,13 +4,13 @@ # Default language en: - languageCode: en-us + locale: en-us # Uncomment for multi-lingual sites, and move English content into `en` sub-folder. #contentDir: content/en # Uncomment the lines below to configure your website in a second language. #zh: -# languageCode: zh-Hans +# locale: zh-Hans # contentDir: content/zh # title: Chinese website title... # params: diff --git a/templates/documentation/config/_default/languages.yaml b/templates/documentation/config/_default/languages.yaml index 88fa733d..11a461f2 100644 --- a/templates/documentation/config/_default/languages.yaml +++ b/templates/documentation/config/_default/languages.yaml @@ -4,13 +4,13 @@ # Default language en: - languageCode: en-us + locale: en-us # Uncomment for multi-lingual sites, and move English content into `en` sub-folder. #contentDir: content/en # Uncomment the lines below to configure your website in a second language. #zh: -# languageCode: zh-Hans +# locale: zh-Hans # contentDir: content/zh # title: Chinese website title... # params: diff --git a/templates/link-in-bio/config/_default/languages.yaml b/templates/link-in-bio/config/_default/languages.yaml index 88fa733d..11a461f2 100644 --- a/templates/link-in-bio/config/_default/languages.yaml +++ b/templates/link-in-bio/config/_default/languages.yaml @@ -4,13 +4,13 @@ # Default language en: - languageCode: en-us + locale: en-us # Uncomment for multi-lingual sites, and move English content into `en` sub-folder. #contentDir: content/en # Uncomment the lines below to configure your website in a second language. #zh: -# languageCode: zh-Hans +# locale: zh-Hans # contentDir: content/zh # title: Chinese website title... # params: diff --git a/templates/resume/config/_default/languages.yaml b/templates/resume/config/_default/languages.yaml index 88fa733d..11a461f2 100644 --- a/templates/resume/config/_default/languages.yaml +++ b/templates/resume/config/_default/languages.yaml @@ -4,13 +4,13 @@ # Default language en: - languageCode: en-us + locale: en-us # Uncomment for multi-lingual sites, and move English content into `en` sub-folder. #contentDir: content/en # Uncomment the lines below to configure your website in a second language. #zh: -# languageCode: zh-Hans +# locale: zh-Hans # contentDir: content/zh # title: Chinese website title... # params: diff --git a/templates/startup-landing-page/config/_default/languages.yaml b/templates/startup-landing-page/config/_default/languages.yaml index 88fa733d..11a461f2 100644 --- a/templates/startup-landing-page/config/_default/languages.yaml +++ b/templates/startup-landing-page/config/_default/languages.yaml @@ -4,13 +4,13 @@ # Default language en: - languageCode: en-us + locale: en-us # Uncomment for multi-lingual sites, and move English content into `en` sub-folder. #contentDir: content/en # Uncomment the lines below to configure your website in a second language. #zh: -# languageCode: zh-Hans +# locale: zh-Hans # contentDir: content/zh # title: Chinese website title... # params: