added the iterator over slice and map

This commit is contained in:
Roman Perekhod
2024-08-06 14:25:30 +02:00
committed by jkoberg
parent 90bd1fc403
commit fc85837d82
6 changed files with 139 additions and 68 deletions
+4 -4
View File
@@ -85,10 +85,6 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
return
}
// FIXME: configurable default locale?
loc := l10n.MustGetUserLocale(r.Context(), activeUser.GetId().GetOpaqueId(), r.Header.Get(l10n.HeaderAcceptLanguage), s.valService)
t := l10n.NewTranslatorFromCommonConfig("en", _domain, "", _localeFS, _localeSubPath)
resp := GetActivitiesResponse{Activities: make([]libregraph.Activity, 0, len(evRes.GetEvents()))}
for _, e := range evRes.GetEvents() {
delete(toDelete, e.GetId())
@@ -168,6 +164,10 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
continue
}
// FIXME: configurable default locale?
loc := l10n.MustGetUserLocale(r.Context(), activeUser.GetId().GetOpaqueId(), r.Header.Get(l10n.HeaderAcceptLanguage), s.valService)
t := l10n.NewTranslatorFromCommonConfig("en", _domain, "", _localeFS, _localeSubPath)
resp.Activities = append(resp.Activities, NewActivity(t.Translate(message, loc), ts, e.GetId(), vars))
}
@@ -25,38 +25,3 @@ msgstr ""
#: pkg/service/v0/spacetemplates.go:37
msgid "Here you can add a description for this Space."
msgstr "Здесь вы можете добавить описание этого пространства."
#: pkg/unifiedrole/unifiedrole.go:87
msgid "Can edit"
msgstr ""
#. UnifiedRole Viewer, Role DisplayName (resolves directly)
#: pkg/unifiedrole/unifiedrole.go:79
msgid "Can view"
msgstr ""
#. default description for new spaces
#: pkg/service/v0/spacetemplates.go:31
msgid "Here you can add a description for this Space."
msgstr ""
#. UnifiedRole Viewer, Role Description (resolves directly)
#. UnifiedRole SpaceViewer, Role Description (resolves directly)
#: pkg/unifiedrole/unifiedrole.go:77 pkg/unifiedrole/unifiedrole.go:82
msgid "View and download."
msgstr ""
#: pkg/unifiedrole/unifiedrole.go:91
msgid "View, download and edit."
msgstr ""
#: pkg/unifiedrole/unifiedrole.go:92
msgid "View, download and upload."
msgstr ""
#. canEdit := "Can edit"
#. UnifiedRole Editor, Role Description (resolves directly)
#. UnifiedRole SpaseEditor, Role Description (resolves directly)
#: pkg/unifiedrole/unifiedrole.go:86 pkg/unifiedrole/unifiedrole.go:90
msgid "View, download, upload, edit, add and delete."
msgstr ""
@@ -638,15 +638,12 @@ func (api DriveItemPermissionsApi) ListPermissions(w http.ResponseWriter, r *htt
w.Header().Add("Content-Language", loc)
if loc != "" && loc != "en" {
trf := l10n2.NewTranslateLocation(loc, "en")
for i, role := range permissions.LibreGraphPermissionsRolesAllowedValues {
err := l10n.TranslateEntity(&role, trf,
l10n.TranslateField("Description"),
l10n.TranslateField("DisplayName"))
if err != nil {
api.logger.Warn().Err(err).Msg("tranlation error")
continue
}
permissions.LibreGraphPermissionsRolesAllowedValues[i] = role
err := l10n.TranslateEntity(permissions.LibreGraphPermissionsRolesAllowedValues, trf,
l10n.TranslateField("Description"),
l10n.TranslateField("DisplayName"),
)
if err != nil {
api.logger.Error().Err(err).Msg("tranlation error")
}
}
@@ -675,15 +672,12 @@ func (api DriveItemPermissionsApi) ListSpaceRootPermissions(w http.ResponseWrite
w.Header().Add("Content-Language", loc)
if loc != "" && loc != "en" {
trf := l10n2.NewTranslateLocation(loc, "en")
for i, role := range permissions.LibreGraphPermissionsRolesAllowedValues {
err := l10n.TranslateEntity(&role, trf,
l10n.TranslateField("Description"),
l10n.TranslateField("DisplayName"))
if err != nil {
api.logger.Warn().Err(err).Msg("tranlation error")
continue
}
permissions.LibreGraphPermissionsRolesAllowedValues[i] = role
err := l10n.TranslateEntity(permissions.LibreGraphPermissionsRolesAllowedValues, trf,
l10n.TranslateField("Description"),
l10n.TranslateField("DisplayName"),
)
if err != nil {
api.logger.Error().Err(err).Msg("tranlation error")
}
}