From dbbc672c67aa5ac0a915d22af5cf44c4e7011aae Mon Sep 17 00:00:00 2001
From: Mara-Li <mara-li@outlook.fr>
Date: Sun, 04 Feb 2024 03:55:24 +0000
Subject: [PATCH] feat: Adding support for i18n (closes #462) (#738)
---
quartz/components/pages/TagContent.tsx | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/quartz/components/pages/TagContent.tsx b/quartz/components/pages/TagContent.tsx
index fb72e28..57a6c32 100644
--- a/quartz/components/pages/TagContent.tsx
+++ b/quartz/components/pages/TagContent.tsx
@@ -1,15 +1,16 @@
import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
-import { Fragment, jsx, jsxs } from "preact/jsx-runtime"
-import { toJsxRuntime } from "hast-util-to-jsx-runtime"
import style from "../styles/listPage.scss"
import { PageList } from "../PageList"
import { FullSlug, getAllSegmentPrefixes, simplifySlug } from "../../util/path"
import { QuartzPluginData } from "../../plugins/vfile"
import { Root } from "hast"
+import { pluralize } from "../../util/lang"
+import { htmlToJsx } from "../../util/jsx"
+import { i18n } from "../../i18n/i18next"
const numPages = 10
function TagContent(props: QuartzComponentProps) {
- const { tree, fileData, allFiles } = props
+ const { tree, fileData, allFiles, cfg } = props
const slug = fileData.slug
if (!(slug?.startsWith("tags/") || slug === "tags")) {
@@ -25,22 +26,28 @@
const content =
(tree as Root).children.length === 0
? fileData.description
- : // @ts-ignore
- toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: "html" })
-
- if (tag === "") {
- const tags = [...new Set(allFiles.flatMap((data) => data.frontmatter?.tags ?? []))]
+ : htmlToJsx(fileData.filePath!, tree)
+ const cssClasses: string[] = fileData.frontmatter?.cssclasses ?? []
+ const classes = ["popover-hint", ...cssClasses].join(" ")
+ if (tag === "/") {
+ const tags = [
+ ...new Set(
+ allFiles.flatMap((data) => data.frontmatter?.tags ?? []).flatMap(getAllSegmentPrefixes),
+ ),
+ ].sort((a, b) => a.localeCompare(b))
const tagItemMap: Map<string, QuartzPluginData[]> = new Map()
for (const tag of tags) {
tagItemMap.set(tag, allPagesWithTag(tag))
}
-
return (
- <div class="popover-hint">
+ <div class={classes}>
<article>
<p>{content}</p>
</article>
- <p>Found {tags.length} total tags.</p>
+ <p>
+ {i18n(cfg.locale, "tagContent.found")} {tags.length}{" "}
+ {i18n(cfg.locale, "tagContent.totalTags")}.
+ </p>
<div>
{tags.map((tag) => {
const pages = tagItemMap.get(tag)!
@@ -54,16 +61,20 @@
return (
<div>
<h2>
- <a class="internal tag-link" href={`./${tag}`}>
+ <a class="internal tag-link" href={`../tags/${tag}`}>
#{tag}
</a>
</h2>
{content && <p>{content}</p>}
- <p>
- {pages.length} items with this tag.{" "}
- {pages.length > numPages && `Showing first ${numPages}.`}
- </p>
- <PageList limit={numPages} {...listProps} />
+ <div class="page-listing">
+ <p>
+ {pluralize(pages.length, i18n(cfg.locale, "common.item"))}{" "}
+ {i18n(cfg.locale, "tagContent.withThisTag")}.{" "}
+ {pages.length > numPages &&
+ `${i18n(cfg.locale, "tagContent.showingFirst")} ${numPages}.`}
+ </p>
+ <PageList limit={numPages} {...listProps} />
+ </div>
</div>
)
})}
@@ -78,11 +89,16 @@
}
return (
- <div class="popover-hint">
+ <div class={classes}>
<article>{content}</article>
- <p>{pages.length} items with this tag.</p>
- <div>
- <PageList {...listProps} />
+ <div class="page-listing">
+ <p>
+ {pluralize(pages.length, i18n(cfg.locale, "common.item"))}{" "}
+ {i18n(cfg.locale, "tagContent.withThisTag")}.
+ </p>
+ <div>
+ <PageList {...listProps} />
+ </div>
</div>
</div>
)
--
Gitblit v1.10.0