From c8fe95967a5caebf00cce6adc068a0e319668ee9 Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Sun, 17 Jul 2022 14:05:59 +0300 Subject: [PATCH] Translate badges page --- app/routes/badges.tsx | 18 +++++++++++++----- app/routes/badges/$id.tsx | 9 +++++++-- public/locales/en/badges.json | 5 ++++- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/app/routes/badges.tsx b/app/routes/badges.tsx index 79830cedd..4d23593e6 100644 --- a/app/routes/badges.tsx +++ b/app/routes/badges.tsx @@ -7,6 +7,7 @@ import { db } from "~/db"; import type { All } from "~/db/models/badges.server"; import styles from "~/styles/badges.css"; import { BORZOIC_TWITTER, FAQ_PAGE } from "~/utils/urls"; +import { Trans, useTranslation } from "react-i18next"; export const links: LinksFunction = () => { return [{ rel: "stylesheet", href: styles }]; @@ -16,11 +17,16 @@ export interface BadgesLoaderData { badges: All; } +export const handle = { + i18n: "badges", +}; + export const loader: LoaderFunction = () => { return json({ badges: db.badges.all() }); }; export default function BadgesPageLayout() { + const { t } = useTranslation("badges"); const data = useLoaderData(); return ( @@ -42,13 +48,15 @@ export default function BadgesPageLayout() {

- Badges by{" "} - - borzoic - + + Badges by{" "} + + borzoic + +

- Badge for your event? + {t("forYourEvent")}

diff --git a/app/routes/badges/$id.tsx b/app/routes/badges/$id.tsx index fdbab8e51..2b91ab58c 100644 --- a/app/routes/badges/$id.tsx +++ b/app/routes/badges/$id.tsx @@ -65,7 +65,9 @@ export default function BadgeDetailsPage() { invisible: data.managers.length === 0, })} > - Managed by {data.managers.map((m) => discordFullName(m)).join(", ")} + {t("managedBy", { + users: data.managers.map((m) => discordFullName(m)).join(", "), + })} {canEditBadgeOwners({ user, managers: data.managers }) ? ( @@ -102,5 +104,8 @@ export function badgeExplanationText( return t("patreon+"); } - return t("tournament", { count: badge.count, tournament: badge.displayName }); + return t("tournament", { + count: badge.count ?? 1, + tournament: badge.displayName, + }); } diff --git a/public/locales/en/badges.json b/public/locales/en/badges.json index b56d476cb..8ad455201 100644 --- a/public/locales/en/badges.json +++ b/public/locales/en/badges.json @@ -2,5 +2,8 @@ "patreon": "Supporter of sendou.ink on Patreon", "patreon+": "Supporter+ of sendou.ink on Patreon", "tournament_one": "Awarded for winning {{tournament}}", - "tournament_other": "Awarded for winning {{tournament}} (×{{count}})" + "tournament_other": "Awarded for winning {{tournament}} (×{{count}})", + "forYourEvent": "Badge for your event?", + "madeBy": "Badges by <2>borzoic", + "managedBy": "Managed by {{users}}" }