feat: Custom message files (#1992)

* feat: add get custom message text to admin api * feat: read custom message texts from files * feat: get languages in apis * feat: get languages in apis * feat: get languages in apis * feat: pr feedback * feat: docs * feat: merge main
2025-08-11 21:17:32 +00:00 · 2021-07-13 07:13:39 +02:00
parent 7ebf0333c3
commit 03a38fbf1c
40 changed files with 1108 additions and 245 deletions
--- a/internal/notification/repository/eventsourcing/handler/custom_text.go
+++ b/internal/notification/repository/eventsourcing/handler/custom_text.go
@@ -0,0 +1,125 @@
+package handler
+
+import (
+	"github.com/caos/logging"
+	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
+	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
+	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
+	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
+)
+
+type CustomText struct {
+	handler
+	subscription *v1.Subscription
+}
+
+func newCustomText(handler handler) *CustomText {
+	h := &CustomText{
+		handler: handler,
+	}
+
+	h.subscribe()
+
+	return h
+}
+
+func (m *CustomText) subscribe() {
+	m.subscription = m.es.Subscribe(m.AggregateTypes()...)
+	go func() {
+		for event := range m.subscription.Events {
+			query.ReduceEvent(m, event)
+		}
+	}()
+}
+
+const (
+	customTextTable = "notification.custom_texts"
+)
+
+func (m *CustomText) ViewModel() string {
+	return customTextTable
+}
+
+func (m *CustomText) Subscription() *v1.Subscription {
+	return m.subscription
+}
+
+func (_ *CustomText) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
+}
+
+func (p *CustomText) CurrentSequence() (uint64, error) {
+	sequence, err := p.view.GetLatestCustomTextSequence()
+	if err != nil {
+		return 0, err
+	}
+	return sequence.CurrentSequence, nil
+}
+
+func (m *CustomText) EventQuery() (*es_models.SearchQuery, error) {
+	sequence, err := m.view.GetLatestCustomTextSequence()
+	if err != nil {
+		return nil, err
+	}
+	return es_models.NewSearchQuery().
+		AggregateTypeFilter(m.AggregateTypes()...).
+		LatestSequenceFilter(sequence.CurrentSequence), nil
+}
+
+func (m *CustomText) Reduce(event *es_models.Event) (err error) {
+	switch event.AggregateType {
+	case model.OrgAggregate, iam_es_model.IAMAggregate:
+		err = m.processCustomText(event)
+	}
+	return err
+}
+
+func (m *CustomText) processCustomText(event *es_models.Event) (err error) {
+	customText := new(iam_model.CustomTextView)
+	switch event.Type {
+	case iam_es_model.CustomTextSet, model.CustomTextSet:
+		text := new(iam_model.CustomTextView)
+		err = text.SetData(event)
+		if err != nil {
+			return err
+		}
+		customText, err = m.view.CustomTextByIDs(event.AggregateID, text.Template, text.Key, text.Language)
+		if err != nil && !caos_errs.IsNotFound(err) {
+			return err
+		}
+		if caos_errs.IsNotFound(err) {
+			err = nil
+			customText = new(iam_model.CustomTextView)
+			customText.Language = text.Language
+			customText.Template = text.Template
+			customText.CreationDate = event.CreationDate
+		}
+		err = customText.AppendEvent(event)
+	case iam_es_model.CustomTextRemoved, model.CustomTextRemoved:
+		text := new(iam_model.CustomTextView)
+		err = text.SetData(event)
+		if err != nil {
+			return err
+		}
+		return m.view.DeleteCustomText(event.AggregateID, text.Template, text.Language, event)
+	default:
+		return m.view.ProcessedCustomTextSequence(event)
+	}
+	if err != nil {
+		return err
+	}
+	return m.view.PutCustomText(customText, event)
+}
+
+func (m *CustomText) OnError(event *es_models.Event, err error) error {
+	logging.LogWithFields("SPOOL-3m912", "id", event.AggregateID).WithError(err).Warn("something went wrong in custom text handler")
+	return spooler.HandleError(event, err, m.view.GetLatestCustomTextFailedEvent, m.view.ProcessedCustomTextFailedEvent, m.view.ProcessedCustomTextSequence, m.errorCountUntilSkip)
+}
+
+func (o *CustomText) OnSuccess() error {
+	return spooler.HandleSuccess(o.view.UpdateCustomTextSpoolerRunTimestamp)
+}
--- a/internal/notification/repository/eventsourcing/handler/handler.go
+++ b/internal/notification/repository/eventsourcing/handler/handler.go
@@ -1,17 +1,18 @@
 package handler

 import (
-	"github.com/caos/zitadel/internal/command"
-	"github.com/caos/zitadel/internal/eventstore/v1"
 	"net/http"
 	"time"

+	"github.com/caos/zitadel/internal/command"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+
 	"github.com/caos/logging"
+
 	sd "github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/config/types"
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/eventstore/v1/query"
-	"github.com/caos/zitadel/internal/i18n"
 	"github.com/caos/zitadel/internal/notification/repository/eventsourcing/view"
 )

