From e587b081afdf22d1211648b5d4f59e72d7e06d81 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Fri, 9 Jul 2021 17:57:52 +0200 Subject: [PATCH 01/14] Let some string being translated in config --- layouts/partials/nav.html | 2 +- layouts/partials/sidebar.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 3676a3c..79f5e9e 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -6,7 +6,7 @@
- +

- Copyright © ArmaVirumque {{ now.Year }} | + Copyright © {{ .Site.Copyright }} {{ now.Year }} | Mentions légales

From fb668976dea8a5abbc068b62a8153a31f331856f Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Fri, 9 Jul 2021 18:31:14 +0200 Subject: [PATCH 03/14] Legal notice in config --- layouts/partials/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 449c9a2..b83b32e 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -201,7 +201,7 @@

Copyright © {{ .Site.Copyright }} {{ now.Year }} | - Mentions légales + {{ .Site.Params.legal_txt }}

From 4925c2791302a774c9f636de67178b19b9f13e4c Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Fri, 9 Jul 2021 18:41:08 +0200 Subject: [PATCH 04/14] Add translation selector --- layouts/partials/nav.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 79f5e9e..2468e29 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -22,6 +22,18 @@
  • {{.title}}
    • {{ end }} + {{ if gt (len .Site.Home.AllTranslations) 1 }} +
    + +
    + {{ range .Site.Home.AllTranslations }} + {{ .Language }} + {{ end }} +
    +
    + {{ end }} {{ if .Site.Params.cta_nav }}
  • {{ .Site.Params.cta_nav_txt }} From 19178b679119c64b83257b6c4e3c4330703f5aaa Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 10 Jul 2021 10:46:47 +0200 Subject: [PATCH 05/14] Include RSS header --- layouts/partials/footer.html | 6 ++++-- layouts/partials/head.html | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index b83b32e..1b63379 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -5,8 +5,9 @@
    diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 274ca20..386cf9a 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -76,6 +76,7 @@ {{ end }} + {{ partial "comments.html" . }} diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html new file mode 100644 index 0000000..a3760f3 --- /dev/null +++ b/layouts/partials/comments.html @@ -0,0 +1,19 @@ +{{ if .Site.Params.disqus_proxy }} +
    + + +{{ else if .Site.DisqusShortname }} +
    +{{ template "_internal/disqus.html" . }} +{{ else if .Site.Params.Commento }} +
    +{{ end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index cea0c9a..56184a2 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -91,6 +91,11 @@ + {{ with .Site.Params.Commento }} + + + {{ end }} + {{ range .Site.Params.custom_js }} From 3e7f4f07d0d1920c44a3ec579b1de1c0edbb19cb Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sun, 11 Jul 2021 18:57:38 +0200 Subject: [PATCH 08/14] Add some space after pagination --- layouts/_default/single.html | 4 ++-- layouts/partials/pagination.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 386cf9a..4f27744 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -66,12 +66,12 @@
    {{ if .PrevInSection }} - ← + ← Article précédent {{ end }} {{ if .NextInSection }} - + Article suivant → {{ end }} diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index 0b82676..07781a6 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -3,12 +3,12 @@ {{ if gt $pag.TotalPages 1 }}
    {{ if $pag.HasPrev }} - + ← Articles plus récents {{ end }} {{ if $pag.HasNext }} - + Articles plus anciens → {{ end }} From b9020351c12b8b8b47c0aa0255f8472e187d1717 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 13 Jul 2021 11:27:37 +0200 Subject: [PATCH 09/14] Handling tags --- layouts/_default/section.html | 9 +++--- layouts/_default/single.html | 18 ++++++----- layouts/partials/category.html | 2 ++ layouts/partials/posts.html | 2 +- layouts/partials/sidebar.html | 4 +-- layouts/taxonomy/category.html | 3 ++ layouts/taxonomy/tag.html | 6 ++++ layouts/taxonomy/terms.html | 56 ++++++++++++++++++++++++++++++++++ 8 files changed, 84 insertions(+), 16 deletions(-) create mode 100644 layouts/partials/category.html create mode 100644 layouts/taxonomy/category.html create mode 100644 layouts/taxonomy/tag.html create mode 100644 layouts/taxonomy/terms.html diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 1955337..75dc25c 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -10,26 +10,25 @@ post-container"> {{ .Content }} - {{ partial "comments.html" . }}
    {{ if .Site.Params.featured_tags }}
    - +
    FEATURED TAGS
    {{ $featured_condition_size := .Site.Params.featured_condition_size }} {{ range $name, $taxonomy := .Site.Taxonomies.tags }} {{ if gt (len $taxonomy.Pages) $featured_condition_size }} - - {{ $name }} + + #{{ $name }} {{ end }} {{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 4f27744..ed435fe 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -10,15 +10,17 @@
    -
    - {{ range .Params.tags }} - - {{ . }} +

    {{ .Title }}

    + {{ with .Params.subtitle }}

    {{ . }}

    {{ end }} + {{ with .Params.tags }} +
    + {{ range . }} + + #{{ . }} {{ end }}
    -

    {{ .Title }}

    -

    {{ .Params.subtitle }}

    + {{ end }} Par {{ if .Params.author }} @@ -94,8 +96,8 @@ {{ $featured_condition_size := .Site.Params.featured_condition_size }} {{ range $name, $taxonomy := .Site.Taxonomies.tags }} {{ if gt (len $taxonomy.Pages) $featured_condition_size }} - - {{ $name }} + + #{{ $name }} {{ end }} {{ end }} diff --git a/layouts/partials/category.html b/layouts/partials/category.html new file mode 100644 index 0000000..9308b10 --- /dev/null +++ b/layouts/partials/category.html @@ -0,0 +1,2 @@ +{{ $paginator := .Paginate (where .Data.Pages "Section" "post") }} +{{ partial "posts.html" . }} diff --git a/layouts/partials/posts.html b/layouts/partials/posts.html index 77bb7d4..447a92a 100644 --- a/layouts/partials/posts.html +++ b/layouts/partials/posts.html @@ -2,7 +2,7 @@
    -
    - {{ $name }} + + #{{ $name }} {{ end }} {{ end }} diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html new file mode 100644 index 0000000..92e0961 --- /dev/null +++ b/layouts/taxonomy/category.html @@ -0,0 +1,3 @@ +{{ define "main" }} + {{ partial "category.html" . }} +{{ end }} diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html new file mode 100644 index 0000000..ccbd3d8 --- /dev/null +++ b/layouts/taxonomy/tag.html @@ -0,0 +1,6 @@ +{{ define "main" }} +
    +

    Tag #{{ .Data.Term }}

    +
    + {{ partial "category.html" . }} +{{ end }} diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html new file mode 100644 index 0000000..ac8ed7d --- /dev/null +++ b/layouts/taxonomy/terms.html @@ -0,0 +1,56 @@ +{{ define "main" }} + +
    +
    +
    + +
    + + {{ .Content }} + +
    + +
    + + + {{ if .Site.Params.featured_tags }} +
    +
    +
    Tags
    +
    + {{ $featured_condition_size := .Site.Params.featured_condition_size }} + {{ range $name, $taxonomy := .Site.Taxonomies.tags }} + {{ if gt (len $taxonomy.Pages) $featured_condition_size }} + + #{{ $name }} + + {{ end }} + {{ end }} +
    +
    + {{ end }} + + + {{ if .Site.Params.friends }} +
    +
    +
    FRIENDS
    +
      + {{ range .Site.Params.friend_link }} +
    • {{.title}}
      • + {{ end }} +
    +
    + {{ end }} +
    +
    +
    +
    + +{{ end }} From 7ced5779a03b7511baa34044d4fe2644a4c4efed Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 13 Jul 2021 11:27:52 +0200 Subject: [PATCH 10/14] Permit a static text after the page content --- layouts/_default/single.html | 5 ++++- layouts/partials/under_content.html | 0 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 layouts/partials/under_content.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index ed435fe..62cbaa6 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -66,7 +66,7 @@ {{ .Content }}
    -
    +
    {{ if .PrevInSection }} ← Article précédent @@ -78,8 +78,11 @@ {{ end }}
    +
    + {{ partial "comments.html" . }} + {{ partial "under_content.html" . }}
    ← + ← Article précédent {{ end }} {{ if .NextInSection }} - + Article suivant → {{ end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 56184a2..c00d6ca 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -49,7 +49,7 @@ {{ if .Title }}{{ .Title }} - {{ .Site.Params.SEOTitle }}{{ else }}{{ .Site.Params.SEOTitle }}{{ end }} - + {{ with .OutputFormats.Get "rss" -}} {{ printf `` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} From 21967b12fc9e94b2321af96aaecc2534c51d9427 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sun, 3 Dec 2023 11:25:43 +0100 Subject: [PATCH 12/14] Update side link and shape --- layouts/partials/sidebar.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 72279e2..dc183ca 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -28,11 +28,11 @@ {{ if .Site.Params.about_me }}
    -
    {{ .Site.Params.about_txt }}
    +
    {{ .Site.Params.about_txt }}
    {{ with .Site.Params.sidebar_avatar }} -
    - +
    + avatar
    From 9000fbd75218ddffc83fd56cc490a0403e72b45f Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 9 Dec 2023 11:04:27 +0100 Subject: [PATCH 13/14] Translate fr only strings --- i18n/en.yml | 29 +++++++++++++++++++++++++++++ i18n/fr.yml | 29 +++++++++++++++++++++++++++++ layouts/_default/single.html | 12 ++++++------ layouts/partials/pagination.html | 4 ++-- layouts/partials/post_list.html | 4 ++-- 5 files changed, 68 insertions(+), 10 deletions(-) create mode 100644 i18n/en.yml create mode 100644 i18n/fr.yml diff --git a/i18n/en.yml b/i18n/en.yml new file mode 100644 index 0000000..3c79a27 --- /dev/null +++ b/i18n/en.yml @@ -0,0 +1,29 @@ +- id: prev_articles + translation: "Latest articles" + +- id: next_articles + translation: "Oldest articles" + +- id: prev_article + translation: "Previous article" + +- id: next_article + translation: "Next article" + +- id: toc + translation: "Table of Contents" + +- id: posted_by + translation: "Posted by" + +- id: updated_on + translation: "Last modified on" + +- id: by + translation: "By" + +- id: "on" + translation: "on" + +- id: "date_fmt" + translation: "Jan 2 2006" diff --git a/i18n/fr.yml b/i18n/fr.yml new file mode 100644 index 0000000..0058382 --- /dev/null +++ b/i18n/fr.yml @@ -0,0 +1,29 @@ +- id: prev_articles + translation: "Articles plus récents" + +- id: next_articles + translation: "Articles plus anciens" + +- id: prev_article + translation: "Article précédent" + +- id: next_article + translation: "Article suivant" + +- id: toc + translation: "Table des matières" + +- id: posted_by + translation: "Posté par" + +- id: updated_on + translation: "Mis à jour le" + +- id: by + translation: "Par" + +- id: "on" + translation: "le" + +- id: "date_fmt" + translation: "2 Jan 2006" diff --git a/layouts/_default/single.html b/layouts/_default/single.html index ebcc856..620aeb0 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -22,14 +22,14 @@
    {{ end }} - Par + {{ i18n "by" }} {{ if .Params.author }} {{ .Params.author }} {{ else }} {{ .Site.Title }} {{ end }} - le - {{ .Date.Format "2 Jan 2006" }} + {{ i18n "on" }} + {{ .Date.Format (i18n "date_fmt") }} {{ if .Site.Params.page_view_conter }} {{ partial "page_view_counter.html" . }} {{ end }} @@ -59,7 +59,7 @@ {{ if not (eq (.Param "showtoc") false) }}
    -

    Sommaire

    +

    {{ i18n "toc" }}

    {{.TableOfContents}} {{ end }} @@ -69,12 +69,12 @@ diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index 07781a6..c7ee8d8 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -4,12 +4,12 @@ diff --git a/layouts/partials/post_list.html b/layouts/partials/post_list.html index c231970..73bbeb2 100644 --- a/layouts/partials/post_list.html +++ b/layouts/partials/post_list.html @@ -19,10 +19,10 @@

    - Posté par {{ with .Params.author }}{{ . }}{{ else }}{{ .Site.Title }}{{ end }} le {{ .Date.Format "2 Jan 2006" }} + {{ i18n "posted_by" }} {{ with .Params.author }}{{ . }}{{ else }}{{ .Site.Title }}{{ end }} {{ i18n "on" }} {{ .Date.Format (i18n "date_fmt") }} {{ if (and (not .Lastmod.IsZero) (not (eq (dateFormat "2006-01-02" .Lastmod) (dateFormat "2006-01-02" .Date)))) }} -
    Mise à jour le {{ dateFormat "2 Jan 2006" .Params.LastMod }} +
    {{ i18n "updated_on" }} {{ dateFormat (i18n "date_fmt") .Params.LastMod }} {{ end }}

    From 4ac68ab13d54c1bb8597ccbc9f96d8294d3aff78 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Wed, 3 Dec 2025 11:05:09 +0700 Subject: [PATCH 14/14] Make theme compatible with more recent hugo releases --- layouts/partials/comments.html | 4 ++-- layouts/partials/head.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html index a3760f3..75db356 100644 --- a/layouts/partials/comments.html +++ b/layouts/partials/comments.html @@ -3,7 +3,7 @@ -{{ else if .Site.DisqusShortname }} +{{ else if site.Config.Services.Disqus.Shortname }}
    {{ template "_internal/disqus.html" . }} {{ else if .Site.Params.Commento }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index c00d6ca..e95e7ad 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -83,7 +83,7 @@