From 6eab5f95fbd99264cbe8c13abcbf57bf03ad8f5c Mon Sep 17 00:00:00 2001
From: James Panther <4462786+jpanther@users.noreply.github.com>
Date: Tue, 11 Jan 2022 12:13:18 +1100
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=90=20Use=20language=20specific=20date?=
 =?UTF-8?q?=20formats?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/_default/languages.en.toml                           | 6 +++++-
 config/_default/module.toml                                 | 2 +-
 config/_default/params.toml                                 | 1 -
 exampleSite/config/_default/config.toml                     | 2 +-
 .../_default/{languages.en-au.toml => languages.en.toml}    | 2 ++
 .../config/_default/{menus.en-au.toml => menus.en.toml}     | 0
 exampleSite/config/_default/params.toml                     | 1 -
 layouts/partials/meta/date.html                             | 4 ++--
 8 files changed, 11 insertions(+), 7 deletions(-)
 rename exampleSite/config/_default/{languages.en-au.toml => languages.en.toml} (94%)
 rename exampleSite/config/_default/{menus.en-au.toml => menus.en.toml} (100%)

diff --git a/config/_default/languages.en.toml b/config/_default/languages.en.toml
index 8ba31bd8..a0362a83 100644
--- a/config/_default/languages.en.toml
+++ b/config/_default/languages.en.toml
@@ -1,10 +1,14 @@
 languageCode = "en"
 languageName = "English"
+displayName = "EN"
+htmlCode = "en"
 weight = 1
 
-title = "Congo EN"
+title = "Congo"
 # copyright = "Copy, _right?_ :thinking_face:"
 
+dateFormat = "2 January 2006"
+
 [author]
   # name = "Your name here"
   # image = "img/author.jpg"
diff --git a/config/_default/module.toml b/config/_default/module.toml
index 6a8e43fa..74f77272 100644
--- a/config/_default/module.toml
+++ b/config/_default/module.toml
@@ -1,3 +1,3 @@
 [hugoVersion]
   extended = false
-  min = "0.86.1"
+  min = "0.87.0"
diff --git a/config/_default/params.toml b/config/_default/params.toml
index 6d015244..b645e1e4 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -19,7 +19,6 @@ colorScheme = "congo"
 
 [article]
   showDate = true
-  dateFormat = "2 January 2006"
   showAuthor = true
   showBreadcrumbs = false
   showDraftLabel = true
diff --git a/exampleSite/config/_default/config.toml b/exampleSite/config/_default/config.toml
index 5ea5be49..7d7ac3b4 100644
--- a/exampleSite/config/_default/config.toml
+++ b/exampleSite/config/_default/config.toml
@@ -3,7 +3,7 @@
 # https://jpanther.github.io/congo/docs/getting-started/
 
 theme = "congo"
-defaultContentLanguage = "en-au"
+defaultContentLanguage = "en"
 
 enableEmoji = true
 enableRobotsTXT = true
diff --git a/exampleSite/config/_default/languages.en-au.toml b/exampleSite/config/_default/languages.en.toml
similarity index 94%
rename from exampleSite/config/_default/languages.en-au.toml
rename to exampleSite/config/_default/languages.en.toml
index 98317260..7955ab5d 100644
--- a/exampleSite/config/_default/languages.en-au.toml
+++ b/exampleSite/config/_default/languages.en.toml
@@ -7,6 +7,8 @@ weight = 1
 title = "Congo"
 # copyright = "Copy, _right?_ :thinking_face:"
 
+dateFormat = "2 January 2006"
+
 [author]
   name = "Congo"
   image = "img/author.jpg"
diff --git a/exampleSite/config/_default/menus.en-au.toml b/exampleSite/config/_default/menus.en.toml
similarity index 100%
rename from exampleSite/config/_default/menus.en-au.toml
rename to exampleSite/config/_default/menus.en.toml
diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml
index 163658ab..43e0536d 100644
--- a/exampleSite/config/_default/params.toml
+++ b/exampleSite/config/_default/params.toml
@@ -19,7 +19,6 @@ mainSections = ["samples"]
 
 [article]
   showDate = true
-  dateFormat = "2 January 2006"
   showAuthor = true
   showBreadcrumbs = true
   showDraftLabel = true
diff --git a/layouts/partials/meta/date.html b/layouts/partials/meta/date.html
index 92c2675b..a99d8ef1 100644
--- a/layouts/partials/meta/date.html
+++ b/layouts/partials/meta/date.html
@@ -1,10 +1,10 @@
 <time datetime="{{ .Date }}">
-  {{- .Date.Format (.Site.Params.article.dateFormat | default "2 January 2006") -}}
+  {{- .Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long") -}}
 </time>
 {{ if .Params.showDateUpdated | default (.Site.Params.article.showDateUpdated | default false) }}
   &nbsp;(Updated:&nbsp;
   <time datetime="{{ .Lastmod }}">
-    {{- .Lastmod.Format (.Site.Params.article.dateFormat | default "2 January 2006") -}}
+    {{- .Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long") -}}
   </time>
   )
 {{ end }}