@@ -34,7 +35,7 @@ func (h *handler) Eventstore() v1.Eventstore {
 	return h.es
 }

-func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, es v1.Eventstore, command *command.Commands, systemDefaults sd.SystemDefaults, i18n *i18n.Translator, dir http.FileSystem, apiDomain string) []query.Handler {
+func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, es v1.Eventstore, command *command.Commands, systemDefaults sd.SystemDefaults, dir http.FileSystem, apiDomain string) []query.Handler {
 	aesCrypto, err := crypto.NewAESCrypto(systemDefaults.UserVerificationKey)
 	if err != nil {
 		logging.Log("HANDL-s90ew").WithError(err).Debug("error create new aes crypto")
@@ -44,12 +45,12 @@ func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, es
 			handler{view, bulkLimit, configs.cycleDuration("User"), errorCount, es},
 			systemDefaults.IamID,
 		),
+		newCustomText(handler{view, bulkLimit, configs.cycleDuration("CustomText"), errorCount, es}),
 		newNotification(
 			handler{view, bulkLimit, configs.cycleDuration("Notification"), errorCount, es},
 			command,
 			systemDefaults,
 			aesCrypto,
-			i18n,
 			dir,
 			apiDomain,
 		),
--- a/internal/notification/repository/eventsourcing/handler/notification.go
+++ b/internal/notification/repository/eventsourcing/handler/notification.go
@@ -29,19 +29,14 @@ import (
 )

 const (
-	notificationTable            = "notification.notifications"
-	NotifyUserID                 = "NOTIFICATION"
-	labelPolicyTableOrg          = "management.label_policies"
-	labelPolicyTableDef          = "adminapi.label_policies"
-	mailTemplateTableOrg         = "management.mail_templates"
-	mailTemplateTableDef         = "adminapi.mail_templates"
-	messageTextTableOrg          = "management.message_texts"
-	messageTextTableDef          = "adminapi.message_texts"
-	messageTextTypeDomainClaimed = "DomainClaimed"
-	messageTextTypeInitCode      = "InitCode"
-	messageTextTypePasswordReset = "PasswordReset"
-	messageTextTypeVerifyEmail   = "VerifyEmail"
-	messageTextTypeVerifyPhone   = "VerifyPhone"
+	notificationTable    = "notification.notifications"
+	NotifyUserID         = "NOTIFICATION"
+	labelPolicyTableOrg  = "management.label_policies"
+	labelPolicyTableDef  = "adminapi.label_policies"
+	mailTemplateTableOrg = "management.mail_templates"
+	mailTemplateTableDef = "adminapi.mail_templates"
+	messageTextTableOrg  = "management.message_texts"
+	messageTextTableDef  = "adminapi.message_texts"
 )

 type Notification struct {
@@ -49,7 +44,6 @@ type Notification struct {
 	command        *command.Commands
 	systemDefaults sd.SystemDefaults
 	AesCrypto      crypto.EncryptionAlgorithm
-	i18n           *i18n.Translator
 	statikDir      http.FileSystem
 	subscription   *v1.Subscription
 	apiDomain      string
@@ -60,7 +54,6 @@ func newNotification(
 	command *command.Commands,
 	defaults sd.SystemDefaults,
 	aesCrypto crypto.EncryptionAlgorithm,
-	translator *i18n.Translator,
 	statikDir http.FileSystem,
 	apiDomain string,
 ) *Notification {
@@ -68,7 +61,6 @@ func newNotification(
 		handler:        handler,
 		command:        command,
 		systemDefaults: defaults,
-		i18n:           translator,
 		statikDir:      statikDir,
 		AesCrypto:      aesCrypto,
 		apiDomain:      apiDomain,
@@ -166,12 +158,12 @@ func (n *Notification) handleInitUserCode(event *models.Event) (err error) {
 		return err
 	}

-	text, err := n.getMessageText(user, messageTextTypeInitCode, user.PreferredLanguage)
+	translator, err := n.getTranslatorWithOrgTexts(user.ResourceOwner, domain.InitCodeMessageType)
 	if err != nil {
 		return err
 	}

-	err = types.SendUserInitCode(string(template.Template), text, user, initCode, n.systemDefaults, n.AesCrypto, colors, n.apiDomain)
+	err = types.SendUserInitCode(string(template.Template), translator, user, initCode, n.systemDefaults, n.AesCrypto, colors, n.apiDomain)
 	if err != nil {
 		return err
 	}
@@ -205,11 +197,11 @@ func (n *Notification) handlePasswordCode(event *models.Event) (err error) {
 		return err
 	}

-	text, err := n.getMessageText(user, messageTextTypePasswordReset, user.PreferredLanguage)
+	translator, err := n.getTranslatorWithOrgTexts(user.ResourceOwner, domain.PasswordResetMessageType)
 	if err != nil {
 		return err
 	}
-	err = types.SendPasswordCode(string(template.Template), text, user, pwCode, n.systemDefaults, n.AesCrypto, colors, n.apiDomain)
+	err = types.SendPasswordCode(string(template.Template), translator, user, pwCode, n.systemDefaults, n.AesCrypto, colors, n.apiDomain)
 	if err != nil {
 		return err
 	}
@@ -243,12 +235,12 @@ func (n *Notification) handleEmailVerificationCode(event *models.Event) (err err
 		return err
 	}

-	text, err := n.getMessageText(user, messageTextTypeVerifyEmail, user.PreferredLanguage)
+	translator, err := n.getTranslatorWithOrgTexts(user.ResourceOwner, domain.VerifyEmailMessageType)
 	if err != nil {
 		return err
 	}

-	err = types.SendEmailVerificationCode(string(template.Template), text, user, emailCode, n.systemDefaults, n.AesCrypto, colors, n.apiDomain)
+	err = types.SendEmailVerificationCode(string(template.Template), translator, user, emailCode, n.systemDefaults, n.AesCrypto, colors, n.apiDomain)
 	if err != nil {
 		return err
 	}
@@ -270,11 +262,11 @@ func (n *Notification) handlePhoneVerificationCode(event *models.Event) (err err
 	if err != nil {
 		return err
 	}
-	text, err := n.getMessageText(user, messageTextTypeVerifyPhone, user.PreferredLanguage)
+	translator, err := n.getTranslatorWithOrgTexts(user.ResourceOwner, domain.VerifyPhoneMessageType)
 	if err != nil {
 		return err
 	}
-	err = types.SendPhoneVerificationCode(text, user, phoneCode, n.systemDefaults, n.AesCrypto)
+	err = types.SendPhoneVerificationCode(translator, user, phoneCode, n.systemDefaults, n.AesCrypto)
 	if err != nil {
 		return err
 	}
@@ -309,11 +301,11 @@ func (n *Notification) handleDomainClaimed(event *models.Event) (err error) {
 		return err
 	}

-	text, err := n.getMessageText(user, messageTextTypeDomainClaimed, user.PreferredLanguage)
+	translator, err := n.getTranslatorWithOrgTexts(user.ResourceOwner, domain.DomainClaimedMessageType)
 	if err != nil {
 		return err
 	}
-	err = types.SendDomainClaimed(string(template.Template), text, user, data["userName"], n.systemDefaults, colors, n.apiDomain)
+	err = types.SendDomainClaimed(string(template.Template), translator, user, data["userName"], n.systemDefaults, colors, n.apiDomain)
 	if err != nil {
 		return err
 	}
@@ -400,6 +392,31 @@ func (n *Notification) getMailTemplate(ctx context.Context) (*iam_model.MailTemp
 	return iam_es_model.MailTemplateViewToModel(template), err
 }

+func (n *Notification) getTranslatorWithOrgTexts(orgID, textType string) (*i18n.Translator, error) {
+	translator, err := i18n.NewTranslator(n.statikDir, i18n.TranslatorConfig{DefaultLanguage: n.systemDefaults.DefaultLanguage})
+	if err != nil {
+		return nil, err
+	}
+	allCustomTexts, err := n.view.CustomTextsByAggregateIDAndTemplate(domain.IAMID, textType)
+	if err == nil {
+		return translator, nil
+	}
+	customTexts, err := n.view.CustomTextsByAggregateIDAndTemplate(orgID, textType)
+	if err == nil {
+		return translator, nil
+	}
+	allCustomTexts = append(allCustomTexts, customTexts...)
+
+	for _, text := range allCustomTexts {
+		msg := i18n.Message{
+			ID:   text.Key,
+			Text: text.Text,
+		}
+		translator.AddMessages(language.Make(text.Language), msg)
+	}
+	return translator, nil
+}
+
 // Read organization specific texts
 func (n *Notification) getMessageText(user *model.NotifyUser, textType, lang string) (*iam_model.MessageTextView, error) {
 	langTag := language.Make(lang)
--- a/internal/notification/repository/eventsourcing/repository.go
+++ b/internal/notification/repository/eventsourcing/repository.go
@@ -1,17 +1,18 @@
 package eventsourcing

 import (
+	"net/http"
+
 	"github.com/caos/zitadel/internal/command"
 	"github.com/caos/zitadel/internal/eventstore/v1"
-	"net/http"
+
+	"golang.org/x/text/language"

 	sd "github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/config/types"
 	es_spol "github.com/caos/zitadel/internal/eventstore/v1/spooler"
-	"github.com/caos/zitadel/internal/i18n"
 	"github.com/caos/zitadel/internal/notification/repository/eventsourcing/spooler"
 	noti_view "github.com/caos/zitadel/internal/notification/repository/eventsourcing/view"
-	"golang.org/x/text/language"
 )

 type Config struct {
@@ -41,11 +42,7 @@ func Start(conf Config, dir http.FileSystem, systemDefaults sd.SystemDefaults, c
 		return nil, err
 	}

-	translator, err := i18n.NewTranslator(dir, i18n.TranslatorConfig{DefaultLanguage: conf.DefaultLanguage})
-	if err != nil {
-		return nil, err
-	}
-	spool := spooler.StartSpooler(conf.Spooler, es, view, sqlClient, command, systemDefaults, translator, dir, apiDomain)
+	spool := spooler.StartSpooler(conf.Spooler, es, view, sqlClient, command, systemDefaults, dir, apiDomain)

 	return &EsRepository{
 		spool,
--- a/internal/notification/repository/eventsourcing/spooler/spooler.go
+++ b/internal/notification/repository/eventsourcing/spooler/spooler.go
@@ -2,13 +2,13 @@ package spooler

 import (
 	"database/sql"
+	"net/http"
+
 	"github.com/caos/zitadel/internal/command"
 	"github.com/caos/zitadel/internal/eventstore/v1"
-	"net/http"

 	sd "github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
-	"github.com/caos/zitadel/internal/i18n"
 	"github.com/caos/zitadel/internal/notification/repository/eventsourcing/handler"
 	"github.com/caos/zitadel/internal/notification/repository/eventsourcing/view"
 )
@@ -20,12 +20,12 @@ type SpoolerConfig struct {
 	Handlers              handler.Configs
 }

-func StartSpooler(c SpoolerConfig, es v1.Eventstore, view *view.View, sql *sql.DB, command *command.Commands, systemDefaults sd.SystemDefaults, i18n *i18n.Translator, dir http.FileSystem, apiDomain string) *spooler.Spooler {
+func StartSpooler(c SpoolerConfig, es v1.Eventstore, view *view.View, sql *sql.DB, command *command.Commands, systemDefaults sd.SystemDefaults, dir http.FileSystem, apiDomain string) *spooler.Spooler {
 	spoolerConfig := spooler.Config{
 		Eventstore:        es,
 		Locker:            &locker{dbClient: sql},
 		ConcurrentWorkers: c.ConcurrentWorkers,
-		ViewHandlers:      handler.Register(c.Handlers, c.BulkLimit, c.FailureCountUntilSkip, view, es, command, systemDefaults, i18n, dir, apiDomain),
+		ViewHandlers:      handler.Register(c.Handlers, c.BulkLimit, c.FailureCountUntilSkip, view, es, command, systemDefaults, dir, apiDomain),
 	}
 	spool := spoolerConfig.New()
 	spool.Start()
--- a/internal/notification/repository/eventsourcing/view/custom_texts.go
+++ b/internal/notification/repository/eventsourcing/view/custom_texts.go
@@ -0,0 +1,61 @@
+package view
+
+import (
+	"github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/iam/repository/view"
+	"github.com/caos/zitadel/internal/iam/repository/view/model"
+	global_view "github.com/caos/zitadel/internal/view/repository"
+)
+
+const (
+	customTextTable = "notification.custom_texts"
+)
+
+func (v *View) CustomTextByIDs(aggregateID, template, lang, key string) (*model.CustomTextView, error) {
+	return view.CustomTextByIDs(v.Db, customTextTable, aggregateID, template, lang, key)
+}
+
+func (v *View) CustomTextsByAggregateIDAndTemplate(aggregateID, template string) ([]*model.CustomTextView, error) {
+	return view.GetCustomTextsByAggregateIDAndTemplate(v.Db, customTextTable, aggregateID, template)
+}
+
+func (v *View) CustomTextsByAggregateIDAndTemplateAndLang(aggregateID, template, lang string) ([]*model.CustomTextView, error) {
+	return view.GetCustomTexts(v.Db, customTextTable, aggregateID, template, lang)
+}
+
+func (v *View) PutCustomText(template *model.CustomTextView, event *models.Event) error {
+	err := view.PutCustomText(v.Db, customTextTable, template)
+	if err != nil {
+		return err
+	}
+	return v.ProcessedCustomTextSequence(event)
+}
+
+func (v *View) DeleteCustomText(aggregateID, textType, lang string, event *models.Event) error {
+	err := view.DeleteCustomText(v.Db, customTextTable, aggregateID, textType, lang)
+	if err != nil && !errors.IsNotFound(err) {
+		return err
+	}
+	return v.ProcessedCustomTextSequence(event)
+}
+
+func (v *View) GetLatestCustomTextSequence() (*global_view.CurrentSequence, error) {
+	return v.latestSequence(customTextTable)
+}
+
+func (v *View) ProcessedCustomTextSequence(event *models.Event) error {
+	return v.saveCurrentSequence(customTextTable, event)
+}
+
+func (v *View) UpdateCustomTextSpoolerRunTimestamp() error {
+	return v.updateSpoolerRunSequence(customTextTable)
+}
+
+func (v *View) GetLatestCustomTextFailedEvent(sequence uint64) (*global_view.FailedEvent, error) {
+	return v.latestFailedEvent(customTextTable, sequence)
+}
+
+func (v *View) ProcessedCustomTextFailedEvent(failedEvent *global_view.FailedEvent) error {
+	return v.saveFailedEvent(failedEvent)
+}
--- a/internal/notification/templates/templateData.go
+++ b/internal/notification/templates/templateData.go
@@ -5,6 +5,7 @@ import (
 	"html"
 	"strings"

+	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/i18n"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
@@ -16,10 +17,6 @@ const (
 	defaultFontColor       = "#22292f"
 	defaultBackgroundColor = "#fafafa"
 	defaultPrimaryColor    = "#5282C1"
-	//defaultOrgName         = "CAOS AG"
-	//defaultOrgURL          = "http://www.caos.ch"
-	//defaultFooter1         = "Teufener Strasse 19"
-	//defaultFooter2         = "CH-9000 St. Gallen"
 )

 type TemplateData struct {
@@ -41,28 +38,19 @@ type TemplateData struct {
 	FooterText    string
 }

-func (data *TemplateData) Translate(i18n *i18n.Translator, args map[string]interface{}, langs ...string) {
-	data.Title = i18n.Localize(data.Title, nil, langs...)
-	data.PreHeader = i18n.Localize(data.PreHeader, nil, langs...)
-	data.Subject = i18n.Localize(data.Subject, nil, langs...)
-	data.Greeting = i18n.Localize(data.Greeting, args, langs...)
-	data.Text = html.UnescapeString(i18n.Localize(data.Text, args, langs...))
-	if data.Href != "" {
-		data.Href = i18n.Localize(data.Href, nil, langs...)
-	}
-	data.ButtonText = i18n.Localize(data.ButtonText, nil, langs...)
+func (data *TemplateData) Translate(translator *i18n.Translator, msgType string, args map[string]interface{}, langs ...string) {
+	data.Title = translator.Localize(fmt.Sprintf("%s.%s", msgType, domain.MessageTitle), args, langs...)
+	data.PreHeader = translator.Localize(fmt.Sprintf("%s.%s", msgType, domain.MessagePreHeader), args, langs...)
+	data.Subject = translator.Localize(fmt.Sprintf("%s.%s", msgType, domain.MessageSubject), args, langs...)
+	data.Greeting = translator.Localize(fmt.Sprintf("%s.%s", msgType, domain.MessageGreeting), args, langs...)
+	data.Text = html.UnescapeString(translator.Localize(fmt.Sprintf("%s.%s", msgType, domain.MessageText), args, langs...))
+	data.ButtonText = translator.Localize(fmt.Sprintf("%s.%s", msgType, domain.MessageButtonText), args, langs...)
+	data.FooterText = translator.Localize(fmt.Sprintf("%s.%s", msgType, domain.MessageFooterText), args, langs...)
 }

-func GetTemplateData(apiDomain, href string, text *iam_model.MessageTextView, policy *iam_model.LabelPolicyView) TemplateData {
+func GetTemplateData(translator *i18n.Translator, translateArgs map[string]interface{}, apiDomain, href, msgType, lang string, policy *iam_model.LabelPolicyView) TemplateData {
 	templateData := TemplateData{
-		Title:           text.Title,
-		PreHeader:       text.PreHeader,
-		Subject:         text.Subject,
-		Greeting:        text.Greeting,
-		Text:            html.UnescapeString(text.Text),
 		Href:            href,
-		ButtonText:      text.ButtonText,
-		FooterText:      text.FooterText,
 		PrimaryColor:    defaultPrimaryColor,
 		BackgroundColor: defaultBackgroundColor,
 		FontColor:       defaultFontColor,
@@ -71,6 +59,7 @@ func GetTemplateData(apiDomain, href string, text *iam_model.MessageTextView, po
 		FontFamily:      defaultFontFamily,
 		IncludeFooter:   false,
 	}
+	templateData.Translate(translator, msgType, translateArgs, lang)
 	if policy.PrimaryColor != "" {
 		templateData.PrimaryColor = policy.PrimaryColor
 	}
--- a/internal/notification/types/domain_claimed.go
+++ b/internal/notification/types/domain_claimed.go
@@ -1,10 +1,11 @@
 package types

 import (
-	"html"
 	"strings"

 	"github.com/caos/zitadel/internal/config/systemdefaults"
+	"github.com/caos/zitadel/internal/domain"
+	"github.com/caos/zitadel/internal/i18n"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	"github.com/caos/zitadel/internal/notification/templates"
 	view_model "github.com/caos/zitadel/internal/user/repository/view/model"
@@ -15,7 +16,7 @@ type DomainClaimedData struct {
 	URL string
 }

-func SendDomainClaimed(mailhtml string, text *iam_model.MessageTextView, user *view_model.NotifyUser, username string, systemDefaults systemdefaults.SystemDefaults, colors *iam_model.LabelPolicyView, apiDomain string) error {
+func SendDomainClaimed(mailhtml string, translator *i18n.Translator, user *view_model.NotifyUser, username string, systemDefaults systemdefaults.SystemDefaults, colors *iam_model.LabelPolicyView, apiDomain string) error {
 	url, err := templates.ParseTemplateText(systemDefaults.Notifications.Endpoints.DomainClaimed, &UrlData{UserID: user.ID})
 	if err != nil {
 		return err
@@ -24,17 +25,13 @@ func SendDomainClaimed(mailhtml string, text *iam_model.MessageTextView, user *v
 	args["TempUsername"] = username
 	args["Domain"] = strings.Split(user.LastEmail, "@")[1]

-	text.Greeting, err = templates.ParseTemplateText(text.Greeting, args)
-	text.Text, err = templates.ParseTemplateText(text.Text, args)
-	text.Text = html.UnescapeString(text.Text)
-
-	emailCodeData := &DomainClaimedData{
-		TemplateData: templates.GetTemplateData(apiDomain, url, text, colors),
+	domainClaimedData := &DomainClaimedData{
+		TemplateData: templates.GetTemplateData(translator, args, apiDomain, url, domain.DomainClaimedMessageType, user.PreferredLanguage, colors),
 		URL:          url,
 	}
-	template, err := templates.GetParsedTemplate(mailhtml, emailCodeData)
+	template, err := templates.GetParsedTemplate(mailhtml, domainClaimedData)
 	if err != nil {
 		return err
 	}
-	return generateEmail(user, text.Subject, template, systemDefaults.Notifications, true)
+	return generateEmail(user, domainClaimedData.Subject, template, systemDefaults.Notifications, true)
 }
--- a/internal/notification/types/email_verification_code.go
+++ b/internal/notification/types/email_verification_code.go
@@ -1,10 +1,10 @@
 package types

 import (
-	"html"
-
 	"github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/crypto"
+	"github.com/caos/zitadel/internal/domain"
+	"github.com/caos/zitadel/internal/i18n"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	"github.com/caos/zitadel/internal/notification/templates"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
@@ -16,7 +16,7 @@ type EmailVerificationCodeData struct {
 	URL string
 }

-func SendEmailVerificationCode(mailhtml string, text *iam_model.MessageTextView, user *view_model.NotifyUser, code *es_model.EmailCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm, colors *iam_model.LabelPolicyView, apiDomain string) error {
+func SendEmailVerificationCode(mailhtml string, translator *i18n.Translator, user *view_model.NotifyUser, code *es_model.EmailCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm, colors *iam_model.LabelPolicyView, apiDomain string) error {
 	codeString, err := crypto.DecryptString(code.Code, alg)
 	if err != nil {
 		return err
@@ -29,12 +29,8 @@ func SendEmailVerificationCode(mailhtml string, text *iam_model.MessageTextView,
 	var args = mapNotifyUserToArgs(user)
 	args["Code"] = codeString

-	text.Greeting, err = templates.ParseTemplateText(text.Greeting, args)
-	text.Text, err = templates.ParseTemplateText(text.Text, args)
-	text.Text = html.UnescapeString(text.Text)
-
 	emailCodeData := &EmailVerificationCodeData{
-		TemplateData: templates.GetTemplateData(apiDomain, url, text, colors),
+		TemplateData: templates.GetTemplateData(translator, args, apiDomain, url, domain.VerifyEmailMessageType, user.PreferredLanguage, colors),
 		URL:          url,
 	}

@@ -42,5 +38,5 @@ func SendEmailVerificationCode(mailhtml string, text *iam_model.MessageTextView,
 	if err != nil {
 		return err
 	}
-	return generateEmail(user, text.Subject, template, systemDefaults.Notifications, true)
+	return generateEmail(user, emailCodeData.Subject, template, systemDefaults.Notifications, true)
 }
--- a/internal/notification/types/init_code.go
+++ b/internal/notification/types/init_code.go
@@ -1,10 +1,10 @@
 package types

 import (
-	"html"
-
 	"github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/crypto"
+	"github.com/caos/zitadel/internal/domain"
+	"github.com/caos/zitadel/internal/i18n"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	"github.com/caos/zitadel/internal/notification/templates"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
@@ -22,7 +22,7 @@ type UrlData struct {
 	PasswordSet bool
 }

-func SendUserInitCode(mailhtml string, text *iam_model.MessageTextView, user *view_model.NotifyUser, code *es_model.InitUserCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm, colors *iam_model.LabelPolicyView, apiDomain string) error {
+func SendUserInitCode(mailhtml string, translator *i18n.Translator, user *view_model.NotifyUser, code *es_model.InitUserCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm, colors *iam_model.LabelPolicyView, apiDomain string) error {
 	codeString, err := crypto.DecryptString(code.Code, alg)
 	if err != nil {
 		return err
@@ -34,17 +34,13 @@ func SendUserInitCode(mailhtml string, text *iam_model.MessageTextView, user *vi
 	var args = mapNotifyUserToArgs(user)
 	args["Code"] = codeString

-	text.Greeting, err = templates.ParseTemplateText(text.Greeting, args)
-	text.Text, err = templates.ParseTemplateText(text.Text, args)
-	text.Text = html.UnescapeString(text.Text)
-
-	emailCodeData := &InitCodeEmailData{
-		TemplateData: templates.GetTemplateData(apiDomain, url, text, colors),
+	initCodeData := &InitCodeEmailData{
+		TemplateData: templates.GetTemplateData(translator, args, apiDomain, url, domain.InitCodeMessageType, user.PreferredLanguage, colors),
 		URL:          url,
 	}
-	template, err := templates.GetParsedTemplate(mailhtml, emailCodeData)
+	template, err := templates.GetParsedTemplate(mailhtml, initCodeData)
 	if err != nil {
 		return err
 	}
-	return generateEmail(user, text.Subject, template, systemDefaults.Notifications, true)
+	return generateEmail(user, initCodeData.Subject, template, systemDefaults.Notifications, true)
 }
--- a/internal/notification/types/password_code.go
+++ b/internal/notification/types/password_code.go
@@ -1,10 +1,10 @@
 package types

 import (
-	"html"
-
 	"github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/crypto"
+	"github.com/caos/zitadel/internal/domain"
+	"github.com/caos/zitadel/internal/i18n"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	"github.com/caos/zitadel/internal/notification/templates"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
@@ -18,7 +18,7 @@ type PasswordCodeData struct {
 	URL       string
 }

-func SendPasswordCode(mailhtml string, text *iam_model.MessageTextView, user *view_model.NotifyUser, code *es_model.PasswordCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm, colors *iam_model.LabelPolicyView, apiDomain string) error {
+func SendPasswordCode(mailhtml string, translator *i18n.Translator, user *view_model.NotifyUser, code *es_model.PasswordCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm, colors *iam_model.LabelPolicyView, apiDomain string) error {
 	codeString, err := crypto.DecryptString(code.Code, alg)
 	if err != nil {
 		return err
@@ -30,19 +30,15 @@ func SendPasswordCode(mailhtml string, text *iam_model.MessageTextView, user *vi
 	var args = mapNotifyUserToArgs(user)
 	args["Code"] = codeString

-	text.Greeting, err = templates.ParseTemplateText(text.Greeting, args)
-	text.Text, err = templates.ParseTemplateText(text.Text, args)
-	text.Text = html.UnescapeString(text.Text)
-
-	emailCodeData := &PasswordCodeData{
-		TemplateData: templates.GetTemplateData(apiDomain, url, text, colors),
+	passwordResetData := &PasswordCodeData{
+		TemplateData: templates.GetTemplateData(translator, args, apiDomain, url, domain.PasswordResetMessageType, user.PreferredLanguage, colors),
 		FirstName:    user.FirstName,
 		LastName:     user.LastName,
 		URL:          url,
 	}
-	template, err := templates.GetParsedTemplate(mailhtml, emailCodeData)
+	template, err := templates.GetParsedTemplate(mailhtml, passwordResetData)
 	if err != nil {
 		return err
 	}
-	return generateEmail(user, text.Subject, template, systemDefaults.Notifications, true)
+	return generateEmail(user, passwordResetData.Subject, template, systemDefaults.Notifications, true)
 }
--- a/internal/notification/types/phone_verification_code.go
+++ b/internal/notification/types/phone_verification_code.go
@@ -1,9 +1,12 @@
 package types

 import (
+	"fmt"
+
 	"github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/crypto"
-	iam_model "github.com/caos/zitadel/internal/iam/model"
+	"github.com/caos/zitadel/internal/domain"
+	"github.com/caos/zitadel/internal/i18n"
 	"github.com/caos/zitadel/internal/notification/templates"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	view_model "github.com/caos/zitadel/internal/user/repository/view/model"
@@ -13,7 +16,7 @@ type PhoneVerificationCodeData struct {
 	UserID string
 }

-func SendPhoneVerificationCode(text *iam_model.MessageTextView, user *view_model.NotifyUser, code *es_model.PhoneCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
+func SendPhoneVerificationCode(translator *i18n.Translator, user *view_model.NotifyUser, code *es_model.PhoneCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
 	codeString, err := crypto.DecryptString(code.Code, alg)
 	if err != nil {
 		return err
@@ -21,10 +24,10 @@ func SendPhoneVerificationCode(text *iam_model.MessageTextView, user *view_model
 	var args = mapNotifyUserToArgs(user)
 	args["Code"] = codeString

-	text.Text, err = templates.ParseTemplateText(text.Text, args)
+	text := translator.Localize(fmt.Sprintf("%s.%s", domain.VerifyPhoneMessageType, domain.MessageTitle), args, user.PreferredLanguage)

 	codeData := &PhoneVerificationCodeData{UserID: user.ID}
-	template, err := templates.ParseTemplateText(text.Text, codeData)
+	template, err := templates.ParseTemplateText(text, codeData)
 	if err != nil {
 		return err
 	}