Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[full-ci] Translation fix #11116

Merged
merged 3 commits into from
Mar 13, 2025
+43 −34
Merged

[full-ci] Translation fix #11116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1ac71b
fix(ocis): fix role translations
Mar 5, 2025
2a88464
feat(ocis): adjust tests
Mar 6, 2025
c99d562
fix the e2e test
2403905 Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .drone.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# The test runner source for UI tests
WEB_COMMITID=1d251f198f1f19e9b4ba001899a9dc0adf5c7a06
WEB_COMMITID=efca66897eccd1bfe7e53e01c05cc439540beb89
WEB_BRANCH=stable-11.0
5 changes: 5 additions & 0 deletions changelog/unreleased/Fix-Role-Names.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Bugfix: Fix translations of editor roles

Uses the correct translations strings for ocis roles

https://github.com/owncloud/ocis/pull/11116
22 changes: 13 additions & 9 deletions services/graph/pkg/unifiedrole/roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ var (
// UnifiedRole ViewerListGrants, Role Description (resolves directly)
_viewerListGrantsUnifiedRoleDescription = l10n.Template("View, download and show all invited people.")

// UnifiedRole Viewer, Role DisplayName (resolves directly)
// UnifiedRole ViewerListGrants, Role DisplayName (resolves directly)
_viewerListGrantsUnifiedRoleDisplayName = l10n.Template("Can view")

// UnifiedRole SpaceViewer, Role Description (resolves directly)
Expand All @@ -117,18 +117,18 @@ var (
_editorUnifiedRoleDescription = l10n.Template("View, download, upload, edit, add and delete.")

// UnifiedRole Editor, Role DisplayName (resolves directly)
_editorUnifiedRoleDisplayName = l10n.Template("Can edit")
_editorUnifiedRoleDisplayName = l10n.Template("Can edit without versions")

// UnifiedRoleListGrants Editor, Role Description (resolves directly)
// UnifiedRole EditorListGrants Editor, Role Description (resolves directly)
_editorListGrantsUnifiedRoleDescription = l10n.Template("View, download, upload, edit, add, delete and show all invited people.")

// UnifiedRole EditorListGrants, Role DisplayName (resolves directly)
_editorListGrantsUnifiedRoleDisplayName = l10n.Template("Can edit")
_editorListGrantsUnifiedRoleDisplayName = l10n.Template("Can edit without versions")

// UnifiedRoleListGrants Editor, Role Description (resolves directly)
// UnifiedRole EditorListGrantsWithVersions, Role Description (resolves directly)
_editorListGrantsWithVersionsUnifiedRoleDescription = l10n.Template("View, download, upload, edit, delete and show all invited people, show all versions.")

// UnifiedRole EditorListGrants, Role DisplayName (resolves directly)
// UnifiedRole EditorListGrantsWithVersions, Role DisplayName (resolves directly)
_editorListGrantsWithVersionsUnifiedRoleDisplayName = l10n.Template("Can edit")

// UnifiedRole SpaseEditor, Role Description (resolves directly)
Expand All @@ -147,13 +147,13 @@ var (
_fileEditorUnifiedRoleDescription = l10n.Template("View, download and edit.")

// UnifiedRole FileEditor, Role DisplayName (resolves directly)
_fileEditorUnifiedRoleDisplayName = l10n.Template("Can edit")
_fileEditorUnifiedRoleDisplayName = l10n.Template("Can edit without versions")

// UnifiedRole FileEditorListGrants, Role Description (resolves directly)
_fileEditorListGrantsUnifiedRoleDescription = l10n.Template("View, download, edit and show all invited people.")

// UnifiedRole FileEditorListGrants, Role DisplayName (resolves directly)
_fileEditorListGrantsUnifiedRoleDisplayName = l10n.Template("Can edit")
_fileEditorListGrantsUnifiedRoleDisplayName = l10n.Template("Can edit without versions")

// UnifiedRole FileEditorListGrants, Role Description (resolves directly)
_fileEditorListGrantsWithVersionsUnifiedRoleDescription = l10n.Template("View, download, edit and show all invited people, show all versions.")
Expand Down Expand Up @@ -336,9 +336,11 @@ var (
}
}()

// roleEditorListGrantsWithVersions creates an editor role.
// roleEditorListGrantsWithVersions creates an editor-list-grants-with-versions role.
roleEditorListGrantsWithVersions = func() *libregraph.UnifiedRoleDefinition {
r := conversions.NewEditorListGrantsWithVersionsRole()
// TODO: Workaround to avoid reva bump - fix in reva
r.Name = conversions.RoleEditorListGrantsWithVersions
return &libregraph.UnifiedRoleDefinition{
Id: proto.String(UnifiedRoleEditorListGrantsWithVersionsID),
Description: proto.String(_editorListGrantsWithVersionsUnifiedRoleDescription),
Expand Down Expand Up @@ -436,6 +438,8 @@ var (
// roleFileEditorListGrantsWithVersions creates a file-editor role
roleFileEditorListGrantsWithVersions = func() *libregraph.UnifiedRoleDefinition {
r := conversions.NewFileEditorListGrantsWithVersionsRole()
// TODO: Workaround to avoid reva bump - fix in reva
r.Name = conversions.RoleFileEditorListGrantsWithVersions
return &libregraph.UnifiedRoleDefinition{
Id: proto.String(UnifiedRoleFileEditorListGrantsWithVersionsID),
Description: proto.String(_fileEditorListGrantsWithVersionsUnifiedRoleDescription),
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/features/apiGraph/roleManagementEndpoint.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ Feature: permissions role definitions
"const": "View, download, upload, edit, add and delete."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
Expand Down Expand Up @@ -359,7 +359,7 @@ Feature: permissions role definitions
"const": "View, download and edit."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
Expand Down Expand Up @@ -756,4 +756,4 @@ Feature: permissions role definitions
}
}
}
"""
"""
28 changes: 14 additions & 14 deletions tests/acceptance/features/apiSharingNg1/filterPermissions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Feature: filter sharing permissions
"const": "View, download, upload, edit, add and delete."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
Expand Down Expand Up @@ -189,7 +189,7 @@ Feature: filter sharing permissions
"const": "View, download and edit."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
Expand Down Expand Up @@ -334,7 +334,7 @@ Feature: filter sharing permissions
"const": "View, download, upload, edit, add and delete."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
Expand Down Expand Up @@ -456,7 +456,7 @@ Feature: filter sharing permissions
"const": "View, download and edit."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
Expand Down Expand Up @@ -554,7 +554,7 @@ Feature: filter sharing permissions
"const": "View, download, upload, edit, add and delete."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
Expand Down Expand Up @@ -653,7 +653,7 @@ Feature: filter sharing permissions
"const": "View, download and edit."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
Expand Down Expand Up @@ -778,7 +778,7 @@ Feature: filter sharing permissions
"const": "View, download and edit."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
Expand Down Expand Up @@ -926,7 +926,7 @@ Feature: filter sharing permissions
"const": "View, download, upload, edit, add and delete."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
Expand Down Expand Up @@ -1051,7 +1051,7 @@ Feature: filter sharing permissions
"const": "View, download, upload, edit, add and delete."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
Expand Down Expand Up @@ -1153,7 +1153,7 @@ Feature: filter sharing permissions
"const": "View, download and edit."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
Expand Down Expand Up @@ -1206,7 +1206,7 @@ Feature: filter sharing permissions
"properties": {
"@libre.graph.weight": {"const": 2},
"description": {"const": "View, download and edit."},
"displayName": {"const": "Can edit"},
"displayName": {"const": "Can edit without versions"},
"id": {"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a" }
}
}
Expand Down Expand Up @@ -1256,7 +1256,7 @@ Feature: filter sharing permissions
"properties": {
"@libre.graph.weight": {"const": 2},
"description": {"const": "View, download, upload, edit, add and delete."},
"displayName": {"const": "Can edit"},
"displayName": {"const": "Can edit without versions"},
"id": {"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"}
}
}
Expand Down Expand Up @@ -1309,7 +1309,7 @@ Feature: filter sharing permissions
"properties": {
"@libre.graph.weight": {"const": 2},
"description": {"const": "View, download and edit."},
"displayName": {"const": "Can edit"},
"displayName": {"const": "Can edit without versions"},
"id": {"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"}
}
}
Expand Down Expand Up @@ -1362,7 +1362,7 @@ Feature: filter sharing permissions
"properties": {
"@libre.graph.weight": {"const": 2},
"description": {"const": "View, download, upload, edit, add and delete."},
"displayName": {"const": "Can edit"},
"displayName": {"const": "Can edit without versions"},
"id": {"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"}
}
}
Expand Down
14 changes: 7 additions & 7 deletions tests/acceptance/features/apiSharingNg1/listPermissions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Feature: List a sharing permissions
"const": "View, download, upload, edit, add and delete."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
Expand Down Expand Up @@ -609,7 +609,7 @@ Feature: List a sharing permissions
"const": "View, download and edit."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
Expand Down Expand Up @@ -732,7 +732,7 @@ Feature: List a sharing permissions
"const": "View, download, upload, edit, add and delete."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
Expand Down Expand Up @@ -832,7 +832,7 @@ Feature: List a sharing permissions
"const": "View, download and edit."
},
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
},
"id": {
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
Expand Down Expand Up @@ -2239,7 +2239,7 @@ Feature: List a sharing permissions
],
"properties": {
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
}
}
}
Expand Down Expand Up @@ -2428,7 +2428,7 @@ Feature: List a sharing permissions
],
"properties": {
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
}
}
}
Expand Down Expand Up @@ -2525,7 +2525,7 @@ Feature: List a sharing permissions
],
"properties": {
"displayName": {
"const": "Can edit"
"const": "Can edit without versions"
}
}
}
Expand Down