fix: wrong post count in categories

layouts/partials/js-selector.html

@@ -4,6 +4,13 @@
 {{ if or (eq .RelPermalink "/") (eq .RelPermalink (relLangURL "/")) }}
   {{ $is_home = true }}
 {{ end }}
+{{ $is_categories := and (eq .Kind "taxonomy") (eq .Type "categories") }}
+{{ $is_category := and (eq .Kind "term") (eq .Type "categories") }}
+{{ $is_tags := and (eq .Kind "taxonomy") (eq .Type "tags") }}
+{{ $is_tag := and (eq .Kind "term") (eq .Type "tags") }}
+{{ $is_post := eq .Type "post"}}
+{{ $is_page := eq .Layout "page"}}
+{{ $is_archives := eq .Layout "archives"}}
 {{- $jsOpts := dict
   "target" "es2015"
   "minify" (eq hugo.Environment "production")
@@ -70,13 +77,13 @@
 {{ $js := "commons" }}
 {{ if $is_home }}
   {{ $js = "home" }}
-{{ else if eq .Layout "categories" }}
+{{ else if $is_categories }}
   {{ $js = "categories" }}
-{{ else if eq .Type "post" }}
+{{ else if $is_post }}
   {{ $js = "post" }}
-{{ else if eq .Layout "page" }}
+{{ else if $is_page }}
   {{ $js = "page" }}
-{{ else if or (eq .Layout "archives") (eq .Type "categories") (eq .Type "tags") }}
+{{ else if or $is_archives $is_category $is_tag }}
   {{ $js = "misc" }}
 {{ end }}
 

layouts/taxonomy/category.terms.html

@@ -1,33 +1,28 @@
-
 {{ define "main" }}
 <article class="px-1">
   <h1 class="dynamic-title">
     {{ i18n "tabs.categories" }}
   </h1>
   <div class="content">
-    <div class="container">
+    {{ $allPages := where .Site.RegularPages "Type" "post" }}
-      {{ $categories := .Site.Taxonomies.categories }}
     
-      <!-- 首先收集所有唯一的父分类 -->
+    <!-- get all parent categories -->
     {{ $parentCategories := slice }}
-      {{ range $name, $taxonomy := $categories }}
+    {{ range $allPages }}
-        {{ range $taxonomy.Pages }}
       {{ if gt (len .Params.categories) 0 }}
         {{ $parentCategories = $parentCategories | append (index .Params.categories 0) }}
       {{ end }}
     {{ end }}
-      {{ end }}
     {{ $parentCategories = $parentCategories | uniq | sort }}
     
-      <!-- 然后为每个父分类创建卡片 -->
+    <!-- create card for each parent category -->
-      {{ range $parentCategories }}
+    {{ range $index, $category := $parentCategories }}
       {{ $parentName := . }}
       {{ $subcategories := slice }}
       {{ $parentPages := slice }}
       
-        <!-- 收集与此父分类相关的所有页面和子分类 -->
+      <!-- get all pages and subcategories related to the parent category -->
-        {{ range $name, $taxonomy := $categories }}
+      {{ range $allPages }}
-          {{ range $taxonomy.Pages }}
         {{ if gt (len .Params.categories) 0 }}
           {{ if eq (index .Params.categories 0) $parentName }}
             {{ $parentPages = $parentPages | append . }}
@@ -37,11 +32,10 @@
           {{ end }}
         {{ end }}
       {{ end }}
-        {{ end }}
       {{ $subcategories = $subcategories | uniq | sort }}
 
       <div class="card categories mb-3">
-          <div class="card-header d-flex justify-content-between hide-border-bottom">
+        <div id="h_{{ $index }}" class="card-header d-flex justify-content-between hide-border-bottom">
           <span class="ms-2">
             <i class="far fa-folder{{ if gt (len $subcategories) 0 }}-open{{ end }} fa-fw"></i>
             <a href="{{ "/categories/" | relLangURL }}{{ $parentName | urlize }}" class="mx-2">{{ $parentName }}</a>
@@ -49,22 +43,22 @@
               {{ if gt (len $subcategories) 0 }}
                 {{ len $subcategories }}
                 {{ if gt (len $subcategories) 1 }}
-                    subcategories,
+                  {{ i18n "categories.category_measure" | default (i18n "categories.category_measure.plural") }},
                 {{ else }}
-                    subcategory,
+                  {{ i18n "categories.category_measure" | default (i18n "categories.category_measure.singular") }},
                 {{ end }}
               {{ end }}
               {{ len $parentPages }}
               {{ if gt (len $parentPages) 1 }}
-                  posts
+                {{ i18n "categories.post_measure" | default (i18n "categories.post_measure.plural") }}
               {{ else }}
-                  post
+                {{ i18n "categories.post_measure" | default (i18n "categories.post_measure.singular") }}
               {{ end }}
             </span>
           </span>
 
           {{ if gt (len $subcategories) 0 }}
-              <a href="#sub-{{ $parentName | anchorize }}" data-bs-toggle="collapse" aria-expanded="true">
+            <a href="#l_{{ $index }}" data-bs-toggle="collapse" aria-expanded="false" aria-label="{{ $parentName }}-trigger" class="category-trigger hide-border-bottom">
               <i class="fas fa-fw fa-angle-down"></i>
             </a>
           {{ else }}
@@ -75,12 +69,12 @@
         </div>
 
         {{ if gt (len $subcategories) 0 }}
-            <div id="sub-{{ $parentName | anchorize }}" class="collapse show">
+          <div id="l_{{ $index }}" class="collapse show">
-              <ul class="list-group list-group-flush">
+            <ul class="list-group">
               {{ range $subcategories }}
                 {{ $subCategoryName := . }}
                 
-                  <!-- 查找子分类的文章 -->
+                <!-- get pages related to the subcategories -->
                 {{ $subPages := slice }}
                 {{ range $parentPages }}
                   {{ if gt (len .Params.categories) 1 }}
@@ -96,9 +90,9 @@
                   <span class="text-muted small font-weight-light">
                     {{ len $subPages }}
                     {{ if gt (len $subPages) 1 }}
-                        posts
+                      {{ i18n "categories.post_measure" | default (i18n "categories.post_measure.plural") }}
                     {{ else }}
-                        post
+                      {{ i18n "categories.post_measure" | default (i18n "categories.post_measure.singular") }}
                     {{ end }}
                   </span>
                 </li>
@@ -109,6 +103,5 @@
       </div>
     {{ end }}
   </div>
-  </div>
 </article>
 {{ end }}