From d7421203546644ce62c55cf20fa3fe22552d259f Mon Sep 17 00:00:00 2001
From: yshalsager <ysh-alsager@hotmail.com>
Date: Tue, 23 Aug 2022 11:16:53 +0200
Subject: [PATCH] Use default value for data config keys if key doesn't exist
 in other language file

Signed-off-by: yshalsager <ysh-alsager@hotmail.com>
---
 layouts/partials/contact.html |  4 ++--
 layouts/partials/head.html    | 36 +++++++++++++++++------------------
 layouts/partials/header.html  |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/layouts/partials/contact.html b/layouts/partials/contact.html
index 3ea0e4640..3de7d2c68 100644
--- a/layouts/partials/contact.html
+++ b/layouts/partials/contact.html
@@ -4,14 +4,14 @@
 <!-- Contact Info -->
 <div id="contact_buttons">
     <footer>
-        {{ $name := $data.name }}
+        {{ $name := $data.name | default $.Site.Data.config.name }}
         {{ $year := dateFormat "2006" now }}
         <p>{{ i18n "copyright" (dict "name" $name "year" $year) | safeHTML}}</p>
         <ul>
             {{ if not .IsHome }}
             <li><a href="{{ $.Site.BaseURL}}">{{ i18n "home" }}</a></li>
             {{end}}
-            {{- range $data.links -}}
+            {{- range $data.links | default $.Site.Data.config.links -}}
             <li><a href="{{.link}}">{{.link_name}}</a></li>
             {{- end -}}
         </ul>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 434d71244..076e48459 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -6,16 +6,16 @@
   <meta charset="UTF-8" />
   <meta
     name="description"
-    content="{{if .IsHome}}{{$data.description}}{{else}}{{.Summary}}{{end}}"
+    content="{{if .IsHome}}{{$data.description | default $.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}"
   />
   <title>
-    {{ if .Title }}{{ .Title }}{{ else }}{{ $data.page_title }}{{
+    {{ if .Title }}{{ .Title }}{{ else }}{{ $data.page_title | default $.Site.Data.config.page_title }}{{
     end }}
   </title>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
 
   <!-- HTML Favicon -->
-  {{ $favicon := $data.favicon | default (slice (dict "rel" "shortcut icon" "type" "image/png" "href" "icon.png")) }}
+  {{ $favicon := $data.favicon  | default $.Site.Data.config.favicon | default (slice (dict "rel" "shortcut icon" "type" "image/png" "href" "icon.png")) }}
   {{ $type := (printf "%T" $favicon) }}
   {{ if eq $type "string" }}
   {{ $favicon | safeHTML }}
@@ -32,7 +32,7 @@
   {{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }}
   {{$css = $css | append $scss}}
   {{end}}
-  {{if $data.enableCallouts}}
+  {{if $data.enableCallouts | default $.Site.Data.config.enableCallouts}}
     {{$scss := resources.Get "styles/_callouts.scss" | resources.ToCSS (dict "outputStyle" "compressed") }}
     {{$css = $css | append $scss}}
   {{end}}
@@ -58,17 +58,17 @@
   <script src="{{$popover.Permalink}}"></script>
 
   <!-- Optional scripts -->
-  {{ if $data.enableCodeBlockTitle }}
+  {{ if $data.enableCodeBlockTitle | default $.Site.Data.config.enableCallouts }}
   {{ $codeTitle := resources.Get "js/code-title.js" | resources.Fingerprint "md5" | resources.Minify }}
   <script src="{{$codeTitle.Permalink}}"></script>
   {{end}}
 
-  {{ if $data.enableCodeBlockCopy }}
+  {{ if $data.enableCodeBlockCopy | default $.Site.Data.config.enableCodeBlockCopy }}
   {{ $clipboard := resources.Get "js/clipboard.js" | resources.Fingerprint "md5" | resources.Minify }}
   <script src="{{$clipboard.Permalink}}"></script>
   {{ end }}
 
-  {{ if $data.enableCallouts }}
+  {{ if $data.enableCallouts | default $.Site.Data.config.enableCallouts }}
   {{ $callouts := resources.Get "js/callouts.js" | resources.Fingerprint "md5" | resources.Minify }}
   <script src="{{$callouts.Permalink}}"></script>
   {{ end }}
@@ -104,27 +104,27 @@
       const pathWindow = window.location.pathname;
       const isHome = pathBase == pathWindow;
 
-      {{if $data.enableCodeBlockCopy -}}
+      {{if $data.enableCodeBlockCopy | default $.Site.Data.config.enableCodeBlockCopy -}}
       addCopyButtons();
       {{ end }}
 
-      {{if $data.enableSPA -}}
+      {{if $data.enableSPA | default $.Site.Data.config.enableSPA -}}
       addTitleToCodeBlocks();
       {{ end }}
 
-      {{if $data.enableCallouts -}}
+      {{if $data.enableCallouts | default $.Site.Data.config.enableCallouts -}}
       addCollapsibleCallouts();
       {{ end }}
      
-      {{if $data.enableLinkPreview}}
+      {{if $data.enableLinkPreview | default $.Site.Data.config.enableLinkPreview}}
       initPopover(
         {{strings.TrimRight "/" .Site.BaseURL }},
-        {{$data.enableContextualBacklinks}},
-        {{$data.enableLatex}}
+        {{$data.enableContextualBacklinks | default $.Site.Data.config.enableContextualBacklinks}},
+        {{$data.enableLatex | default $.Site.Data.config.enableLatex}}
       )
       {{end}}
 
-      {{if $data.enableFooter}}
+      {{if $data.enableFooter | default $.Site.Data.config.enableFooter}}
       const footer = document.getElementById("footer")
       if (footer) {
         const container = document.getElementById("graph-container")
@@ -147,14 +147,14 @@
 
     const init = (doc = document) => {
       // NOTE: everything within this callback will be executed for initial page navigation. This is a good place to put JavaScript that only replaces DOM nodes.
-      {{if $data.enableCodeBlockCopy -}}
+      {{if $data.enableCodeBlockCopy | default $.Site.Data.config.enableCodeBlockCopy -}}
       addCopyButtons();
       {{ end }}
 
-      {{if $data.enableCodeBlockTitle -}}
+      {{if $data.enableCodeBlockTitle | default $.Site.Data.config.enableCodeBlockTitle -}}
       addTitleToCodeBlocks();
       {{- end -}}
-      {{if $data.enableLatex}}
+      {{if $data.enableLatex | default $.Site.Data.config.enableLatex}}
       renderMathInElement(doc.body, {
         delimiters: [
           {left: '$$', right: '$$', display: true},
@@ -165,7 +165,7 @@
       {{end}}
     };
   </script>
-  {{if $data.enableSPA}}
+  {{if $data.enableSPA | default $.Site.Data.config.enableSPA}}
   {{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
   resources.Minify }}
   <script type="module">
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index f4e051796..a7f6733b2 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,6 +1,6 @@
 <header>
     {{ $config := cond (eq $.Site.Language.Lang "en") "config" (printf "config.%s" $.Site.Language.Lang) }}
-    <h1 id="page-title"><a href="{{ "" | absLangURL }}">{{ ( index $.Site.Data $config ).page_title }}</a></h1>
+    <h1 id="page-title"><a href="{{ "" | absLangURL }}">{{ ( index $.Site.Data $config ).page_title | default $.Site.Data.config.page_title }}</a></h1>
     <div class="spacer"></div>
     <div id="search-icon">
       <p>{{ i18n "search" }}</p>