From a7f2d8abdbe0831b8f5b67cb7feb7d6eb2039d57 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 15:00:50 -0400
Subject: [PATCH 01/19] correct display of taxon and terms

---
 templates/taxonomy_single.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index 52da3a5..ec178e4 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -5,16 +5,17 @@
 {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
 {%- set number_of_posts = term.pages | length -%}
 
+{%- set taxon_name = "taxonomy.name" -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
-	{{- macros_translate::translate(key="posts_with_tag", default="Posts with tag $TAG", language_strings=language_strings) | replace(from="$TAG", to=term_name) -}}
+	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
 	<a href="{{ current_url ~ 'atom.xml' }}"><i class="icon feed"></i></a>
 </h1>
 
 <p>
 	<small>
 		<a href="{{ get_url(path='tags', lang=lang) }}">
-			{{ macros_translate::translate(key="all_tags", default="See all tags", language_strings=language_strings) }}
+			{{ macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) }}
 		</a>
 		<br />
 		{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }}

From 9e163ba77e337f903ad83a321691a3838096c7da Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 16:54:37 -0400
Subject: [PATCH 02/19] make line mutable

---
 templates/taxonomy_single.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index ec178e4..19e03bc 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -15,7 +15,7 @@
 <p>
 	<small>
 		<a href="{{ get_url(path='tags', lang=lang) }}">
-			{{ macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) }}
+			{{- macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) -}}
 		</a>
 		<br />
 		{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }}

From d1b15bc15b18e5feb1b0fa765de71502e43605b4 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 17:17:48 -0400
Subject: [PATCH 03/19] list taxon name

---
 templates/taxonomy_list.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index 5225d7d..c02c3aa 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -2,7 +2,8 @@
 
 {% block content %}
 {%- set number_of_tags = terms | length -%}
