Skip to content

Commit 6bcebc8

Browse files
brage-andreasbrage-andreas
authored
Set email dates to Norwegian time (#2602)
1 parent 721ab6a commit 6bcebc8

File tree

7 files changed

+42
-22
lines changed

7 files changed

+42
-22
lines changed

‎apps/rpc/resources/email/company_collaboration_notification.mustache‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,12 @@
4141
</tr>
4242

4343
<tr style="width: 100%">
44-
<h3 style="text-align: center">Linjeforeningen Online</h3>
45-
<p style="text-align: center">Du mottar denne e-posten fordi du er registrert som medlem i Bedriftskomiteen i Online</p>
46-
<p style="text-align: center">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
44+
<td>
45+
<h3 style="font-size: 0.9em; margin-top: 3rem">Linjeforeningen Online</h3>
46+
<p style="font-size: 0.75em; color: gray">Du mottar denne e-posten fordi du er registrert som medlem i Bedriftskomiteen i Online</p>
47+
<p style="font-size: 0.75em; color: gray">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
48+
<p style="font-size: 0.75em; color: gray">Alle datoer er i norsk tid.</p>
49+
</td>
4750
</tr>
4851
</tbody>
4952
</table>

‎apps/rpc/resources/email/company_collaboration_receipt.mustache‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,12 @@
4141
</tr>
4242

4343
<tr style="width: 100%">
44-
<h3 style="text-align: center">Linjeforeningen Online</h3>
45-
<p style="text-align: center">Du mottar denne e-posten fordi du har fyllt inn et skjema tilhørende Linjeforeningen Online</p>
46-
<p style="text-align: center">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
44+
<td>
45+
<h3 style="font-size: 0.9em; margin-top: 3rem">Linjeforeningen Online</h3>
46+
<p style="font-size: 0.75em; color: gray">Du mottar denne e-posten fordi du har fyllt inn et skjema tilhørende Linjeforeningen Online</p>
47+
<p style="font-size: 0.75em; color: gray">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
48+
<p style="font-size: 0.75em; color: gray">Alle datoer er i norsk tid.</p>
49+
</td>
4750
</tr>
4851
</tbody>
4952
</table>

‎apps/rpc/resources/email/company_invoice_notification.mustache‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@
3737
</tr>
3838

3939
<tr style="width: 100%">
40-
<h3 style="text-align: center">Linjeforeningen Online</h3>
41-
<p style="text-align: center">Du mottar denne e-posten fordi du er registrert som medlem i Bedriftskomiteen i Online</p>
42-
<p style="text-align: center">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
40+
<td>
41+
<h3 style="font-size: 0.9em; margin-top: 3rem">Linjeforeningen Online</h3>
42+
<p style="font-size: 0.75em; color: gray">Du mottar denne e-posten fordi du er registrert som medlem i Bedriftskomiteen i Online</p>
43+
<p style="font-size: 0.75em; color: gray">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
44+
<p style="font-size: 0.75em; color: gray">Alle datoer er i norsk tid.</p>
45+
</td>
4346
</tr>
4447
</tbody>
4548
</table>

‎apps/rpc/resources/email/event_attendance.mustache‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626

2727
<tr style="width: 100%">
2828
<td>
29-
<h3 style="text-align: center">Linjeforeningen Online</h3>
30-
<p style="text-align: center">Du mottar denne e-posten fordi du har meldt deg på arrangementet {{ eventName }}</p>
31-
<p style="text-align: center">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
29+
<h3 style="font-size: 0.9em; margin-top: 3rem">Linjeforeningen Online</h3>
30+
<p style="font-size: 0.75em; color: gray">Du mottar denne e-posten fordi du har meldt deg på arrangementet {{ eventName }}</p>
31+
<p style="font-size: 0.75em; color: gray">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
32+
<p style="font-size: 0.75em; color: gray">Alle datoer er i norsk tid.</p>
3233
</td>
3334
</tr>
3435
</tbody>

‎apps/rpc/resources/email/feedback_form_link.mustache‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@
2323
</tr>
2424

2525
<tr style="width: 100%">
26-
<h3 style="text-align: center">Linjeforeningen Online</h3>
27-
<p style="text-align: center">Du mottar denne e-posten fordi du deltok på arrangementet {{ eventName }}</p>
28-
<p style="text-align: center">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
26+
<td>
27+
<h3 style="font-size: 0.9em; margin-top: 3rem">Linjeforeningen Online</h3>
28+
<p style="font-size: 0.75em; color: gray">Du mottar denne e-posten fordi du deltok på arrangementet {{ eventName }}</p>
29+
<p style="font-size: 0.75em; color: gray">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
30+
<p style="font-size: 0.75em; color: gray">Alle datoer er i norsk tid.</p>
31+
</td>
2932
</tr>
3033
</tbody>
3134
</table>

‎apps/rpc/resources/email/received_mark.mustache‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525

2626
<tr style="width: 100%">
2727
<td>
28-
<h3 style="text-align: center">Linjeforeningen Online</h3>
29-
<p style="text-align: center">Du mottar denne e-posten fordi du er medlem i Linjeforeningen Online</p>
30-
<p style="text-align: center">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
28+
<h3 style="font-size: 0.9em; margin-top: 3rem">Linjeforeningen Online</h3>
29+
<p style="font-size: 0.75em; color: gray">Du mottar denne e-posten fordi du er medlem i Linjeforeningen Online</p>
30+
<p style="font-size: 0.75em; color: gray">Org. Nr. 992 548 045 &ndash; Høgskoleringen 5, 7034 Trondheim</p>
31+
<p style="font-size: 0.75em; color: gray">Alle datoer er i norsk tid.</p>
3132
</td>
3233
</tr>
3334
</tbody>

‎apps/rpc/src/modules/email/email-template.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,12 @@ export const emails = {
102102
eventName: z.string(),
103103
eventLink: z.string().url(),
104104
feedbackLink: z.string().url(),
105-
eventStart: z.string().transform((d) => formatDate(new TZDate(d), "eeee dd. MMMM", { locale: nb })),
106-
feedbackDeadline: z.string().transform((d) => formatDate(new TZDate(d), "eeee dd. MMMM HH:mm", { locale: nb })),
105+
eventStart: z
106+
.string()
107+
.transform((d) => formatDate(new TZDate(d, "Europe/Oslo"), "eeee dd. MMMM", { locale: nb })),
108+
feedbackDeadline: z
109+
.string()
110+
.transform((d) => formatDate(new TZDate(d, "Europe/Oslo"), "eeee dd. MMMM HH:mm", { locale: nb })),
107111
organizerEmail: z.string().email(),
108112
}),
109113
getTemplate: async () => fsp.readFile(path.join(templates, "feedback_form_link.mustache"), "utf-8"),
@@ -114,7 +118,9 @@ export const emails = {
114118
z.object({
115119
eventName: z.string(),
116120
eventLink: z.string().url(),
117-
deregistrationDeadline: z.string().transform((d) => formatDate(new TZDate(d), "eeee dd. MMMM", { locale: nb })),
121+
deregistrationDeadline: z
122+
.string()
123+
.transform((d) => formatDate(new TZDate(d, "Europe/Oslo"), "eeee dd. MMMM", { locale: nb })),
118124
}),
119125
getTemplate: async () => fsp.readFile(path.join(templates, "event_attendance.mustache"), "utf-8"),
120126
}),
@@ -125,7 +131,7 @@ export const emails = {
125131
title: z.string(),
126132
details: z.string().nullable(),
127133
weight: z.number(),
128-
endsAt: z.string().transform((d) => formatDate(new TZDate(d), "eeee dd. MMMM", { locale: nb })),
134+
endsAt: z.string().transform((d) => formatDate(new TZDate(d, "Europe/Oslo"), "eeee dd. MMMM", { locale: nb })),
129135
}),
130136
getTemplate: async () => fsp.readFile(path.join(templates, "received_mark.mustache"), "utf-8"),
131137
}),

0 commit comments

Comments
 (0)