trying to fix language codes

tobihagemann · tobihagemann · commit f4055709cd15 · 2025-04-14T15:57:13.000+02:00
diff --git a/hugo.toml b/hugo.toml
@@ -1,18 +1,17 @@
 baseURL = "https://cryptomator.org/"
 title = "Cryptomator"
-languageCode = "en-us"
-DefaultContentLanguage = "en"
+defaultContentLanguage = "en"
 enableemoji = true
 
 [languages]
   [languages.en]
     weight = 1
     languageName = "English"
-    languageCode = "en_US"
+    languageCode = "en-US"
   [languages.de]
     weight = 2
     languageName = "Deutsch"
-    languageCode = "de_DE"
+    languageCode = "de-DE"
 
 [build]
   [[build.cachebusters]]
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -10,13 +10,13 @@
     <link rel="preload" fetchpriority="low" as="image" href="/img/logo.svg" type="image/svg+xml">
     <link rel="preload" fetchpriority="low" href="/webfonts/fa-brands-400.woff2" as="font" type="font/woff2" crossorigin="anonymous">
     <link rel="preload" fetchpriority="low" href="/webfonts/fa-solid-900.woff2" as="font" type="font/woff2" crossorigin="anonymous">
+    <meta property="og:url" content="{{ .Permalink }}">
+    <meta property="og:site_name" content="{{ .Site.Title }}">
     {{ if and (eq .Section "blog") .IsPage }}
       <meta name="description" content="{{ .Summary }}">
       <meta name="fediverse:creator" content="@cryptomator@mastodon.online">
       <meta property="og:title" content="{{ .Title }}">
       <meta property="og:type" content="article" />
-      <meta property="og:url" content="{{ .Permalink }}">
-      <meta property="og:site_name" content="{{ .Site.Title }}">
       <meta property="og:description" content="{{ .Summary }}">
       <meta property="article:author" content="{{ with .Params.Author }}{{ . }}{{ else }}Cryptobot{{ end }}" />
       <meta property="article:published_time" content="{{ dateFormat "2006-01-02" .Params.Date }}" />
@@ -28,15 +28,11 @@
       <meta name="fediverse:creator" content="@cryptomator@mastodon.online">
       <meta property="og:title" content="{{ .Title }}">
       <meta property="og:type" content="article" />
-      <meta property="og:url" content="{{ .Permalink }}">
-      <meta property="og:site_name" content="{{ .Site.Title }}">
       <meta property="og:description" content="{{ .Params.Description }}">
     {{ else }}
       <meta name="description" content="{{ with .Params.Description }}{{ . }}{{ else }}{{ i18n "site_meta_description" }}{{ end }}"/>
       <meta property="og:title" content="{{ if not .IsHome }}Cryptomator - {{ end }}{{ .Title }}"/>
       <meta property="og:type" content="website" />
-      <meta property="og:url" content="{{ .Permalink }}"/>
-      <meta property="og:site_name" content="{{ .Site.Title }}"/>
       <meta property="og:description" content="{{ with .Params.Description }}{{ . }}{{ else }}{{ i18n "site_meta_description" }}{{ end }}"/>
     {{ end }}
     {{ if .Params.Ogimage }}
@@ -48,9 +44,9 @@
       <meta property="og:image:width" content="1200" />
       <meta property="og:image:height" content="630" />
     {{ end }}
-    <meta property="og:locale" content="{{ .Site.Language.Params.LanguageCode }}" />
+    <meta property="og:locale" content="{{ replace .Site.Language.LanguageCode "-" "_" }}" />
     {{ range .Translations }}
-      <meta property="og:locale:alternate" content="{{ .Language.Params.LanguageCode }}" />
+      <meta property="og:locale:alternate" content="{{ replace .Language.LanguageCode "-" "_" }}" />
     {{ end }}
     <meta name="apple-itunes-app" content="app-id=1560822163">
     {{ if hugo.IsDevelopment }}
@@ -63,7 +59,10 @@
     {{ end }}
     <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="{{ .Site.LanguagePrefix }}/feed.xml" />
     {{ range .AllTranslations }}
-      <link rel="alternate" hreflang="{{ .Lang }}" href="{{ .Permalink }}" />
+      <link rel="alternate" hreflang="{{ .Language.LanguageCode }}" href="{{ .Permalink }}" />
+      {{ if eq .Language.Lang "en" }}
+        <link rel="alternate" hreflang="x-default" href="{{ .Permalink }}" />
+      {{ end }}
     {{ end }}
   </head>
   <body x-data="{ isNavOpen: false, globalData: { githubStargazers: null, mastodonFollowers: null } }" x-init="determineGlobalData('{{ .Site.Language.Lang }}', globalData)" :class="isNavOpen && 'overflow-hidden'" class="bg-dark font-body text-gray-900">
