fix userlog after go version upgrade to 1.24

mklos-kw · mklos-kw · commit d38d9a60cc0b · 2025-04-24T12:33:54.000+02:00
diff --git a/services/userlog/pkg/service/conversion.go b/services/userlog/pkg/service/conversion.go
@@ -471,7 +471,9 @@ func composeMessage(nt NotificationTemplate, locale, defaultLocale, path string,
 
 func loadTemplates(nt NotificationTemplate, locale, defaultLocale, path string) (string, string) {
 	t := l10n.NewTranslatorFromCommonConfig(defaultLocale, _domain, path, _translationFS, "l10n/locale").Locale(locale)
-	return t.Get(nt.Subject), t.Get(nt.Message)
+	subject := t.Get("%s", nt.Subject)
+	message := t.Get("%s", nt.Message)
+	return subject, message
 }
 
 func executeTemplate(raw string, vars map[string]interface{}) (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,9 @@ func composeMessage(nt NotificationTemplate, locale, defaultLocale, path string,`
`471`	`471`
`472`	`472`	`func loadTemplates(nt NotificationTemplate, locale, defaultLocale, path string) (string, string) {`
`473`	`473`	`t := l10n.NewTranslatorFromCommonConfig(defaultLocale, _domain, path, _translationFS, "l10n/locale").Locale(locale)`
`474`		`- return t.Get(nt.Subject), t.Get(nt.Message)`
	`474`	`+ subject := t.Get("%s", nt.Subject)`
	`475`	`+ message := t.Get("%s", nt.Message)`
	`476`	`+ return subject, message`
`475`	`477`	`}`
`476`	`478`
`477`	`479`	`func executeTemplate(raw string, vars map[string]interface{}) (string, error) {`