Merge pull request 'fix(taxonomy_list): taxonomy_list still display as 'tags'' (#152) from jim60105/duckquill:fix/taxonomy_list_display_as_tags into main

Reviewed-on: https://codeberg.org/daudix/duckquill/pulls/152

CHANGELOG.md

@@ -5,7 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://codeberg.org/daudix/duckquill/compare/v6.1.1...main)
+## [Unreleased](https://codeberg.org/daudix/duckquill/compare/v6.3.0...main)
+
+## [v6.3.0](https://codeberg.org/daudix/duckquill/compare/v6.2.0...v6.3.0) - 2025-04-19
+
+### Added
+
+- Add German translation (#130).
+
+### Fixed
+
+- Output an error message if title is not set in `config.toml` (#129).
 
 ## [v6.2.0](https://codeberg.org/daudix/duckquill/compare/v6.1.1...v6.2.0) - 2025-03-30
 

content/_index.md

@@ -66,7 +66,7 @@ It is highly recommended to switch from the `main` branch to the latest release:
 
 ```bash
 cd themes/duckquill
-git checkout tags/v6.2.0
+git checkout tags/v6.3.0
 ```
 
 Then, enable it in your `config.toml`:
@@ -80,7 +80,7 @@ To update the theme, simply switch to a new tag:
 ```bash
 git submodule update --remote --merge
 cd themes/duckquill
-git checkout tags/v6.2.0
+git checkout tags/v6.3.0
 ```
 
 {% alert(important=true) %}
@@ -212,7 +212,6 @@ Files named `favicon.png` and `apple-touch-icon.png` are used as favicon and App
 - [blog.millefeuille42.fr](https://blog.millefeuille42.fr)
 - [blog.pansi21.xyz](https://blog.pansi21.xyz)
 - [blog.thundernetwork.org](https://blog.thundernetwork.org)
-- [blog2.maki0419.com](https://blog2.maki0419.com)
 - [cabysm.github.io](https://cabysm.github.io)
 - [daveparr.info](https://www.daveparr.info)
 - [davepoltorak.com](https://davepoltorak.com)
@@ -256,6 +255,7 @@ Files named `favicon.png` and `apple-touch-icon.png` are used as favicon and App
 - [winnydows.com](https://winnydows.com)
 - [zlog.si-on.top](https://zlog.si-on.top)
 - [zstg.is-a.dev](https://zstg.is-a.dev)
+- [琳.tw](https://xn--jgy.tw/)
 - Yours? <small>(feel free to [contact me](https://daudix.one/find/#contacts) or send a pull request)</small>
 
 </details>

i18n/zh-Hans.toml

@@ -4,8 +4,7 @@ language_name = "简体中文"
 # (post publication date, tag posts list...).
 # Not used in comments, "date_locale" is used instead.
 # See https://docs.rs/chrono/0.4.31/chrono/format/strftime/index.html
-# TODO: Update date format to match the Chinese format.
+date_format = "%Y 年 %m 月 %d 日"
-date_format = "%B %d, %Y"
 date_locale = "zh_CN"
 
 # Menu items.
@@ -16,7 +15,7 @@ Demo = "演示"
 Mods = "模组"
 Coffee = "赞助"
 
-all_tags = "查看所有标签"
+all_taxa = "查看所有$TAXON"
 archived = "归档"
 author = "作者"
 author_conjunction = "和"
@@ -59,7 +58,7 @@ one_tags = "共有 $NUMBER 个标签"
 open_post = "打开帖子"
 poor = "冷清"
 posts = "共有 $NUMBER 篇文章"
-posts_with_tag = "带有 $TAG 标签的文章"
+posts_with_taxon = "属于 $TERM $TAXON的文章"
 powered_by = "由 $ZOLA 和 $DUCKQUILL 强力驱动"
 previous = "上一篇"
 published = "发布于"

i18n/zh-Hant.toml

@@ -15,7 +15,7 @@ Demo = "展示"
 Mods = "模組"
 Coffee = "贊助"
 
-all_tags = "查看所有標籤"
+all_taxa = "查看所有$TAXON"
 archived = "封存"
 author = "作者"
 author_conjunction = "和"
@@ -58,7 +58,7 @@ one_tags = "共有 $NUMBER 個標籤"
 open_post = "打開文章"
 poor = "冷清"
 posts = "共有 $NUMBER 篇文章"
-posts_with_tag = "帶有 $TAG 標籤的文章"
+posts_with_taxon = "屬於 $TERM $TAXON的文章"
 powered_by = "由 $ZOLA 和 $DUCKQUILL 提供"
 previous = "上一篇"
 published = "發布於"

sass/style.scss

@@ -1,5 +1,5 @@
 /*!
- * Duckquill v6.2.0 (https://duckquill.daudix.one)
+ * Duckquill v6.3.0 (https://duckquill.daudix.one)
  * Copyright 2024-2025 David "Daudix" Lapshin
  * Licensed under MIT (https://codeberg.org/daudix/duckquill/src/branch/main/LICENSE)
  */

templates/article.html

@@ -62,7 +62,7 @@
 		{%- if page.taxonomies -%}
 			{%- for name, taxon in page.taxonomies %}
 				<ul class="tags">
-					<a class="tag" href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=name) | lower -}}">{{ name }}:</a>
+					<a class="tag" href="{{- get_url(path=name, lang=lang) | lower -}}">{{ macros_translate::translate(key=name, default=name, language_strings=language_strings) }}:</a>
 					{%- for item in taxon -%}
 					    <li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
 					{%- endfor %}

templates/partials/articles.html

@@ -53,7 +53,7 @@
 						{%- for name, taxon in page.taxonomies %}
 							<small>
 								<ul class="tags">
-									<a class="tag" href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=name) | lower -}}">{{ name }}:</a>
+									<a class="tag" href="{{- get_url(path=name, lang=lang) | lower -}}">{{ macros_translate::translate(key=name, default=name, language_strings=language_strings) }}:</a>
 									{%- for item in taxon -%}
 										<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
 									{%- endfor %}

templates/partials/title.html

@@ -1,7 +1,11 @@
 {# Taken from https://github.com/welpo/tabi/blob/69713c973c11d7646c8fe56476261d96cc1978d8/templates/partials/title.html #}
 
 {#- Setup -#}
+{%- if config.title -%}
 	{%- set suffix = config.title | safe -%}
+{%- else -%}
+	{{- throw(message='Title has not been set in config.toml, Please set one.') -}}
+{%- endif -%}
 {%- set custom_separator = config.extra.title_separator | default(value="-") -%}
 {%- set separator = " " ~ custom_separator ~ " " -%}
 

templates/taxonomy_list.html

@@ -3,10 +3,10 @@
 {% block content %}
 {%- 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>
+<h1>{{- macros_translate::translate(key=taxon_name ~ "_title", default=taxonomy.name | capitalize, language_strings=language_strings) -}}</h1>
 
 <p>
-	<small>{{- macros_translate::translate(key="tags", number=number_of_terms, default="$NUMBER $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</small>
+	<small>{{ macros_translate::translate(key=taxonomy.name, number=number_of_terms, default="$NUMBER " ~ taxonomy.name, language_strings=language_strings) }}</small>
 </p>
 
 <ul class="tags">

templates/taxonomy_single.html

@@ -6,16 +6,17 @@
 {%- set number_of_posts = term.pages | length -%}
 
 {%- set taxon_name = taxonomy.name -%}
+{%- set taxon_name_i18n = macros_translate::translate(key=taxonomy.name, default=taxonomy.name, language_strings=language_strings) -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
-	{{- 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) -}}
+	{{- macros_translate::translate(key='posts_with_taxon', default='Posts with $TAXON $TERM', language_strings=language_strings) | replace(from="$TAXON", to=taxon_name_i18n) | 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='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) | lower -}}">
+		<a href="{{- get_url(path=taxonomy.name, lang=lang) | lower -}}">
-			{{- macros_translate::translate(key="all_taxa", default="See all $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
+			{{- macros_translate::translate(key="all_taxa", default="See all $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name_i18n) -}}
 		</a>
 		<br />
 		{{ macros_translate::translate(key='posts', number=number_of_posts, default='$NUMBER posts', language_strings=language_strings) }}