From 859babf25d380aacf120ec307deb7168eb103594 Mon Sep 17 00:00:00 2001
From: SindreKjelsrud <sindre@kjelsrud.dev>
Date: Sat, 14 Sep 2024 12:29:51 +0200
Subject: [PATCH 1/4] :speech_balloon: add more info in sponsor-section #27

Signed-off-by: SindreKjelsrud <sindre@kjelsrud.dev>
---
 src/i18n/translations.ts | 42 ++++++++++++++++++++++++++++++++++++----
 src/pages/sponsor.astro  | 22 +++++++++++++++++----
 2 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/i18n/translations.ts b/src/i18n/translations.ts
index b7abda6..6e06636 100644
--- a/src/i18n/translations.ts
+++ b/src/i18n/translations.ts
@@ -31,8 +31,25 @@ export const no = {
     "gir sponsorer muligheten til å nå en bred målgruppe som inkluderer studenter og etablerte utviklere innen bransjen, under Bergen Open Source-konferansen. Vi ønsker selvsagt å gjøre konferansedagen enda mer minneverdig for dem! Dette kan inkludere alt i fra en kort presentasjon av selskapet til tilpassede logo-merkede sokker og godbiter. (Kanskje til og med noen overraskelser som gleder deltakerne🎫🍺?)",
   "sponsors.contact1": "Ønsker du også å støtte konferansen som sponsor?",
   "sponsors.contact2": "Ta kontakt med Sindre på 📨: ",
-  "sponsors.contact3":
-    "Vennligst merk at vi har et begrenset antall plasser tilgjengelig for lyntaler.",
+  "sponsors.price":"Vi har en sponsorpakke til 5000,- som inneholder følgende ting: ",
+  "sponsors.goods":[
+    {
+      "item":"Vår takknemlighet via SoMe innlegg",
+    },
+    {
+      "item":"Logo på nettside",
+    },
+    {
+      "item":"Roll-up banner på konferanse (sponsor må stille med egen)",
+    },
+    {
+      "item":"Bruke BOSkonf logo selv",
+    },
+    {
+      "item":"Jobbutlysninger kan bli nevnt i introduksjon og avslutning av konferansen (høyst relevant for både studenter og deltakere allerede i jobb)",
+    },
+  ],
+  "sponsors.highest": "I tillegg vil høyeste spons få et eget tidsrom for lynpresentasjon fra deres eget selskap (må være relatert til Open Source)."
 };
 export const en: typeof no = {
   "header.home": "Home",
@@ -63,6 +80,23 @@ export const en: typeof no = {
   "sponsors.contact1":
     "Do you also want to support the conference as a sponsor?",
   "sponsors.contact2": "Contact Sindre at 📨: ",
-  "sponsors.contact3":
-    "Please note that we have a limited number of spots available for lightning talks.",
+  "sponsors.price": "We have a sponsor package for 5000,- which includes the following items:",
+  "sponsors.goods": [
+    {
+      "item": "Our gratitude via SoMe posts"
+    },
+    {
+      "item": "Logo on website"
+    },
+    {
+      "item": "Roll-up banner at the conference (sponsor must provide their own)"
+    },
+    {
+      "item": "Use of BOSkonf logo themselves"
+    },
+    {
+      "item": "Job postings can be mentioned in the introduction and conclusion of the conference (highly relevant for both students and participants already in jobs)"
+    }
+  ],
+  "sponsors.highest": "In addition, the highest sponsor will get a dedicated time slot for a lightning presentation from their company (must be related to Open Source)."
 };
diff --git a/src/pages/sponsor.astro b/src/pages/sponsor.astro
index 0946588..228bfcd 100644
--- a/src/pages/sponsor.astro
+++ b/src/pages/sponsor.astro
@@ -2,6 +2,7 @@
 import Layout from "../layouts/Layout.astro";
 import { useTranslation } from "../i18n/utils";
 const t = useTranslation(Astro.url);
+const goods = t("sponsors.goods");
 ---
 
 <Layout title="Bergen Open Source-konferanse">
@@ -18,14 +19,23 @@ const t = useTranslation(Astro.url);
               class="heroTxt">friByte</a
             >
             {t("sponsors.become")}
-            <p>{t("sponsors.contact1")}</p>
             <p>
+              {t("sponsors.contact1")}
               {t("sponsors.contact2")}<a
                 href="mailto:sindre.kjelsrud@fribyte.no"
                 class="heroTxt">sindre.kjelsrud@fribyte.no</a
               >
             </p>
-            <p>{t("sponsors.contact3")}</p>
+            <p>{t("sponsors.price")}</p>
+            <div>
+              {
+                goods.map((item: any, index: any) => (
+                  <ul key={index}>
+                    <li>{item.item}</li>
+                  </ul>
+                ))
+              }
+            </div>
           </p>
         </div>
       </div>
@@ -36,7 +46,7 @@ const t = useTranslation(Astro.url);
 <style>
   .content {
     color: #f1f1f1;
-    padding: 5rem 2rem;
+    padding: 1rem 2rem;
     max-width: var(--content-width);
     margin: 0 auto;
   }
@@ -45,13 +55,17 @@ const t = useTranslation(Astro.url);
     width: 100%;
 
     p {
-      font-size: 1.75rem;
+      font-size: 1.2rem;
       font-weight: 300;
     }
     a {
       width: max-content;
       margin: 6rem 0 0 0;
     }
+    ul li {
+      margin-left: 2rem;
+      list-style-type: disc;
+    }
   }
   .txtCont .heroTxt {
     color: #12e8be;

From 0bc155f2dbf7a83a8f7669ee2c52de1ed2a0f883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20Haugsb=C3=B8?= <mathiash98@gmail.com>
Date: Sat, 14 Sep 2024 13:19:05 +0200
Subject: [PATCH 2/4] translations support list of strings

---
 src/i18n/translations.ts | 54 ++++++++++++++--------------------------
 src/i18n/utils.ts        |  2 +-
 src/pages/sponsor.astro  |  6 ++---
 3 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/src/i18n/translations.ts b/src/i18n/translations.ts
index 6e06636..3a2a6ae 100644
--- a/src/i18n/translations.ts
+++ b/src/i18n/translations.ts
@@ -31,25 +31,17 @@ export const no = {
     "gir sponsorer muligheten til å nå en bred målgruppe som inkluderer studenter og etablerte utviklere innen bransjen, under Bergen Open Source-konferansen. Vi ønsker selvsagt å gjøre konferansedagen enda mer minneverdig for dem! Dette kan inkludere alt i fra en kort presentasjon av selskapet til tilpassede logo-merkede sokker og godbiter. (Kanskje til og med noen overraskelser som gleder deltakerne🎫🍺?)",
   "sponsors.contact1": "Ønsker du også å støtte konferansen som sponsor?",
   "sponsors.contact2": "Ta kontakt med Sindre på 📨: ",
-  "sponsors.price":"Vi har en sponsorpakke til 5000,- som inneholder følgende ting: ",
-  "sponsors.goods":[
-    {
-      "item":"Vår takknemlighet via SoMe innlegg",
-    },
-    {
-      "item":"Logo på nettside",
-    },
-    {
-      "item":"Roll-up banner på konferanse (sponsor må stille med egen)",
-    },
-    {
-      "item":"Bruke BOSkonf logo selv",
-    },
-    {
-      "item":"Jobbutlysninger kan bli nevnt i introduksjon og avslutning av konferansen (høyst relevant for både studenter og deltakere allerede i jobb)",
-    },
+  "sponsors.price":
+    "Vi har en sponsorpakke til 5000,- som inneholder følgende ting: ",
+  "sponsors.goods": [
+    "Vår takknemlighet via SoMe innlegg",
+    "Logo på nettside",
+    "Roll-up banner på konferanse (sponsor må stille med egen)",
+    "Bruke BOSkonf logo selv",
+    "Jobbutlysninger kan bli nevnt i introduksjon og avslutning av konferansen (høyst relevant for både studenter og deltakere allerede i jobb)",
   ],
-  "sponsors.highest": "I tillegg vil høyeste spons få et eget tidsrom for lynpresentasjon fra deres eget selskap (må være relatert til Open Source)."
+  "sponsors.highest":
+    "I tillegg vil høyeste spons få et eget tidsrom for lynpresentasjon fra deres eget selskap (må være relatert til Open Source).",
 };
 export const en: typeof no = {
   "header.home": "Home",
@@ -80,23 +72,15 @@ export const en: typeof no = {
   "sponsors.contact1":
     "Do you also want to support the conference as a sponsor?",
   "sponsors.contact2": "Contact Sindre at 📨: ",
-  "sponsors.price": "We have a sponsor package for 5000,- which includes the following items:",
+  "sponsors.price":
+    "We have a sponsor package for 5000,- which includes the following items:",
   "sponsors.goods": [
-    {
-      "item": "Our gratitude via SoMe posts"
-    },
-    {
-      "item": "Logo on website"
-    },
-    {
-      "item": "Roll-up banner at the conference (sponsor must provide their own)"
-    },
-    {
-      "item": "Use of BOSkonf logo themselves"
-    },
-    {
-      "item": "Job postings can be mentioned in the introduction and conclusion of the conference (highly relevant for both students and participants already in jobs)"
-    }
+    "Our gratitude via SoMe posts",
+    "Logo on website",
+    "Roll-up banner at the conference (sponsor must provide their own)",
+    "Use of BOSkonf logo themselves",
+    "Job postings can be mentioned in the introduction and conclusion of the conference (highly relevant for both students and participants already in jobs)",
   ],
-  "sponsors.highest": "In addition, the highest sponsor will get a dedicated time slot for a lightning presentation from their company (must be related to Open Source)."
+  "sponsors.highest":
+    "In addition, the highest sponsor will get a dedicated time slot for a lightning presentation from their company (must be related to Open Source).",
 };
diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts
index f5df2ca..530ab78 100644
--- a/src/i18n/utils.ts
+++ b/src/i18n/utils.ts
@@ -18,7 +18,7 @@ export function useTranslation(url?: URL, language?: keyof typeof langs) {
     throw new Error("Either url or language must be defined");
   }
 
-  return function t(key: keyof typeof no): string {
+  return function t(key: keyof typeof no): string | string[] {
     const currentLanguage = url
       ? getLangFromUrl(url)
       : (language ?? defaultLang);
diff --git a/src/pages/sponsor.astro b/src/pages/sponsor.astro
index 228bfcd..9c598c2 100644
--- a/src/pages/sponsor.astro
+++ b/src/pages/sponsor.astro
@@ -29,9 +29,9 @@ const goods = t("sponsors.goods");
             <p>{t("sponsors.price")}</p>
             <div>
               {
-                goods.map((item: any, index: any) => (
-                  <ul key={index}>
-                    <li>{item.item}</li>
+                (goods as string[]).map((item) => (
+                  <ul>
+                    <li>{item}</li>
                   </ul>
                 ))
               }

From a5f928819b18f6256d2cf13561e589c51922720b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20Haugsb=C3=B8?= <mathiash98@gmail.com>
Date: Sat, 14 Sep 2024 13:22:04 +0200
Subject: [PATCH 3/4] Fix #36 by adding a sponsor page in en folder

---
 src/pages/en/sponsor.astro | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/pages/en/sponsor.astro

diff --git a/src/pages/en/sponsor.astro b/src/pages/en/sponsor.astro
new file mode 100644
index 0000000..0e6efc5
--- /dev/null
+++ b/src/pages/en/sponsor.astro
@@ -0,0 +1,5 @@
+---
+import GenericSponsor from "../sponsor.astro";
+---
+
+<GenericSponsor />

From 3fb7a14189872e6546245f760e9960db046392bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20Haugsb=C3=B8?= <mathiash98@gmail.com>
Date: Sat, 14 Sep 2024 14:08:22 +0200
Subject: [PATCH 4/4] Translation allow string[] with default generic type
 string

---
 src/i18n/utils.ts       | 26 +++++++++++++++++++-------
 src/pages/sponsor.astro |  4 ++--
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts
index 530ab78..66fc54f 100644
--- a/src/i18n/utils.ts
+++ b/src/i18n/utils.ts
@@ -3,6 +3,11 @@ import { en, no } from "./translations";
 export const langs = { no, en };
 const defaultLang = "no";
 
+/**
+ * Get the language from the URL.
+ * @param url The URL to get the language from
+ * @returns The language from the URL
+ */
 export function getLangFromUrl(url: URL) {
   const [, lang] = url.pathname.split("/");
   if (lang in langs) return lang as keyof typeof langs;
@@ -10,18 +15,25 @@ export function getLangFromUrl(url: URL) {
 }
 
 /**
- * Get the localized string from `key`.
- * @param key
+ * Use this hook to get the correct translation of a key.
  */
 export function useTranslation(url?: URL, language?: keyof typeof langs) {
   if (!url && !language) {
     throw new Error("Either url or language must be defined");
   }
 
-  return function t(key: keyof typeof no): string | string[] {
-    const currentLanguage = url
-      ? getLangFromUrl(url)
-      : (language ?? defaultLang);
-    return langs[currentLanguage][key];
+  function getCurrentLang() {
+    return url ? getLangFromUrl(url) : (language ?? defaultLang);
+  }
+  /**
+   * Fetches the correct translation of key from the current language.
+   * If the text is an array of strings you can use `t<string[]>("key")` to get correct TS.
+   * @param key The key to fetch from the translations, e.g. "sponsors.goods"
+   * @returns The translation of the key
+   * @example t<string[]>("sponsors.goods") // ["string A", "string B"]
+   * @example t("sponsors.become") // "gives sponsors the opportunity..."
+   */
+  return function t<T extends string | string[]>(key: keyof typeof no) {
+    return langs[getCurrentLang()][key] as T;
   };
 }
diff --git a/src/pages/sponsor.astro b/src/pages/sponsor.astro
index 9c598c2..9c5e8f8 100644
--- a/src/pages/sponsor.astro
+++ b/src/pages/sponsor.astro
@@ -2,7 +2,7 @@
 import Layout from "../layouts/Layout.astro";
 import { useTranslation } from "../i18n/utils";
 const t = useTranslation(Astro.url);
-const goods = t("sponsors.goods");
+const goods = t<string[]>("sponsors.goods");
 ---
 
 <Layout title="Bergen Open Source-konferanse">
@@ -29,7 +29,7 @@ const goods = t("sponsors.goods");
             <p>{t("sponsors.price")}</p>
             <div>
               {
-                (goods as string[]).map((item) => (
+                goods.map((item) => (
                   <ul>
                     <li>{item}</li>
                   </ul>