Parameterises translation

2 files changed, 28 insertions, 25 deletions

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);
 
 <div class="lallans-issue__header-block">
   <header>
-    <h1>{ t(tSite, 'lallans') } { issue.issueNumber }</h1>
-    <p class="italic">{ issue.description[locale] }</p>
+    <h1>{t(tSite, { key: 'lallans' })} {issue.issueNumber}</h1>
+    <p class="italic">{issue.description[locale]}</p>
   </header>
 
   <div class="lallans-issue__header-block-end">
@@ -28,11 +28,10 @@ const t = translate(locale);
   </div>
 </div>
 
-{ 'contributions' in issue ? (
-  <LallansIssueContributions contributions={issue.contributions} locale={locale} />
+{
+  'contributions' in issue ? (
+    <LallansIssueContributions contributions={issue.contributions} locale={locale} />
   ) : (
-    'contributors' in issue && (
-      <LallansIssueContributors contributors={issue.contributors} />
-    )
+    'contributors' in issue && <LallansIssueContributors contributors={issue.contributors} />
   )
-}
\ 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);
 <section>
   <h2>Contributions</h2>
   <ul class="lallans-issue__contributions">
-    { contributions.map(contribution => (
-      <li>
-        <span class="italic">{ contribution.title }</span>
-        { 'author' in contribution && (
-          <span> { t(tSite, 'by') } { contribution.author }</span>
-          )
-        }
-      </li>
-    ))}
+    {
+      contributions.map((contribution) => (
+        <li>
+          <span class="italic">{contribution.title}</span>
+          {'author' in contribution && (
+            <span>
+              {' '}
+              {t(tSite, { key: 'by' })} {contribution.author}
+            </span>
+          )}
+        </li>
+      ))
+    }
   </ul>
-</section>
\ No newline at end of file
+</section>