From 17b1c71f78f76bf6f118ad806e97887450f38976 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Wed, 26 Mar 2025 17:21:45 +0100 Subject: [PATCH] remove workaround for translation formatting Signed-off-by: Christian Richter --- services/notifications/pkg/email/composer.go | 28 ++++++++++---------- services/settings/pkg/service/v0/service.go | 6 ++--- services/userlog/pkg/service/conversion.go | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/services/notifications/pkg/email/composer.go b/services/notifications/pkg/email/composer.go index 4fa7bef513..ef080f5800 100644 --- a/services/notifications/pkg/email/composer.go +++ b/services/notifications/pkg/email/composer.go @@ -21,19 +21,19 @@ var ( func NewTextTemplate(mt MessageTemplate, locale, defaultLocale string, translationPath string, vars map[string]string) (MessageTemplate, error) { var err error t := l10n.NewTranslatorFromCommonConfig(defaultLocale, _domain, translationPath, _translationFS, "l10n/locale").Locale(locale) - mt.Subject, err = composeMessage(t.Get("%s", mt.Subject), vars) + mt.Subject, err = composeMessage(t.Get(mt.Subject, []interface{}{}...), vars) if err != nil { return mt, err } - mt.Greeting, err = composeMessage(t.Get("%s", mt.Greeting), vars) + mt.Greeting, err = composeMessage(t.Get(mt.Greeting, []interface{}{}...), vars) if err != nil { return mt, err } - mt.MessageBody, err = composeMessage(t.Get("%s", mt.MessageBody), vars) + mt.MessageBody, err = composeMessage(t.Get(mt.MessageBody, []interface{}{}...), vars) if err != nil { return mt, err } - mt.CallToAction, err = composeMessage(t.Get("%s", mt.CallToAction), vars) + mt.CallToAction, err = composeMessage(t.Get(mt.CallToAction, []interface{}{}...), vars) if err != nil { return mt, err } @@ -44,19 +44,19 @@ func NewTextTemplate(mt MessageTemplate, locale, defaultLocale string, translati func NewHTMLTemplate(mt MessageTemplate, locale, defaultLocale string, translationPath string, vars map[string]string) (MessageTemplate, error) { var err error t := l10n.NewTranslatorFromCommonConfig(defaultLocale, _domain, translationPath, _translationFS, "l10n/locale").Locale(locale) - mt.Subject, err = composeMessage(t.Get("%s", mt.Subject), vars) + mt.Subject, err = composeMessage(t.Get(mt.Subject, []interface{}{}...), vars) if err != nil { return mt, err } - mt.Greeting, err = composeMessage(newlineToBr(t.Get("%s", mt.Greeting)), vars) + mt.Greeting, err = composeMessage(newlineToBr(t.Get(mt.Greeting, []interface{}{}...)), vars) if err != nil { return mt, err } - mt.MessageBody, err = composeMessage(newlineToBr(t.Get("%s", mt.MessageBody)), vars) + mt.MessageBody, err = composeMessage(newlineToBr(t.Get(mt.MessageBody, []interface{}{}...)), vars) if err != nil { return mt, err } - mt.CallToAction, err = composeMessage(callToActionToHTML(t.Get("%s", mt.CallToAction)), vars) + mt.CallToAction, err = composeMessage(callToActionToHTML(t.Get(mt.CallToAction, []interface{}{}...)), vars) if err != nil { return mt, err } @@ -71,18 +71,18 @@ func NewGroupedTextTemplate(gmt GroupedMessageTemplate, vars map[string]string, var err error t := l10n.NewTranslatorFromCommonConfig(defaultLocale, _domain, translationPath, _translationFS, "l10n/locale").Locale(locale) - gmt.Subject, err = composeMessage(t.Get("%s", gmt.Subject), vars) + gmt.Subject, err = composeMessage(t.Get(gmt.Subject, []interface{}{}...), vars) if err != nil { return gmt, err } - gmt.Greeting, err = composeMessage(t.Get("%s", gmt.Greeting), vars) + gmt.Greeting, err = composeMessage(t.Get(gmt.Greeting, []interface{}{}...), vars) if err != nil { return gmt, err } bodyParts := make([]string, 0, len(mtsVars)) for i, mt := range mts { - bodyPart, err := composeMessage(t.Get("%s", mt.MessageBody), mtsVars[i]) + bodyPart, err := composeMessage(t.Get(mt.MessageBody, []interface{}{}...), mtsVars[i]) if err != nil { return gmt, err } @@ -100,18 +100,18 @@ func NewGroupedHTMLTemplate(gmt GroupedMessageTemplate, vars map[string]string, var err error t := l10n.NewTranslatorFromCommonConfig(defaultLocale, _domain, translationPath, _translationFS, "l10n/locale").Locale(locale) - gmt.Subject, err = composeMessage(t.Get("%s", gmt.Subject), vars) + gmt.Subject, err = composeMessage(t.Get(gmt.Subject, []interface{}{}...), vars) if err != nil { return gmt, err } - gmt.Greeting, err = composeMessage(newlineToBr(t.Get("%s", gmt.Greeting)), vars) + gmt.Greeting, err = composeMessage(newlineToBr(t.Get(gmt.Greeting, []interface{}{}...)), vars) if err != nil { return gmt, err } bodyParts := make([]string, 0, len(mtsVars)) for i, mt := range mts { - bodyPart, err := composeMessage(t.Get("%s", mt.MessageBody), mtsVars[i]) + bodyPart, err := composeMessage(t.Get(mt.MessageBody, []interface{}{}...), mtsVars[i]) if err != nil { return gmt, err } diff --git a/services/settings/pkg/service/v0/service.go b/services/settings/pkg/service/v0/service.go index fe90e4df6f..eda4931775 100644 --- a/services/settings/pkg/service/v0/service.go +++ b/services/settings/pkg/service/v0/service.go @@ -697,7 +697,7 @@ func translateBundle(bundle *settingsmsg.Bundle, t *gotext.Locale) *settingsmsg. // translate interval names ('Instant', 'Daily', 'Weekly', 'Never') value := set.GetSingleChoiceValue() for i, v := range value.GetOptions() { - value.Options[i].DisplayValue = t.Get("%s", v.GetDisplayValue()) + value.Options[i].DisplayValue = t.Get(v.GetDisplayValue(), []interface{}{}...) } set.Value = &settingsmsg.Setting_SingleChoiceValue{SingleChoiceValue: value} fallthrough @@ -710,9 +710,9 @@ func translateBundle(bundle *settingsmsg.Bundle, t *gotext.Locale) *settingsmsg. defaults.SettingUUIDProfileEventSpaceDisabled, defaults.SettingUUIDProfileEventSpaceDeleted: // translate event names ('Share Received', 'Share Removed', ...) - set.DisplayName = t.Get("%s", set.GetDisplayName()) + set.DisplayName = t.Get(set.GetDisplayName(), []interface{}{}...) // translate event descriptions ('Notify me when I receive a share', ...) - set.Description = t.Get("%s", set.GetDescription()) + set.Description = t.Get(set.GetDescription(), []interface{}{}...) bundle.Settings[i] = set } } diff --git a/services/userlog/pkg/service/conversion.go b/services/userlog/pkg/service/conversion.go index e59c5eea6d..16c11ec89e 100644 --- a/services/userlog/pkg/service/conversion.go +++ b/services/userlog/pkg/service/conversion.go @@ -376,7 +376,7 @@ 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("%s", nt.Subject), t.Get("%s", nt.Message) + return t.Get(nt.Subject, []interface{}{}...), t.Get(nt.Message, []interface{}{}...) } func executeTemplate(raw string, vars map[string]interface{}) (string, error) {