2 files changed, 7 insertions, 4 deletions
diff --git a/ennu-html.el b/ennu-html.el
index 877e561..8f38ba5 100644
--- a/ennu-html.el
+++ b/ennu-html.el
@@ -61,7 +61,8 @@
             (lambda (tag)
               (replace-regexp-in-string
                "<a " "<a class=\"p-category\" "
-               (ennu-export-tag tag nil (plist-get info :backend))))
+               (ennu-export-tag (ennu-add-tongue-suffix tag (plist-get info :language))
+                                tag (plist-get info :backend))))
             (plist-get info :filetags) ", "))
    ;; Summary
    (format "<div class=\"p-summary\">%s</div>"
diff --git a/ennu.el b/ennu.el
index 977771c..9a4adfa 100644
--- a/ennu.el
+++ b/ennu.el
@@ -188,9 +188,11 @@ last form in BODY."
                       (when-let ((tags (ennu-post-tags post)))
                         (insert "Tags: ")
                         (insert
-                         (string-join (seq-map (apply-partially 'format "[[tag:%s]]")
-                                               tags)
-                                      ", "))
+                         (string-join
+                          (seq-map (lambda (tag)
+                                     (format "[[tag:%s][%s]]" (ennu-add-tongue-suffix tag tongue) tag))
+                                   tags)
+                          ", "))
                         (insert "\n\n")))
                     posts)
             (unless (= page-number 1)