From 58798a18ecc8867c80332fc0de9c573a56279b89 Mon Sep 17 00:00:00 2001 From: jkoberg Date: Tue, 6 Aug 2024 12:29:21 +0200 Subject: [PATCH] feat(graph): adjust to l10n pkg Signed-off-by: jkoberg --- services/graph/pkg/l10n/translation.go | 12 +++++----- .../service/v0/api_driveitem_permissions.go | 22 +++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/services/graph/pkg/l10n/translation.go b/services/graph/pkg/l10n/translation.go index 47d72af8c..d2f7c0994 100644 --- a/services/graph/pkg/l10n/translation.go +++ b/services/graph/pkg/l10n/translation.go @@ -3,7 +3,7 @@ package l10n import ( "embed" - l10npkg "github.com/owncloud/ocis/v2/ocis-pkg/l10n" + "github.com/owncloud/ocis/v2/ocis-pkg/l10n" ) var ( @@ -21,12 +21,12 @@ const ( // Translate translates a string based on the locale and default locale func Translate(content, locale, defaultLocale string) string { - t := l10npkg.NewTranslatorFromCommonConfig(defaultLocale, _domain, "", _localeFS, _localeSubPath) + t := l10n.NewTranslatorFromCommonConfig(defaultLocale, _domain, "", _localeFS, _localeSubPath) return t.Translate(content, locale) } -// NewTranslateLocation returns a function that translates a string based on the locale -func NewTranslateLocation(locale, defaultLocale string) func(string, ...any) string { - t := l10npkg.NewTranslatorFromCommonConfig(defaultLocale, _domain, "", _localeFS, _localeSubPath) - return t.Locale(locale).Get +// TranslateEntity returns a function that translates a struct or slice based on the locale +func TranslateEntity(locale, defaultLocale string, entity any, opts ...l10n.TranslateOption) error { + t := l10n.NewTranslatorFromCommonConfig(defaultLocale, _domain, "", _localeFS, _localeSubPath) + return t.TranslateEntity(locale, entity, opts...) } diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions.go b/services/graph/pkg/service/v0/api_driveitem_permissions.go index 6750be207..cca9e3565 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions.go @@ -637,12 +637,11 @@ func (api DriveItemPermissionsApi) ListPermissions(w http.ResponseWriter, r *htt loc := r.Header.Get(l10n.HeaderAcceptLanguage) w.Header().Add("Content-Language", loc) if loc != "" && loc != "en" { - trf := l10n_pkg.NewTranslateLocation(loc, "en") - err := l10n.TranslateEntity(trf, - l10n.TranslateStruct(permissions, - l10n.TranslateEach("LibreGraphPermissionsRolesAllowedValues", - l10n.TranslateField("Description"), - l10n.TranslateField("DisplayName"))), + err := l10n_pkg.TranslateEntity(loc, "en", permissions, + l10n.TranslateEach("LibreGraphPermissionsRolesAllowedValues", + l10n.TranslateField("Description"), + l10n.TranslateField("DisplayName"), + ), ) if err != nil { api.logger.Error().Err(err).Msg("tranlation error") @@ -673,12 +672,11 @@ func (api DriveItemPermissionsApi) ListSpaceRootPermissions(w http.ResponseWrite loc := r.Header.Get(l10n.HeaderAcceptLanguage) w.Header().Add("Content-Language", loc) if loc != "" && loc != "en" { - trf := l10n_pkg.NewTranslateLocation(loc, "en") - err := l10n.TranslateEntity(trf, - l10n.TranslateStruct(permissions, - l10n.TranslateEach("LibreGraphPermissionsRolesAllowedValues", - l10n.TranslateField("Description"), - l10n.TranslateField("DisplayName"))), + err := l10n_pkg.TranslateEntity(loc, "en", permissions, + l10n.TranslateEach("LibreGraphPermissionsRolesAllowedValues", + l10n.TranslateField("Description"), + l10n.TranslateField("DisplayName"), + ), ) if err != nil { api.logger.Error().Err(err).Msg("tranlation error")