remove mentions of Tietokilta

Author: akselotti

mdsvex.d.ts

@@ -58,7 +58,6 @@
     "eslint-plugin-svelte": "^3.15.2",
     "eslint-plugin-unicorn": "^63.0.0",
     "globals": "^17.4.0",
-    "mdsvex": "^0.12.7",
     "prettier": "^3.8.1",
     "prettier-plugin-svelte": "^3.5.1",
     "prettier-plugin-tailwindcss": "^0.7.2",

package.json

@@ -155,12 +155,12 @@ const en = {
   // Emails
   emails: {
     otp: {
-      subject: "CSG Membership Registry Sign In Code",
+      subject: "{organizationName} Membership Registry Sign In Code",
       body: `Your login code is: {code}
 
 This code will expire in 10 minutes.
 
-@{domain} #{code}`,
+@{domain} #{code} {organizationName}`,
     },
     paymentSuccess: {
       subject: "Payment received - Awaiting board approval",
@@ -171,13 +171,13 @@ Your payment has been received and your membership application is awaiting appro
 You will receive an email once your membership is approved.
 
 Best regards,
-Computer Science Guild`,
+{organizationName}`,
     },
     membershipApproved: {
-      subject: "Welcome to the Computer Science Guild!",
+      subject: "Welcome to {organizationName}!",
       body: `Hi {firstName}!
 
-Your membership application has been approved. Welcome as a member of the Computer Science Guild!
+Your membership application has been approved. Welcome as a member of {organizationName}!
 
 Membership details:
 - Type: {membershipName}
@@ -188,7 +188,7 @@ You can now participate in guild activities and enjoy member benefits.
 See you at events!
 
 Best regards,
-Computer Science Guild`,
+{organizationName}`,
     },
     membershipRenewed: {
       subject: "Your membership has been renewed!",
@@ -203,7 +203,7 @@ Membership details:
 Thank you for continuing as a member!
 
 Best regards,
-Computer Science Guild`,
+{organizationName}`,
     },
   },
 
@@ -509,8 +509,8 @@ Computer Science Guild`,
         approve: "Approve",
         reject: "Reject",
         reactivate: "Reactivate",
-        deemResigned: "Deem resigned (§8)",
-        resignMembership: "Resign (§8)",
+        deemResigned: "Deem resigned",
+        resignMembership: "Resign",
 
         // Pagination
         showing: "Showing {current} of {total} members",

pnpm-lock.yaml

@@ -155,55 +155,55 @@ const fi = {
   // Emails
   emails: {
     otp: {
-      subject: "Tietokillan jäsenrekisterin sisäänkirjautumiskoodi",
-      body: `Kirjautumiskoodisi on: {code}
+      subject: "{organizationName:string} jäsen_rekisterin sisään_kirjautumiskoodi",
+      body: `Kirjautumiskoodisi on: {code:string}
 
 Koodi vanhenee 10 minuutin kuluttua.
 
-@{domain} #{code}`,
+@{domain:string} #{code:string} {organizationName:string}`,
     },
     paymentSuccess: {
       subject: "Maksu vastaanotettu - Odottaa hallituksen hyväksyntää",
-      body: `Kiitos {membershipName}-jäsenyytesi maksusta ({amount})!
+      body: `Kiitos {membershipName:string}-jäsenyytesi maksusta ({amount:string})!
 
 Maksusi on vastaanotettu ja jäsenhakemuksesi odottaa hallituksen hyväksyntää seuraavassa kokouksessa.
 
 Saat sähköpostiviestin, kun jäsenyytesi on hyväksytty.
 
 Terveisin,
-Tietokilta`,
+{organizationName:string}`,
     },
     membershipApproved: {
-      subject: "Tervetuloa Tietokiltaan!",
-      body: `Hei {firstName}!
+      subject: "Tervetuloa {organizationName:string} jäseneksi!",
+      body: `Hei {firstName:string}!
 
-Jäsenhakemuksesi on hyväksytty. Tervetuloa Tietokillan jäseneksi!
+Jäsenhakemuksesi on hyväksytty. Tervetuloa {organizationName:string} jäseneksi!
 
 Jäsenyystiedot:
-- Jäsenyystyyppi: {membershipName}
-- Voimassa: {startDate} - {endDate}
+- Jäsenyystyyppi: {membershipName:string}
+- Voimassa: {startDate:string} - {endDate:string}
 
-Voit nyt osallistua killan toimintaan ja hyödyntää jäsenetuja.
+Voit nyt osallistua organisaation toimintaan ja hyödyntää jäsenetuja.
 
 Nähdään tapahtumissa!
 
 Terveisin,
-Tietokilta`,
+{organizationName:string}`,
     },
     membershipRenewed: {
       subject: "Jäsenyytesi on uusittu!",
-      body: `Hei {firstName}!
+      body: `Hei {firstName:string}!
 
 Jäsenyytesi on uusittu automaattisesti maksun jälkeen.
 
 Jäsenyystiedot:
-- Jäsenyystyyppi: {membershipName}
-- Voimassa: {startDate} - {endDate}
+- Jäsenyystyyppi: {membershipName:string}
+- Voimassa: {startDate:string} - {endDate:string}
 
 Kiitos, että jatkat jäsenenämme!
 
 Terveisin,
-Tietokilta`,
+{organizationName:string}`,
     },
   },
 
@@ -511,8 +511,8 @@ Tietokilta`,
         approve: "Hyväksy",
         reject: "Hylkää",
         reactivate: "Aktivoi uudelleen",
-        deemResigned: "Katso eronneeksi (§8)",
-        resignMembership: "Erota (§8)",
+        deemResigned: "Katso eronneeksi",
+        resignMembership: "Erota",
 
         // Pagination
         showing: "Näytetään {current} / {total} jäsentä",

src/lib/i18n/en/index.ts

@@ -1,6 +1,7 @@
 import { sendEmail } from "$lib/server/mailgun";
 import { loadLocale } from "$lib/i18n/i18n-util.sync";
 import { i18nObject } from "$lib/i18n/i18n-util";
+import { getCustomisations } from "$lib/server/customisation/cache";
 import type {
   EmailType,
   EmailTemplate,
@@ -52,8 +53,13 @@ export async function sendMemberEmail<T extends EmailType>({
   loadLocale(locale);
   const LL = i18nObject(locale);
 
+  // Get organization name from customisation settings
+  const customisations = await getCustomisations();
+  const organizationName =
+    customisations?.organizationName?.[locale] ?? (locale === "fi" ? "Kilta ry" : "Guild Association");
+
   // Render content - TypeScript now knows metadata matches template's expected type
-  const { subject, text, html } = template.render(locale, metadata, LL);
+  const { subject, text, html } = template.render(locale, metadata, LL, organizationName);
 
   // Send immediately
   await sendEmail({

src/lib/i18n/fi/index.ts

@@ -3,7 +3,7 @@ import type { EmailTemplate, MembershipApprovedMetadata } from "../types";
 export const membershipApprovedTemplate: EmailTemplate<MembershipApprovedMetadata> = {
   type: "membership_approved",
 
-  render(locale, metadata, LL) {
+  render(locale, metadata, LL, organizationName) {
     const { firstName, membershipName, startDate, endDate } = metadata;
 
     // Use Finnish region for formatting (e.g., 'fi-FI' or 'en-FI')
@@ -13,12 +13,13 @@ export const membershipApprovedTemplate: EmailTemplate<MembershipApprovedMetadat
     });
 
     return {
-      subject: LL.emails.membershipApproved.subject(),
+      subject: LL.emails.membershipApproved.subject({ organizationName }),
       text: LL.emails.membershipApproved.body({
         firstName,
         membershipName,
         startDate: dateFormatter.format(startDate),
         endDate: dateFormatter.format(endDate),
+        organizationName,
       }),
     };
   },

src/lib/server/emails/index.ts

@@ -6,7 +6,7 @@ import type { EmailTemplate, MembershipApprovedMetadata } from "../types";
 export const membershipRenewedTemplate: EmailTemplate<MembershipApprovedMetadata> = {
   type: "membership_renewed",
 
-  render(locale, metadata, LL) {
+  render(locale, metadata, LL, organizationName) {
     // Use Finnish region for formatting (e.g., 'fi-FI' or 'en-FI')
     // This ensures locale-appropriate formatting with Finnish regional conventions
     const dateFormatter = new Intl.DateTimeFormat(`${locale}-FI`, { dateStyle: "long" });
@@ -18,6 +18,7 @@ export const membershipRenewedTemplate: EmailTemplate<MembershipApprovedMetadata
         membershipName: metadata.membershipName,
         startDate: dateFormatter.format(metadata.startDate),
         endDate: dateFormatter.format(metadata.endDate),
+        organizationName,
       }),
     };
   },