The translate functions are separated semantically

This commit is contained in:
Roman Perekhod
2024-08-06 14:25:30 +02:00
committed by jkoberg
parent fc85837d82
commit 70fc7ecb92
3 changed files with 151 additions and 55 deletions
@@ -26,7 +26,7 @@ import (
"github.com/go-chi/render"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/v2/ocis-pkg/l10n"
l10n2 "github.com/owncloud/ocis/v2/services/graph/pkg/l10n"
l10n_pkg "github.com/owncloud/ocis/v2/services/graph/pkg/l10n"
"github.com/owncloud/ocis/v2/ocis-pkg/conversions"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
@@ -637,10 +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 := l10n2.NewTranslateLocation(loc, "en")
err := l10n.TranslateEntity(permissions.LibreGraphPermissionsRolesAllowedValues, trf,
l10n.TranslateField("Description"),
l10n.TranslateField("DisplayName"),
trf := l10n_pkg.NewTranslateLocation(loc, "en")
err := l10n.TranslateEntity(permissions, trf,
l10n.TranslateEach("LibreGraphPermissionsRolesAllowedValues",
l10n.TranslateField("Description"),
l10n.TranslateField("DisplayName")),
)
if err != nil {
api.logger.Error().Err(err).Msg("tranlation error")
@@ -671,10 +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 := l10n2.NewTranslateLocation(loc, "en")
err := l10n.TranslateEntity(permissions.LibreGraphPermissionsRolesAllowedValues, trf,
l10n.TranslateField("Description"),
l10n.TranslateField("DisplayName"),
trf := l10n_pkg.NewTranslateLocation(loc, "en")
err := l10n.TranslateEntity(permissions, trf,
l10n.TranslateEach("LibreGraphPermissionsRolesAllowedValues",
l10n.TranslateField("Description"),
l10n.TranslateField("DisplayName")),
)
if err != nil {
api.logger.Error().Err(err).Msg("tranlation error")