diff --git a/exampleSite/config/_default/config.toml b/exampleSite/config/_default/config.toml index c5cde5f9e7..da385d8a41 100644 --- a/exampleSite/config/_default/config.toml +++ b/exampleSite/config/_default/config.toml @@ -24,9 +24,6 @@ themesdir = "../.." # use this theme ;-) theme = "hugo-theme-relearn" -# the main language of this site; also an automatic pirrrate translation is -# available in this showcase -languageCode = "en" # make sure your defaultContentLanguage is the first one in the [languages] # array below, as the theme needs to make assumptions on it defaultContentLanguage = "en" @@ -126,6 +123,7 @@ title = "Hugo Relearn Theme" [languages.pir] title = "Cap'n Hugo Relearrrn Theme" weight = 2 + languageCode = "art-pir" languageName = "Arrr! ☠ Pirrrates ☠" # Language dependend settings: # Use case https://gohugo.io/content-management/multilingual/#translation-by-content-directory diff --git a/exampleSite/layouts/partials/shortcodes/piratify.html b/exampleSite/layouts/partials/shortcodes/piratify.html index b169338a1a..67780e95ce 100644 --- a/exampleSite/layouts/partials/shortcodes/piratify.html +++ b/exampleSite/layouts/partials/shortcodes/piratify.html @@ -7,7 +7,7 @@ {{- $pagefield := cond (ne $content nil) nil (.pagefield | default "Content") }} {{- $writenotice := cond (ne .writenotice nil) .writenotice false }} {{- $langtrg := "pir" }} -{{- $langsrc := cond (eq $page.Lang $langtrg) (.langsrc | default "en") $page.Lang }} +{{- $langsrc := cond (eq $page.Language.Lang $langtrg) (.langsrc | default "en") $page.Language.Lang }} {{- $baseURL := urls.Parse site.BaseURL }} {{- $baseURLpath := $baseURL.Path | default "/" }} {{- $l := $page.RelPermalink }} @@ -34,7 +34,7 @@ {{- break }} {{- end }} {{- end }} -{{- if eq $page.Lang $langtrg }} +{{- if eq $page.Language.Lang $langtrg }} {{- if $writenotice }} {{- partial "shortcodes/notice.html" (dict "page" $page diff --git a/layouts/404.html b/layouts/404.html index ae11b79c7a..0e88daa76c 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,7 +1,7 @@ {{- partialCached "page-meta.hugo" . .RelPermalink }} {{- $outputFormat := partial "output-format.hugo" . }} - + {{- partial "meta.html" . }} {{- $title := .Title }} diff --git a/layouts/_default/sitemap.xml b/layouts/_default/sitemap.xml index d833ae4788..6de9ad1008 100644 --- a/layouts/_default/sitemap.xml +++ b/layouts/_default/sitemap.xml @@ -19,7 +19,7 @@ {{- if eq $index 0 }} {{- end }} - + {{- end }} {{- end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index ce1fc1e228..74069ab95c 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -11,7 +11,7 @@ {{- errorf "The Relearn theme requires Hugo %s or later" $hugoVersion }} {{- end }} {{- end }} - + {{- partial "meta.html" . }} {{- $page := . }} @@ -39,7 +39,7 @@ {{- if eq $index 0 }} {{- end }} - + {{- end }} {{- end }} diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index 6149cc10fd..ecc193d8d9 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -75,18 +75,9 @@ diff --git a/layouts/partials/search.html b/layouts/partials/search.html index 95074c6586..46ad875e29 100644 --- a/layouts/partials/search.html +++ b/layouts/partials/search.html @@ -11,7 +11,7 @@ {{ if $link }}{{ end }} {{- $assetBusting := not .Site.Params.disableAssetsBusting }} - {{- $pageBaseLang := replaceRE "([a-z]+).*" "${1}" .Page.Lang }} + {{- $pageBaseLang := replaceRE "([a-z]+).*" "${1}" .Page.Language.LanguageCode }} {{- $contentlangs := (union (slice | append (.Site.Params.additionalContentLanguage | default slice)) (slice $pageBaseLang)) }} {{- $quotedcontentlangs := slice }} {{- $missingcontentlangs := slice }} diff --git a/layouts/partials/shortcodes/attachments.html b/layouts/partials/shortcodes/attachments.html index 893066cc06..fe8e12526d 100644 --- a/layouts/partials/shortcodes/attachments.html +++ b/layouts/partials/shortcodes/attachments.html @@ -33,7 +33,7 @@ {{- $pattern := .pattern | default "" }} {{- $defaultUrlPrefix := strings.TrimRight "/" $page.RelPermalink }} {{- if .IsTranslated -}} - {{- $defaultLanguage := (index $page.Site.Home.AllTranslations 0).Lang }} + {{- $defaultLanguage := (index $page.Site.Home.AllTranslations 0).Language.Lang }} {{- $defaultLanguagePage := index (where $page.AllTranslations "Language.Lang" $defaultLanguage) 0 }} {{- $defaultUrlPrefix = strings.TrimRight "/" $defaultLanguagePage.RelPermalink }} {{- end }}