Remove examples of LanguageCode fallback

With v0.112.0 and later the .Language.LanguageCode methods on Page and Site fallback to .Language.Lang, so falling back in a template is superfluous.
gohugoio · May 10, 2024 · 867b4bc · 867b4bc
1 parent 774d64a
commit 867b4bc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/content/en/methods/page/AllTranslations.md b/content/en/methods/page/AllTranslations.md
@@ -63,9 +63,9 @@ And this template:
 {{ with .AllTranslations }}
   <ul>
     {{ range . }}
-      {{ $langName := or .Language.LanguageName .Language.Lang }}
-      {{ $langCode := or .Language.LanguageCode .Language.Lang }}
-      <li><a href="{{ .RelPermalink }}" hreflang="{{ $langCode }}">{{ .LinkTitle }} ({{ $langName }})</a></li>
+      <li>
+        <a href="{{ .RelPermalink }}" hreflang="{{ .Language.LanguageCode }}">{{ .LinkTitle }} ({{ or .Language.LanguageName .Language.Lang }})</a>
+      </li>
     {{ end }}
   </ul>
 {{ end }}

diff --git a/content/en/methods/page/Translations.md b/content/en/methods/page/Translations.md
@@ -60,12 +60,12 @@ content/
 And this template:
 
 ```go-html-template
-{{ with .Translations }}
+{{ with .AllTranslations }}
   <ul>
     {{ range . }}
-      {{ $langName := or .Language.LanguageName .Language.Lang }}
-      {{ $langCode := or .Language.LanguageCode .Language.Lang }}
-      <li><a href="{{ .RelPermalink }}" hreflang="{{ $langCode }}">{{ .LinkTitle }} ({{ $langName }})</a></li>
+      <li>
+        <a href="{{ .RelPermalink }}" hreflang="{{ .Language.LanguageCode }}">{{ .LinkTitle }} ({{ or .Language.LanguageName .Language.Lang }})</a>
+      </li>
     {{ end }}
   </ul>
 {{ end }}

diff --git a/content/en/methods/site/Language.md b/content/en/methods/site/Language.md
@@ -68,16 +68,10 @@ Some of the methods above are commonly used in a base template as attributes for
 
 ```go-html-template
 <html
-  lang="{{ or site.Language.LanguageCode site.Language.Lang }}" 
-  dir="{{ or site.Language.LanguageDirection `ltr` }}
+  lang="{{ .Site.Language.LanguageCode }}" 
+  dir="{{ or .Site.Language.LanguageDirection `ltr` }}
 >
 ```
 
-The example above uses the global [`site`] function instead of accessing the `Site` object via the `.Site` notation.
-
-Also note that each attribute has a fallback value assigned via the [`or`] operator.
-
 [details]: /methods/page/language/
 [RFC 5646]: https://datatracker.ietf.org/doc/html/rfc5646
-[`or`]: /functions/go-template/or/
-[`site`]: /functions/global/site/
diff --git a/content/en/templates/introduction.md b/content/en/templates/introduction.md
@@ -199,10 +199,10 @@ Remember that the piped value becomes the final argument to the function or meth
 You can split a template action over two or more lines. For example, these are equivalent:
 
 ```go-html-template
-{{ $v := or .Site.Language.LanguageCode .Site.Language.Lang }}
+{{ $v := or .Site.Language.LanguageName .Site.Language.Lang }}
 
 {{ $v := or 
-  .Site.Language.LanguageCode
+  .Site.Language.LanguageName
   .Site.Language.Lang
 }}
 ```