Merge remote-tracking branch 'origin/main' into mai/cronus/partner-units-rename

# Conflicts:
#	frontend/build.ts
#	frontend/src/admin.tsx
#	frontend/src/client/i18n.ts
#	internal/handlers/handlers.go

cmd/server/main.go

@@ -111,6 +111,13 @@ func main() {
 		inviteSvc := services.NewInviteService(pool, mailSvc, handlers.AllowedEmailDomains, baseURL)
 		reminderSvc := services.NewReminderService(pool, mailSvc, users, baseURL)
 
+		// Wire EmailTemplateService onto the MailService so DB-backed admin
+		// edits propagate without a process restart. The constructor is split
+		// from MailService creation because the DB pool isn't available yet
+		// at the point we build mailSvc above.
+		emailTemplateSvc := services.NewEmailTemplateService(pool)
+		mailSvc.SetTemplateService(emailTemplateSvc)
+
 		svcBundle = &handlers.Services{
 			Project:        projectSvc,
 			Team:           teamSvc,
@@ -130,6 +137,7 @@ func main() {
 			Invite:         inviteSvc,
 			Agenda:         services.NewAgendaService(pool, users),
 			Audit:          services.NewAuditService(pool),
+			EmailTemplate:  emailTemplateSvc,
 		}
 		log.Println("Phase B services initialised")