-<h1>{{ macros_translate::translate(key="tags_title", default="Tags", language_strings=language_strings) }}</h1>
+{%- set taxon_name = terms.taxonomy -%}
+<h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>
 	<small>{{ macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER tags", language_strings=language_strings) }}</small>

From 85872f23a2b845fd6aba731189d34d020a964a0e Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 17:32:00 -0400
Subject: [PATCH 04/19] correct whitespace, add taxon in list display

---
 templates/taxonomy_list.html   | 4 ++--
 templates/taxonomy_single.html | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index c02c3aa..b74e8a3 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -3,10 +3,10 @@
 {% block content %}
 {%- set number_of_tags = terms | length -%}
 {%- set taxon_name = terms.taxonomy -%}
-<h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) -}}</h1>
+<h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>
-	<small>{{ macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER tags", language_strings=language_strings) }}</small>
+	<small>{{- macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</small>
 </p>
 
 <ul class="tags">
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index 19e03bc..e049de0 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -5,17 +5,17 @@
 {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
 {%- set number_of_posts = term.pages | length -%}
 
-{%- set taxon_name = "taxonomy.name" -%}
+{%- set taxon_name = taxonomy.name -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
-	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
+	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
 	<a href="{{ current_url ~ 'atom.xml' }}"><i class="icon feed"></i></a>
 </h1>
 
 <p>
 	<small>
 		<a href="{{ get_url(path='tags', lang=lang) }}">
-			{{- macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) -}}
+			{{- macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 		</a>
 		<br />
 		{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }}

From 7437483b3b766afbfe2cd0826ad6256a12b6a5f1 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 17:33:32 -0400
Subject: [PATCH 05/19] correct reference to taxonomy name

---
 templates/taxonomy_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index b74e8a3..ad9b4da 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 {%- set number_of_tags = terms | length -%}
-{%- set taxon_name = terms.taxonomy -%}
+{%- set taxon_name = taxonomy.name -%}
 <h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>

From 23d85089a03ddec5879c8d9a618f498320f6f88f Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 17:48:56 -0400
Subject: [PATCH 06/19] standardized var names

---
 templates/taxonomy_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index ad9b4da..76ac026 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -10,8 +10,8 @@
 </p>
 
 <ul class="tags">
-	{%- for tag in terms -%}
-		<li><a href="{{ current_url }}{{ tag.slug }}"><span class="tag">{{ tag.name }}</span><span class="count">{{ tag.pages | length }}</span></a></li>
+	{%- for term in terms -%}
+		<li><a href="{{ current_url }}{{ term.slug }}"><span class="tag">{{ term.name }}</span><span class="count">{{ term.pages | length }}</span></a></li>
 	{%- endfor -%}
 </ul>
 {% endblock content %}

From daca29f6e67a55b284f3c438e89e458165243604 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 18:42:16 -0400
Subject: [PATCH 07/19] updated article_list display

---
 templates/article_list.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index 3bbde28..5265f13 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -33,8 +33,9 @@
 <p>
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
-			<a href="{{ get_url(path='tags', lang=lang) }}">
-				{{ macros_translate::translate(key="filter_by_tag", default="Filter by tag", language_strings=language_strings) }}
+		    {%- set taxon_name = taxonomy.name -%}
+			<a href="{{- get_url(path='tags', lang=lang) =  -}}">
+				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON" to=taxon_name -}}
 			</a>
 			<br />
 		{%- endif %}

From 8763d960c167e37dc52bb9e6efcbdd4f79a1b2a0 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 18:43:14 -0400
Subject: [PATCH 08/19] add parenthesis

---
 templates/article_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index 5265f13..45561c6 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -35,7 +35,7 @@
 		{%- if config.taxonomies | length > 0 -%}
 		    {%- set taxon_name = taxonomy.name -%}
 			<a href="{{- get_url(path='tags', lang=lang) =  -}}">
-				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON" to=taxon_name -}}
+				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON" to=taxon_name) -}}
 			</a>
 			<br />
 		{%- endif %}

From d5ff0dadc75b6144355eb7863f8045a158d7a745 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 18:48:19 -0400
Subject: [PATCH 09/19] complete url fetch syntax

---
 templates/article_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index 45561c6..b728ea5 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -34,7 +34,7 @@
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
 		    {%- set taxon_name = taxonomy.name -%}
-			<a href="{{- get_url(path='tags', lang=lang) =  -}}">
+			<a href="{{- get_url(path='$TAXON', lang=lang) = replace(from="$TAXON", to=taxon_name) -}}">
 				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON" to=taxon_name) -}}
 			</a>
 			<br />

From 7f3f7f05ea1f7ab74ef613faf9fbfe44e68107f4 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 18:49:18 -0400
Subject: [PATCH 10/19] correct typo

---
 templates/article_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index b728ea5..ad6ead0 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -34,7 +34,7 @@
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
 		    {%- set taxon_name = taxonomy.name -%}
-			<a href="{{- get_url(path='$TAXON', lang=lang) = replace(from="$TAXON", to=taxon_name) -}}">
+			<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
 				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON" to=taxon_name) -}}
 			</a>
 			<br />

From 8f98684693030a48a3d0b4909405f55841312419 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 18:53:45 -0400
Subject: [PATCH 11/19] corrected typos, added consistent naming

---
 templates/article_list.html  | 2 +-
 templates/taxonomy_list.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index ad6ead0..fae3183 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -35,7 +35,7 @@
 		{%- if config.taxonomies | length > 0 -%}
 		    {%- set taxon_name = taxonomy.name -%}
 			<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
-				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON" to=taxon_name) -}}
+				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 			</a>
 			<br />
 		{%- endif %}
diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index 76ac026..84f9951 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
 
 {% block content %}
-{%- set number_of_tags = terms | length -%}
+{%- set number_of_terms = terms | length -%}
 {%- set taxon_name = taxonomy.name -%}
 <h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>
-	<small>{{- macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</small>
+	<small>{{- macros_translate::translate(key="tags", number=number_of_terms, default="$NUMBER $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</small>
 </p>
 
 <ul class="tags">

From 481335cbc41833073b2161c1f6ad0946ebcf3ba3 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 18:59:00 -0400
Subject: [PATCH 12/19] attempted correction of reference to taxon name

---
 templates/article_list.html    | 2 +-
 templates/taxonomy_list.html   | 2 +-
 templates/taxonomy_single.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index fae3183..e5d2ba2 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -33,7 +33,7 @@
 <p>
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
-		    {%- set taxon_name = taxonomy.name -%}
+		    {%- set taxon_name = taxonomy -%}
 			<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
 				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 			</a>
diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index 84f9951..b6352ed 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 {%- set number_of_terms = terms | length -%}
-{%- set taxon_name = taxonomy.name -%}
+{%- set taxon_name = taxonomy -%}
 <h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index e049de0..0a6094f 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -5,7 +5,7 @@
 {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
 {%- set number_of_posts = term.pages | length -%}
 
-{%- set taxon_name = taxonomy.name -%}
+{%- set taxon_name = taxonomy -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
 	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}

From 6d5e39a6e70dcf10e84af411605a80d43477c280 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 19:01:01 -0400
Subject: [PATCH 13/19] attempted second correction of reference to taxon name

---
 templates/article_list.html    | 2 +-
 templates/taxonomy_list.html   | 2 +-
 templates/taxonomy_single.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index e5d2ba2..0a1fad5 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -33,7 +33,7 @@
 <p>
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
-		    {%- set taxon_name = taxonomy -%}
+		    {%- set taxon_name = config.name -%}
 			<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
 				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 			</a>
diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index b6352ed..796baba 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 {%- set number_of_terms = terms | length -%}
-{%- set taxon_name = taxonomy -%}
+{%- set taxon_name = config.name -%}
 <h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index 0a6094f..4fb6904 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -5,7 +5,7 @@
 {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
 {%- set number_of_posts = term.pages | length -%}
 
-{%- set taxon_name = taxonomy -%}
+{%- set taxon_name = config.name -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
 	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}

From dfe59caf99dc02e7a34369b3ed449b773b2abd9f Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 21:31:40 -0400
Subject: [PATCH 14/19] third attempt at correcting taxonomy name reference

---
 templates/article_list.html    | 2 +-
 templates/taxonomy_list.html   | 2 +-
 templates/taxonomy_single.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index 0a1fad5..d22400e 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -33,7 +33,7 @@
 <p>
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
-		    {%- set taxon_name = config.name -%}
+		    {%- set taxon_name = config.taxonomy.name -%}
 			<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
 				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 			</a>
diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index 796baba..44160a9 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 {%- set number_of_terms = terms | length -%}
-{%- set taxon_name = config.name -%}
+{%- set taxon_name = config.taxonomy.name -%}
 <h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index 4fb6904..7b6c7b3 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -5,7 +5,7 @@
 {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
 {%- set number_of_posts = term.pages | length -%}
 
-{%- set taxon_name = config.name -%}
+{%- set taxon_name = config.taxonomy.name -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
 	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}

From bbb299baec2c7155fac22562756205f047bf2670 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 21:35:09 -0400
Subject: [PATCH 15/19] attempt 4

---
 templates/article_list.html    | 2 +-
 templates/taxonomy_list.html   | 2 +-
 templates/taxonomy_single.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index d22400e..9f345b1 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -33,7 +33,7 @@
 <p>
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
-		    {%- set taxon_name = config.taxonomy.name -%}
+		    {%- set taxon_name = config.taxonomies.name -%}
 			<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
 				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 			</a>
diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index 44160a9..52fe51c 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 {%- set number_of_terms = terms | length -%}
-{%- set taxon_name = config.taxonomy.name -%}
+{%- set taxon_name = config.taxonomies.name -%}
 <h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index 7b6c7b3..6365f58 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -5,7 +5,7 @@
 {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
 {%- set number_of_posts = term.pages | length -%}
 
-{%- set taxon_name = config.taxonomy.name -%}
+{%- set taxon_name = config.taxonomies.name -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
 	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}

From 394b8be325b70c552c31ce500973b83705f8ed10 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 21:44:42 -0400
Subject: [PATCH 16/19] add loop over taxonomies, attempted another correction
 to reference for taxon name

---
 templates/article_list.html    | 12 +++++++-----
 templates/taxonomy_list.html   |  2 +-
 templates/taxonomy_single.html |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index 9f345b1..b6aa8a2 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -33,11 +33,13 @@
 <p>
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
-		    {%- set taxon_name = config.taxonomies.name -%}
-			<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
-				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
-			</a>
-			<br />
+		    {%- for taxon in config.taxonomies -%}
+		        {%- set taxon_name = taxonomy.name -%}
+			    <a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
+				    {{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
+			    </a>
+			    <br />
+			{%- endfor %}
 		{%- endif %}
 		{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts in total", language_strings=language_strings) }}
 	</small>
diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index 52fe51c..84f9951 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 {%- set number_of_terms = terms | length -%}
-{%- set taxon_name = config.taxonomies.name -%}
+{%- set taxon_name = taxonomy.name -%}
 <h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index 6365f58..e049de0 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -5,7 +5,7 @@
 {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
 {%- set number_of_posts = term.pages | length -%}
 
-{%- set taxon_name = config.taxonomies.name -%}
+{%- set taxon_name = taxonomy.name -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
 	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}

From ea88357a2599ce90e7984cb02d16ff4995f3c334 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 21:46:20 -0400
Subject: [PATCH 17/19] corrected (hopefully) reference within for loop

---
 templates/article_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/article_list.html b/templates/article_list.html
index b6aa8a2..d2abc11 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -34,7 +34,7 @@
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
 		    {%- for taxon in config.taxonomies -%}
-		        {%- set taxon_name = taxonomy.name -%}
+		        {%- set taxon_name = taxon.name -%}
 			    <a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
 				    {{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 			    </a>

From c9bfc1a977165e9137fbafd03a7433cfa515dc7b Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Tue, 15 Apr 2025 22:34:14 -0400
Subject: [PATCH 18/19] display taxonomies per taxon

---
 templates/article.html         | 4 ++--
 templates/article_list.html    | 4 ++--
 templates/taxonomy_single.html | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/article.html b/templates/article.html
index fb51e12..a2ff08c 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -61,9 +61,9 @@
 
 		{%- if page.taxonomies -%}
 			{%- for name, taxon in page.taxonomies %}
-				<ul class="tags">
+				<ul class="taxonomies">
 					{%-for item in taxon -%}
-						<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
+						<li><a class="taxon" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
 					{%- endfor %}
 				</ul>
 			{%- endfor -%}
diff --git a/templates/article_list.html b/templates/article_list.html
index d2abc11..7fcf2d6 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -35,8 +35,8 @@
 		{%- if config.taxonomies | length > 0 -%}
 		    {%- for taxon in config.taxonomies -%}
 		        {%- set taxon_name = taxon.name -%}
-			    <a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
-				    {{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
+			    <a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) | lower -}}">
+					{{- macros_translate::translate(key='filter_by_tag', default='Filter by $TAXON', language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | capitalize -}}
 			    </a>
 			    <br />
 			{%- endfor %}
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index e049de0..b45437d 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -8,17 +8,17 @@
 {%- set taxon_name = taxonomy.name -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
-	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
+	{{- macros_translate::translate(key='posts_with_taxon', default='Posts with $TAXON $TERM', language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
 	<a href="{{ current_url ~ 'atom.xml' }}"><i class="icon feed"></i></a>
 </h1>
 
 <p>
 	<small>
-		<a href="{{ get_url(path='tags', lang=lang) }}">
-			{{- macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
+		<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) | lower -}}">
+			{{- macros_translate::translate(key="all_taxa", default="See all $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 		</a>
 		<br />
-		{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }}
+		{{ macros_translate::translate(key='posts', number=number_of_posts, default='$NUMBER posts', language_strings=language_strings) }}
 	</small>
 </p>
 

From 37cbddbf3ef822311aec8958242dd65003274378 Mon Sep 17 00:00:00 2001
From: Ashla <apisashla@proton.me>
Date: Wed, 16 Apr 2025 00:33:37 -0400
Subject: [PATCH 19/19] display taxonomies in article list block

---
 templates/article.html           | 8 +++++---
 templates/article_list.html      | 8 ++++----
 templates/partials/articles.html | 3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/templates/article.html b/templates/article.html
index a2ff08c..ce1be1f 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -61,11 +61,13 @@
 
 		{%- if page.taxonomies -%}
 			{%- for name, taxon in page.taxonomies %}
-				<ul class="taxonomies">
-					{%-for item in taxon -%}
-						<li><a class="taxon" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
+				<ul class="tags">
+					<a class="tag" href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=name) | lower -}}">{{ name }}:</a>
+					{%- for item in taxon -%}
+					    <li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
 					{%- endfor %}
 				</ul>
+				<br />
 			{%- endfor -%}
 		{%- endif %}
 	</div>
diff --git a/templates/article_list.html b/templates/article_list.html
index 7fcf2d6..f6e102a 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -34,14 +34,14 @@
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
 		    {%- for taxon in config.taxonomies -%}
-		        {%- set taxon_name = taxon.name -%}
-			    <a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) | lower -}}">
-					{{- macros_translate::translate(key='filter_by_tag', default='Filter by $TAXON', language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | capitalize -}}
+			    {%- set taxon_name = taxon.name -%}
+			    <a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon.name) | lower -}}">
+					{{ macros_translate::translate(key='filter_by_taxon', default='Filter by $TAXON', language_strings=language_strings) | replace(from="$TAXON", to=taxon.name) }}
 			    </a>
 			    <br />
 			{%- endfor %}
 		{%- endif %}
-		{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts in total", language_strings=language_strings) }}
+		{{ macros_translate::translate(key='posts', number=number_of_posts, default='$NUMBER posts in total', language_strings=language_strings) }}
 	</small>
 </p>
 
diff --git a/templates/partials/articles.html b/templates/partials/articles.html
index 92180b4..8eaa786 100644
--- a/templates/partials/articles.html
+++ b/templates/partials/articles.html
@@ -53,7 +53,8 @@
 						{%- for name, taxon in page.taxonomies %}
 							<small>
 								<ul class="tags">
-									{%-for item in taxon -%}
+									<a class="tag" href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=name) | lower -}}">{{ name }}:</a>
+									{%- for item in taxon -%}
 										<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
 									{%- endfor %}
 								</ul>