From b30a200bd4ddc64f4fd3d2124fcda0b354847073 Mon Sep 17 00:00:00 2001
From: Aaron Pham <29749331+aarnphm@users.noreply.github.com>
Date: Fri, 08 Mar 2024 17:14:22 +0000
Subject: [PATCH] fix(i18n): make sure to use correct fileData for manual localization (#975)
---
quartz/components/pages/TagContent.tsx | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/quartz/components/pages/TagContent.tsx b/quartz/components/pages/TagContent.tsx
index 57a6c32..692585c 100644
--- a/quartz/components/pages/TagContent.tsx
+++ b/quartz/components/pages/TagContent.tsx
@@ -1,15 +1,14 @@
-import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
+import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "../types"
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"
+import { i18n } from "../../i18n"
const numPages = 10
-function TagContent(props: QuartzComponentProps) {
+const TagContent: QuartzComponent = (props: QuartzComponentProps) => {
const { tree, fileData, allFiles, cfg } = props
const slug = fileData.slug
@@ -44,10 +43,7 @@
<article>
<p>{content}</p>
</article>
- <p>
- {i18n(cfg.locale, "tagContent.found")} {tags.length}{" "}
- {i18n(cfg.locale, "tagContent.totalTags")}.
- </p>
+ <p>{i18n(cfg.locale).pages.tagContent.totalTags({ count: tags.length })}</p>
<div>
{tags.map((tag) => {
const pages = tagItemMap.get(tag)!
@@ -62,16 +58,21 @@
<div>
<h2>
<a class="internal tag-link" href={`../tags/${tag}`}>
- #{tag}
+ {tag}
</a>
</h2>
{content && <p>{content}</p>}
<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}.`}
+ {i18n(cfg.locale).pages.tagContent.itemsUnderTag({ count: pages.length })}
+ {pages.length > numPages && (
+ <>
+ {" "}
+ <span>
+ {i18n(cfg.locale).pages.tagContent.showingFirst({ count: numPages })}
+ </span>
+ </>
+ )}
</p>
<PageList limit={numPages} {...listProps} />
</div>
@@ -92,10 +93,7 @@
<div class={classes}>
<article>{content}</article>
<div class="page-listing">
- <p>
- {pluralize(pages.length, i18n(cfg.locale, "common.item"))}{" "}
- {i18n(cfg.locale, "tagContent.withThisTag")}.
- </p>
+ <p>{i18n(cfg.locale).pages.tagContent.itemsUnderTag({ count: pages.length })}</p>
<div>
<PageList {...listProps} />
</div>
--
Gitblit v1.10.0