From e0c5ec43f5c2a105dc3c626d7c4bc74b512662f4 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Sat, 12 Aug 2023 17:22:33 +0100 Subject: Parameterises translation --- src/components/LallansIssue.astro | 27 +++++++++++++------------- src/components/LallansIssueContributions.astro | 26 ++++++++++++++----------- 2 files changed, 28 insertions(+), 25 deletions(-) (limited to 'src/components') diff --git a/src/components/LallansIssue.astro b/src/components/LallansIssue.astro index 915c17d..d60e2fe 100644 --- a/src/components/LallansIssue.astro +++ b/src/components/LallansIssue.astro @@ -1,11 +1,11 @@ --- -import translate from "../i18n/translate"; +import translate from '../i18n/translate'; import tSite from '../i18n/translations/site'; -import type LallansIssue from "../types/LallansIssue"; -import type Locale from "../types/Locale"; -import LallansIssueContributions from "./LallansIssueContributions.astro"; -import LallansIssueContributors from "./LallansIssueContributors.astro"; -import PayPalButtons from "./PayPalButtons.astro"; +import type LallansIssue from '../types/LallansIssue'; +import type Locale from '../types/Locale'; +import LallansIssueContributions from './LallansIssueContributions.astro'; +import LallansIssueContributors from './LallansIssueContributors.astro'; +import PayPalButtons from './PayPalButtons.astro'; interface Props { issue: LallansIssue; @@ -18,8 +18,8 @@ const t = translate(locale);
-

{ t(tSite, 'lallans') } { issue.issueNumber }

-

{ issue.description[locale] }

+

{t(tSite, { key: 'lallans' })} {issue.issueNumber}

+

{issue.description[locale]}

@@ -28,11 +28,10 @@ const t = translate(locale);
-{ 'contributions' in issue ? ( - +{ + 'contributions' in issue ? ( + ) : ( - 'contributors' in issue && ( - - ) + 'contributors' in issue && ) -} \ No newline at end of file +} diff --git a/src/components/LallansIssueContributions.astro b/src/components/LallansIssueContributions.astro index 2888ca6..cfd3392 100644 --- a/src/components/LallansIssueContributions.astro +++ b/src/components/LallansIssueContributions.astro @@ -1,5 +1,5 @@ --- -import translate from "../i18n/translate"; +import translate from '../i18n/translate'; import tSite from '../i18n/translations/site'; import type { Contribution } from '../types/LallansIssue'; import type Locale from '../types/Locale'; @@ -16,14 +16,18 @@ const t = translate(locale);

Contributions

    - { contributions.map(contribution => ( -
  • - { contribution.title } - { 'author' in contribution && ( - { t(tSite, 'by') } { contribution.author } - ) - } -
  • - ))} + { + contributions.map((contribution) => ( +
  • + {contribution.title} + {'author' in contribution && ( + + {' '} + {t(tSite, { key: 'by' })} {contribution.author} + + )} +
  • + )) + }
-
\ No newline at end of file + -- cgit v1.2.3