@stamhoofd/models 2.82.0 → 2.83.0

package/src/helpers/GroupBuilder.ts

@@ -1,4 +1,4 @@
-import { Group as GroupStruct, GroupCategory, GroupCategorySettings, GroupGenderType, GroupSettings, OrganizationGenderType, OrganizationType, OrganizationTypeHelper, UmbrellaOrganization } from '@stamhoofd/structures';
+import { Group as GroupStruct, GroupCategory, GroupCategorySettings, GroupGenderType, GroupSettings, OrganizationGenderType, OrganizationType, OrganizationTypeHelper, UmbrellaOrganization, TranslatedString } from '@stamhoofd/structures';
 import { Group, Organization } from '../models';
 
 export class GroupBuilder {
@@ -84,7 +84,7 @@ export class GroupBuilder {
         kapoenen.organizationId = this.organization.id;
         kapoenen.periodId = this.organization.periodId;
         kapoenen.settings = GroupSettings.create({
-            name: 'Kapoenen',
+            name: new TranslatedString('Kapoenen'),
             genderType: mixedType,
             startDate: this.organization.meta.defaultStartDate,
             endDate: this.organization.meta.defaultEndDate,
@@ -98,7 +98,7 @@ export class GroupBuilder {
         jin.organizationId = this.organization.id;
         jin.periodId = this.organization.periodId;
         jin.settings = GroupSettings.create({
-            name: 'Jin',
+            name: new TranslatedString('Jin'),
             genderType: mixedType,
             startDate: this.organization.meta.defaultStartDate,
             endDate: this.organization.meta.defaultEndDate,
@@ -113,7 +113,7 @@ export class GroupBuilder {
             wouters.organizationId = this.organization.id;
             wouters.periodId = this.organization.periodId;
             wouters.settings = GroupSettings.create({
-                name: 'Wouters',
+                name: new TranslatedString('Wouters'),
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -127,7 +127,7 @@ export class GroupBuilder {
             jonggivers.organizationId = this.organization.id;
             jonggivers.periodId = this.organization.periodId;
             jonggivers.settings = GroupSettings.create({
-                name: 'Jonggivers',
+                name: new TranslatedString('Jonggivers'),
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -141,7 +141,7 @@ export class GroupBuilder {
             givers.organizationId = this.organization.id;
             givers.periodId = this.organization.periodId;
             givers.settings = GroupSettings.create({
-                name: 'Givers',
+                name: new TranslatedString('Givers'),
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -157,7 +157,7 @@ export class GroupBuilder {
             wouters.organizationId = this.organization.id;
             wouters.periodId = this.organization.periodId;
             wouters.settings = GroupSettings.create({
-                name: 'Kabouters',
+                name: new TranslatedString('Kabouters'),
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -171,7 +171,7 @@ export class GroupBuilder {
             jonggivers.organizationId = this.organization.id;
             jonggivers.periodId = this.organization.periodId;
             jonggivers.settings = GroupSettings.create({
-                name: 'Jonggidsen',
+                name: new TranslatedString('Jonggidsen'),
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -185,7 +185,7 @@ export class GroupBuilder {
             givers.organizationId = this.organization.id;
             givers.periodId = this.organization.periodId;
             givers.settings = GroupSettings.create({
-                name: 'Gidsen',
+                name: new TranslatedString('Gidsen'),
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -201,7 +201,7 @@ export class GroupBuilder {
             wouters.organizationId = this.organization.id;
             wouters.periodId = this.organization.periodId;
             wouters.settings = GroupSettings.create({
-                name: 'Welpen',
+                name: new TranslatedString('Welpen'),
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -215,7 +215,7 @@ export class GroupBuilder {
             jonggivers.organizationId = this.organization.id;
             jonggivers.periodId = this.organization.periodId;
             jonggivers.settings = GroupSettings.create({
-                name: 'Jongverkenners',
+                name: new TranslatedString('Jongverkenners'),
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -229,7 +229,7 @@ export class GroupBuilder {
             givers.organizationId = this.organization.id;
             givers.periodId = this.organization.periodId;
             givers.settings = GroupSettings.create({
-                name: 'Verkenners',
+                name: new TranslatedString('Verkenners'),
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -254,7 +254,7 @@ export class GroupBuilder {
         ribbels.organizationId = this.organization.id;
         ribbels.periodId = this.organization.periodId;
         ribbels.settings = GroupSettings.create({
-            name: 'Ribbels',
+            name: new TranslatedString('Ribbels'),
             genderType: mixedType,
             startDate: this.organization.meta.defaultStartDate,
             endDate: this.organization.meta.defaultEndDate,
@@ -267,7 +267,7 @@ export class GroupBuilder {
         speelclub.organizationId = this.organization.id;
         speelclub.periodId = this.organization.periodId;
         speelclub.settings = GroupSettings.create({
-            name: 'Speelclub',
+            name: new TranslatedString('Speelclub'),
             genderType: mixedType,
             startDate: this.organization.meta.defaultStartDate,
             endDate: this.organization.meta.defaultEndDate,
@@ -280,7 +280,7 @@ export class GroupBuilder {
         aspis.organizationId = this.organization.id;
         aspis.periodId = this.organization.periodId;
         aspis.settings = GroupSettings.create({
-            name: "Aspi's",
+            name: new TranslatedString("Aspi's"),
             genderType: mixedType,
             startDate: this.organization.meta.defaultStartDate,
             endDate: this.organization.meta.defaultEndDate,
@@ -294,7 +294,7 @@ export class GroupBuilder {
             rakwis.organizationId = this.organization.id;
             rakwis.periodId = this.organization.periodId;
             rakwis.settings = GroupSettings.create({
-                name: "Rakwi's",
+                name: new TranslatedString("Rakwi's"),
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -307,7 +307,7 @@ export class GroupBuilder {
             titos.organizationId = this.organization.id;
             titos.periodId = this.organization.periodId;
             titos.settings = GroupSettings.create({
-                name: "Tito's",
+                name: new TranslatedString("Tito's"),
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -320,7 +320,7 @@ export class GroupBuilder {
             ketis.organizationId = this.organization.id;
             ketis.periodId = this.organization.periodId;
             ketis.settings = GroupSettings.create({
-                name: "Keti's",
+                name: new TranslatedString("Keti's"),
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -335,7 +335,7 @@ export class GroupBuilder {
             rakwis.organizationId = this.organization.id;
             rakwis.periodId = this.organization.periodId;
             rakwis.settings = GroupSettings.create({
-                name: 'Kwiks',
+                name: new TranslatedString('Kwiks'),
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -348,7 +348,7 @@ export class GroupBuilder {
             titos.organizationId = this.organization.id;
             titos.periodId = this.organization.periodId;
             titos.settings = GroupSettings.create({
-                name: 'Toppers',
+                name: new TranslatedString('Toppers'),
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -361,7 +361,7 @@ export class GroupBuilder {
             ketis.organizationId = this.organization.id;
             ketis.periodId = this.organization.periodId;
             ketis.settings = GroupSettings.create({
-                name: 'Tiptiens',
+                name: new TranslatedString('Tiptiens'),
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -376,7 +376,7 @@ export class GroupBuilder {
             rakwis.organizationId = this.organization.id;
             rakwis.periodId = this.organization.periodId;
             rakwis.settings = GroupSettings.create({
-                name: 'Rakkers',
+                name: new TranslatedString('Rakkers'),
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -389,7 +389,7 @@ export class GroupBuilder {
             titos.organizationId = this.organization.id;
             titos.periodId = this.organization.periodId;
             titos.settings = GroupSettings.create({
-                name: 'Tippers',
+                name: new TranslatedString('Tippers'),
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
@@ -402,7 +402,7 @@ export class GroupBuilder {
             ketis.organizationId = this.organization.id;
             ketis.periodId = this.organization.periodId;
             ketis.settings = GroupSettings.create({
-                name: 'Kerels',
+                name: new TranslatedString('Kerels'),
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,

package/src/helpers/MemberMerger.test.ts

@@ -10,6 +10,7 @@ import {
     RecordSettings,
     ReviewTime,
     ReviewTimes,
+    TranslatedString,
 } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 import { Member } from '../models';
@@ -45,7 +46,7 @@ describe('member merge', () => {
 
             const recordAnswer = RecordAnswer.create({
                 settings: RecordSettings.create({
-                    name: 'answer1',
+                    name: TranslatedString.create('answer1'),
                     required: true,
                     choices: [],
                 }),
@@ -215,7 +216,7 @@ describe('member merge', () => {
 
             const recordAnswer = RecordAnswer.create({
                 settings: RecordSettings.create({
-                    name: 'answer1',
+                    name: TranslatedString.create('answer1'),
                     required: true,
                     choices: [],
                 }),
@@ -407,7 +408,7 @@ describe('member merge', () => {
 
             const recordAnswer1 = RecordAnswer.create({
                 settings: RecordSettings.create({
-                    name: 'answer1',
+                    name: TranslatedString.create('answer1'),
                     required: true,
                     choices: [],
                 }),
@@ -418,7 +419,7 @@ describe('member merge', () => {
 
             const recordAnswer2 = RecordAnswer.create({
                 settings: RecordSettings.create({
-                    name: 'answer2',
+                    name: TranslatedString.create('answer2'),
                     required: true,
                     choices: [],
                 }),

package/src/models/DocumentTemplate.ts

@@ -91,7 +91,7 @@ export class DocumentTemplate extends QueryableModel {
                     id: 'group.name',
                     type: RecordType.Text,
                 }),
-                value: group?.settings?.name ?? '',
+                value: group?.settings?.name?.toString() ?? '',
             }),
             'group.type': RecordTextAnswer.create({
                 settings: RecordSettings.create({
@@ -426,7 +426,7 @@ export class DocumentTemplate extends QueryableModel {
         }
 
         const group = await Group.getByID(registration.groupId);
-        const description = `${registration.member.details.name}, ${group ? group.settings.name : ''}${group && group.settings.period && group.type === GroupType.Membership ? ' ' + group.settings.period?.nameShort : ''}`;
+        const description = `${registration.member.details.name}, ${group ? group.settings.name.toString() : ''}${group && group.settings.period && group.type === GroupType.Membership ? ' ' + group.settings.period?.nameShort : ''}`;
 
         if (existingDocuments.length > 0) {
             for (const document of existingDocuments) {
@@ -622,7 +622,7 @@ export class DocumentTemplate extends QueryableModel {
                 throw new SimpleError({
                     code: 'invalid_document_number',
                     message: 'Expected document number to be ' + (lastNumber + 1) + ' but got ' + document.number,
-                    human: 'Er ging iets mis bij het nummeren van de documenten (ben je zeker dat je geen documenten hebt verwijderd of toegevoegd sinds de vorige export?). Als je de export nog niet hebt gebruikt in Belcotax kan je de nummering resetten en de export opnieuw proberen.',
+                    human: $t(`7fd5e5f1-6ff5-48a5-beae-36776935ec90`),
                 });
             }
             lastNumber = document.number;

package/src/models/Email.ts

@@ -111,7 +111,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing subject',
-                human: 'Vul een onderwerp in voor je een e-mail verstuurt',
+                human: $t(`e78c8218-4d25-413b-ae6b-fd916e663e5a`),
             });
         }
 
@@ -119,7 +119,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing text',
-                human: 'Vul een tekst in voor je een e-mail verstuurt',
+                human: $t(`65b701a3-c74c-4eb6-b98e-7b9dcad0a358`),
             });
         }
 
@@ -127,7 +127,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing html',
-                human: 'Vul een tekst in voor je een e-mail verstuurt',
+                human: $t(`65b701a3-c74c-4eb6-b98e-7b9dcad0a358`),
             });
         }
 
@@ -135,7 +135,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing from',
-                human: 'Vul een afzender in voor je een e-mail verstuurt',
+                human: $t(`e92cd077-b0f1-4b0a-82a0-8a8baa82e73a`),
             });
         }
 
@@ -152,7 +152,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'too_big_attachments',
                 message: 'Too big attachments',
-                human: 'Jouw bericht is te groot. Grote bijlages verstuur je beter niet via e-mail, je plaatst dan best een link naar de locatie in bv. Google Drive. De maximale grootte van een e-mail is 10MB, inclusief het bericht. Als je grote bestanden verstuurt kan je ze ook proberen te verkleinen.',
+                human: $t(`e8b9a1db-97d0-410e-99b2-6a87c1087593`),
                 field: 'attachments',
             });
         }
@@ -173,7 +173,7 @@ export class Email extends QueryableModel {
                 throw new SimpleError({
                     code: 'content_type_not_supported',
                     message: 'Content-Type not supported',
-                    human: 'Het bestandstype van jouw bijlage wordt niet ondersteund of is onveilig om in een e-mail te plaatsen. Overweeg om je bestand op bv. Google Drive te zetten en de link in jouw e-mail te zetten.',
+                    human: $t(`54da84d6-5f6a-4db2-be34-9ddb7f47bbe8`),
                     field: 'attachments',
                 });
             }
@@ -246,7 +246,7 @@ export class Email extends QueryableModel {
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Email not found',
-                    human: 'De e-mail die je probeert te versturen bestaat niet meer',
+                    human: $t(`55899a7c-f3d4-43fe-a431-70a3a9e78e34`),
                 });
             }
             if (upToDate.status === EmailStatus.Sent || upToDate.status === EmailStatus.Failed) {
@@ -281,7 +281,7 @@ export class Email extends QueryableModel {
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Missing from',
-                    human: 'Vul een afzender in voor je een e-mail verstuurt',
+                    human: $t(`e92cd077-b0f1-4b0a-82a0-8a8baa82e73a`),
                 });
             }
 
@@ -304,7 +304,7 @@ export class Email extends QueryableModel {
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Email not found',
-                    human: 'De e-mail die je probeert te versturen bestaat niet meer',
+                    human: $t(`55899a7c-f3d4-43fe-a431-70a3a9e78e34`),
                 });
             }
 
@@ -312,7 +312,7 @@ export class Email extends QueryableModel {
                 throw new SimpleError({
                     code: 'recipients_not_created',
                     message: 'Failed to create recipients',
-                    human: 'Er ging iets mis bij het aanmaken van de afzenders.',
+                    human: $t(`f660b2eb-e382-4d21-86e4-673ca7bc2d4a`),
                 });
             }
 

package/src/models/EmailVerificationCode.ts

@@ -217,7 +217,7 @@ export class EmailVerificationCode extends QueryableModel {
             throw new SimpleError({
                 code: 'too_many_attempts',
                 message: 'Too many attempts',
-                human: 'Je hebt de code te veel foutief ingegeven. Verstuur eerst een nieuwe code voor je opnieuw probeert.',
+                human: $t(`9ea99caf-e245-45b2-97d5-004393e78b49`),
                 statusCode: 429,
             });
         }
@@ -238,7 +238,7 @@ export class EmailVerificationCode extends QueryableModel {
             throw new SimpleError({
                 code: 'too_many_attempts',
                 message: 'Too many attempts',
-                human: 'Je hebt de code te veel foutief ingegeven. Verstuur eerst een nieuwe code voor je opnieuw probeert.',
+                human: $t(`9ea99caf-e245-45b2-97d5-004393e78b49`),
                 statusCode: 429,
             });
         }

package/src/models/Event.ts

@@ -1,6 +1,6 @@
 import { column } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
-import { EventMeta, Event as EventStruct, GroupType } from '@stamhoofd/structures';
+import { EventMeta, Event as EventStruct, GroupType, TranslatedString } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 import { Group } from './Group';
 
@@ -87,7 +87,7 @@ export class Event extends QueryableModel {
 
         if (group.type === GroupType.EventRegistration) {
             // Don't change the name of the waiting list
-            group.settings.name = this.name;
+            group.settings.name = new TranslatedString(this.name);
             group.settings.eventId = this.id;
         }
 

package/src/models/Image.ts

@@ -24,7 +24,7 @@ export class Image extends QueryableModel {
     @column({ type: 'datetime' })
     createdAt: Date = new Date();
 
-    static async create(fileContent: string | Buffer, type: string | undefined, resolutions: ResolutionRequest[], isPrivateFile: boolean = false): Promise<Image> {
+    static async create(fileContent: string | Buffer, type: string | undefined, resolutions: ResolutionRequest[], isPrivateFile: boolean = false, user: { id: string } | null = null): Promise<Image> {
         if (!STAMHOOFD.SPACES_BUCKET || !STAMHOOFD.SPACES_ENDPOINT || !STAMHOOFD.SPACES_KEY || !STAMHOOFD.SPACES_SECRET) {
             throw new SimpleError({
                 code: 'not_available',
@@ -92,6 +92,18 @@ export class Image extends QueryableModel {
             prefix += '/';
         }
 
+        prefix += (STAMHOOFD.environment ?? 'development') === 'development' ? ('development/') : ('');
+
+        // Prepend user id to the file path
+        if (isPrivateFile && user) {
+            // Private files
+            prefix += 'users/' + user.id + '/';
+        }
+        else {
+            // Public files
+            prefix += 'p/';
+        }
+
         const uploadPromises: Promise<any>[] = [];
         const image = new Image();
         image.id = uuidv4();
@@ -99,7 +111,7 @@ export class Image extends QueryableModel {
         for (const f of files) {
             const fileId = uuidv4();
 
-            const key = prefix + (STAMHOOFD.environment ?? 'development') + '/' + image.id + '/' + fileId + (!supportsTransparency ? '.jpg' : '.png');
+            const key = prefix + image.id + '/' + fileId + (!supportsTransparency ? '.jpg' : '.png');
             const params = {
                 Bucket: STAMHOOFD.SPACES_BUCKET,
                 Key: key,

package/src/models/MemberPlatformMembership.ts

@@ -166,7 +166,7 @@ export class MemberPlatformMembership extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_membership_type',
                 message: 'Unknown membership type',
-                human: 'Deze aansluiting is niet (meer) beschikbaar',
+                human: $t(`14e020be-1dd8-4caf-9dce-369cbe0db902`),
             });
         }
 
@@ -176,7 +176,7 @@ export class MemberPlatformMembership extends QueryableModel {
             throw new SimpleError({
                 code: 'period_unavailable',
                 message: 'Membership not available for this period',
-                human: 'Deze aansluiting is nog niet beschikbaar voor dit werkjaar',
+                human: $t(`d5795b94-23d5-4fe7-97e1-6f0fe916caca`),
             });
         }
 
@@ -267,7 +267,7 @@ export class MemberPlatformMembership extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_membership_type',
                 message: 'Unknown membership type',
-                human: 'Deze aansluiting is niet (meer) beschikbaar',
+                human: $t(`14e020be-1dd8-4caf-9dce-369cbe0db902`),
             });
         }
 
@@ -277,7 +277,7 @@ export class MemberPlatformMembership extends QueryableModel {
             throw new SimpleError({
                 code: 'period_unavailable',
                 message: 'Membership not available for this period',
-                human: 'Deze aansluiting is nog niet beschikbaar voor dit werkjaar',
+                human: $t(`d5795b94-23d5-4fe7-97e1-6f0fe916caca`),
             });
         }
 
@@ -287,7 +287,7 @@ export class MemberPlatformMembership extends QueryableModel {
                 // todo
                 code: 'not_found',
                 message: 'Organization not found',
-                human: 'De organisatie is niet gevonden',
+                human: $t(`1524a6e6-aad7-4072-81c1-ce6fc196224f`),
             });
         }
 

package/src/models/MollieToken.ts

@@ -366,7 +366,7 @@ export class MollieToken extends QueryableModel {
                 profile: {
                     name: organization.name + ' - Stamhoofd',
                     // url: "https://"+organization.getHost(),
-                    description: 'Betalen van inschrijvingsgelden of webshops voor een vereniging via Stamhoofd (partner).',
+                    description: $t(`62246c37-15c7-4f7d-94e2-7476f971c8da`),
                     categoryCode: 8398,
                 },
             });

package/src/models/Order.ts

@@ -116,9 +116,9 @@ export class Order extends QueryableModel {
 
     generateBalanceDescription(webshop: Webshop) {
         if (!this.number) {
-            return 'Bestelling - ' + webshop.meta.name;
+            return $t(`df5c326c-e9a3-4f76-ba80-8a22f95f0e70`) + ' ' + webshop.meta.name;
         }
-        return 'Bestelling #' + this.number.toString() + ' - ' + webshop.meta.name;
+        return $t(`12be5ac0-8353-43a2-badb-ab3b27d156b3`) + this.number.toString() + ' - ' + webshop.meta.name;
     }
 
     /**
@@ -925,7 +925,7 @@ export class Order extends QueryableModel {
                 throw new SimpleError({
                     code: 'missing_iban',
                     message: 'Missing IBAN',
-                    human: 'Er is geen rekeningnummer ingesteld voor overschrijvingen. Contacteer de beheerder.',
+                    human: $t(`cc8b5066-a7e4-4eae-b556-f56de5d3502c`),
                 });
             }
             payment.generateDescription(organization, this.number.toString(), this.getTransferReplacements());

package/src/models/Organization.ts

@@ -3,7 +3,7 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { I18n } from '@stamhoofd/backend-i18n';
 import { EmailInterfaceRecipient } from '@stamhoofd/email';
 import { QueryableModel } from '@stamhoofd/sql';
-import { Address, Country, DNSRecordStatus, EmailTemplateType, OrganizationEmail, OrganizationMetaData, OrganizationPrivateMetaData, Organization as OrganizationStruct, PaymentMethod, PaymentProvider, PrivatePaymentConfiguration, Recipient, Replacement, STPackageType, TransferSettings } from '@stamhoofd/structures';
+import { Address, Country, DNSRecordStatus, EmailTemplateType, Language, OrganizationEmail, OrganizationMetaData, OrganizationPrivateMetaData, Organization as OrganizationStruct, PaymentMethod, PaymentProvider, PrivatePaymentConfiguration, Recipient, Replacement, STPackageType, TransferSettings } from '@stamhoofd/structures';
 import { AWSError } from 'aws-sdk';
 import SES from 'aws-sdk/clients/sesv2';
 import { PromiseResult } from 'aws-sdk/lib/request';
@@ -103,7 +103,7 @@ export class Organization extends QueryableModel {
      * Return default locale confiruation
      */
     get i18n() {
-        return new I18n('nl', this.address.country);
+        return new I18n(Language.Dutch, this.address.country);
     }
 
     /**
@@ -201,7 +201,7 @@ export class Organization extends QueryableModel {
             throw new SimpleError({
                 code: 'archived',
                 message: 'This organization is archived',
-                human: 'Deze groep is gearchiveerd',
+                human: $t(`8bd60208-9101-40cf-9f1d-1fd90cdafd62`),
             });
         }
         return organization;
@@ -423,7 +423,7 @@ export class Organization extends QueryableModel {
         bcc?: boolean;
     }) {
         const recipients = await this.getAdminRecipients();
-        const defaultI18n = new I18n('nl', Country.Belgium);
+        const defaultI18n = new I18n(Language.Dutch, Country.Belgium);
         const i18n = this.i18n;
 
         const replaceAll = [
@@ -883,7 +883,7 @@ export class Organization extends QueryableModel {
             throw new SimpleError({
                 code: 'payment_provider_not_configured',
                 message: 'Payment provider not configured for ' + method,
-                human: 'Deze betaalmethode werd helaas niet volledig geconfigureerd. Probeer later even opnieuw, neem contact met ons op of kies een andere betaalmethode.',
+                human: $t(`9e44e007-3b35-4edf-979f-41b458d2eb39`),
             });
         }
 

package/src/models/PayconiqPayment.ts

@@ -124,7 +124,7 @@ export class PayconiqPayment extends QueryableModel {
         if (!apiKey) {
             throw new SimpleError({
                 code: '',
-                message: 'Betaling via Payconiq is tijdelijk onbeschikbaar',
+                message: $t('4a3b54dc-e945-4a15-8b31-b9b4bb483b2a'),
             });
         }
 

package/src/models/Registration.ts

@@ -194,7 +194,7 @@ export class Registration extends QueryableModel {
                 }),
                 Replacement.create({
                     token: 'groupName',
-                    value: group.settings.name,
+                    value: group.settings.name.toString(),
                 }),
             ],
         }));
@@ -261,7 +261,7 @@ export class Registration extends QueryableModel {
                     }),
                     Replacement.create({
                         token: 'overviewContext',
-                        value: 'Inschrijving van ' + paymentGeneral.memberNames,
+                        value: $t(`01d5fd7e-2960-4eb4-ab3a-2ac6dcb2e39c`) + ' ' + paymentGeneral.memberNames,
                     }),
                     Replacement.create({
                         token: 'memberNames',

package/src/models/STPackage.ts

@@ -152,7 +152,7 @@ export class STPackage extends QueryableModel {
             throw new SimpleError({
                 code: 'not_allowed',
                 message: 'Not allowed',
-                human: 'Je kan dit pakket niet verlengen',
+                human: $t(`fcb50c02-7510-4e48-bfac-10bb584e3454`),
             });
         }
 
@@ -288,11 +288,11 @@ export class STPackage extends QueryableModel {
                     }),
                     Replacement.create({
                         token: 'validUntil',
-                        value: this.validUntil ? Formatter.dateTime(this.validUntil) : 'nooit',
+                        value: this.validUntil ? Formatter.dateTime(this.validUntil) : $t(`a402f8d1-b470-4b1e-948b-1524576708ea`),
                     }),
                     Replacement.create({
                         token: 'validUntilDate',
-                        value: this.validUntil ? Formatter.date(this.validUntil) : 'nooit',
+                        value: this.validUntil ? Formatter.date(this.validUntil) : $t(`a402f8d1-b470-4b1e-948b-1524576708ea`),
                     }),
                     Replacement.create({
                         token: 'renewUrl',

package/src/models/User.ts

@@ -456,7 +456,7 @@ export class User extends QueryableModel {
                 throw new SimpleError({
                     code: 'duplicate_login_provider',
                     message: 'This account is already linked to another account',
-                    human: 'Er is een ander extern account gekoppeld aan deze gebruiker. Het is niet mogelijk om in te loggen op dit account. Ontkoppel eerst je andere account.',
+                    human: $t(`d4f1cb82-1e15-421a-8218-37cd3066436c`),
                     statusCode: 400,
                 });
             }
@@ -467,7 +467,7 @@ export class User extends QueryableModel {
                 throw new SimpleError({
                     code: 'password_based_account',
                     message: 'This user uses a password to login. Log in with the password and link the external account through the settings.',
-                    human: 'Log eerst in met je bestaande wachtwoord en koppel daarna de nieuwe login methode via je account instellingen.',
+                    human: $t(`0154f68a-7458-4b87-91f2-5d04be0737fd`),
                     statusCode: 400,
                 });
             }

package/src/models/addresses/PostalCode.ts

@@ -92,7 +92,7 @@ export class PostalCode extends QueryableModel {
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'Invalid city. Suggestions: ' + Formatter.joinLast(cities.map(c => c.name), ', ', ' of ') + '?',
-                            human: 'Welke gemeente bedoel je precies? ' + Formatter.joinLast(cities.map(c => c.name), ', ', ' of ') + '?',
+                            human: $t(`8c2fe8b6-416a-47e5-b77b-20c8192ad0c7`) + ' ' + Formatter.joinLast(cities.map(c => c.name), ', ', ' ' + $t(`411cf334-eebb-4f27-beb6-d81bd544c3f5`) + ' ') + '?',
                             field: 'city',
                         });
                     }