Skip to content

Commit 5c721c9

Browse files
24039052403905
authored
Merge pull request #11116 from owncloud/TranslationFix
[full-ci] Translation fix
2 parents 177625b + c99d562 commit 5c721c9

File tree

6 files changed

+43
-34
lines changed

6 files changed

+43
-34
lines changed

‎.drone.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# The test runner source for UI tests
2-
WEB_COMMITID=1d251f198f1f19e9b4ba001899a9dc0adf5c7a06
2+
WEB_COMMITID=efca66897eccd1bfe7e53e01c05cc439540beb89
33
WEB_BRANCH=stable-11.0

‎changelog/unreleased/Fix-Role-Names.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Bugfix: Fix translations of editor roles
2+
3+
Uses the correct translations strings for ocis roles
4+
5+
https://github.com/owncloud/ocis/pull/11116

‎services/graph/pkg/unifiedrole/roles.go

+13-9
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ var (
104104
// UnifiedRole ViewerListGrants, Role Description (resolves directly)
105105
_viewerListGrantsUnifiedRoleDescription = l10n.Template("View, download and show all invited people.")
106106

107-
// UnifiedRole Viewer, Role DisplayName (resolves directly)
107+
// UnifiedRole ViewerListGrants, Role DisplayName (resolves directly)
108108
_viewerListGrantsUnifiedRoleDisplayName = l10n.Template("Can view")
109109

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

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

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

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

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

131-
// UnifiedRole EditorListGrants, Role DisplayName (resolves directly)
131+
// UnifiedRole EditorListGrantsWithVersions, Role DisplayName (resolves directly)
132132
_editorListGrantsWithVersionsUnifiedRoleDisplayName = l10n.Template("Can edit")
133133

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

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

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

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

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

339-
// roleEditorListGrantsWithVersions creates an editor role.
339+
// roleEditorListGrantsWithVersions creates an editor-list-grants-with-versions role.
340340
roleEditorListGrantsWithVersions = func() *libregraph.UnifiedRoleDefinition {
341341
r := conversions.NewEditorListGrantsWithVersionsRole()
342+
// TODO: Workaround to avoid reva bump - fix in reva
343+
r.Name = conversions.RoleEditorListGrantsWithVersions
342344
return &libregraph.UnifiedRoleDefinition{
343345
Id: proto.String(UnifiedRoleEditorListGrantsWithVersionsID),
344346
Description: proto.String(_editorListGrantsWithVersionsUnifiedRoleDescription),
@@ -436,6 +438,8 @@ var (
436438
// roleFileEditorListGrantsWithVersions creates a file-editor role
437439
roleFileEditorListGrantsWithVersions = func() *libregraph.UnifiedRoleDefinition {
438440
r := conversions.NewFileEditorListGrantsWithVersionsRole()
441+
// TODO: Workaround to avoid reva bump - fix in reva
442+
r.Name = conversions.RoleFileEditorListGrantsWithVersions
439443
return &libregraph.UnifiedRoleDefinition{
440444
Id: proto.String(UnifiedRoleFileEditorListGrantsWithVersionsID),
441445
Description: proto.String(_fileEditorListGrantsWithVersionsUnifiedRoleDescription),

‎tests/acceptance/features/apiGraph/roleManagementEndpoint.feature

+3-3
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ Feature: permissions role definitions
211211
"const": "View, download, upload, edit, add and delete."
212212
},
213213
"displayName": {
214-
"const": "Can edit"
214+
"const": "Can edit without versions"
215215
},
216216
"id": {
217217
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
@@ -359,7 +359,7 @@ Feature: permissions role definitions
359359
"const": "View, download and edit."
360360
},
361361
"displayName": {
362-
"const": "Can edit"
362+
"const": "Can edit without versions"
363363
},
364364
"id": {
365365
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
@@ -756,4 +756,4 @@ Feature: permissions role definitions
756756
}
757757
}
758758
}
759-
"""
759+
"""

‎tests/acceptance/features/apiSharingNg1/filterPermissions.feature

+14-14
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Feature: filter sharing permissions
9090
"const": "View, download, upload, edit, add and delete."
9191
},
9292
"displayName": {
93-
"const": "Can edit"
93+
"const": "Can edit without versions"
9494
},
9595
"id": {
9696
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
@@ -189,7 +189,7 @@ Feature: filter sharing permissions
189189
"const": "View, download and edit."
190190
},
191191
"displayName": {
192-
"const": "Can edit"
192+
"const": "Can edit without versions"
193193
},
194194
"id": {
195195
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
@@ -334,7 +334,7 @@ Feature: filter sharing permissions
334334
"const": "View, download, upload, edit, add and delete."
335335
},
336336
"displayName": {
337-
"const": "Can edit"
337+
"const": "Can edit without versions"
338338
},
339339
"id": {
340340
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
@@ -456,7 +456,7 @@ Feature: filter sharing permissions
456456
"const": "View, download and edit."
457457
},
458458
"displayName": {
459-
"const": "Can edit"
459+
"const": "Can edit without versions"
460460
},
461461
"id": {
462462
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
@@ -554,7 +554,7 @@ Feature: filter sharing permissions
554554
"const": "View, download, upload, edit, add and delete."
555555
},
556556
"displayName": {
557-
"const": "Can edit"
557+
"const": "Can edit without versions"
558558
},
559559
"id": {
560560
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
@@ -653,7 +653,7 @@ Feature: filter sharing permissions
653653
"const": "View, download and edit."
654654
},
655655
"displayName": {
656-
"const": "Can edit"
656+
"const": "Can edit without versions"
657657
},
658658
"id": {
659659
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
@@ -778,7 +778,7 @@ Feature: filter sharing permissions
778778
"const": "View, download and edit."
779779
},
780780
"displayName": {
781-
"const": "Can edit"
781+
"const": "Can edit without versions"
782782
},
783783
"id": {
784784
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
@@ -926,7 +926,7 @@ Feature: filter sharing permissions
926926
"const": "View, download, upload, edit, add and delete."
927927
},
928928
"displayName": {
929-
"const": "Can edit"
929+
"const": "Can edit without versions"
930930
},
931931
"id": {
932932
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
@@ -1051,7 +1051,7 @@ Feature: filter sharing permissions
10511051
"const": "View, download, upload, edit, add and delete."
10521052
},
10531053
"displayName": {
1054-
"const": "Can edit"
1054+
"const": "Can edit without versions"
10551055
},
10561056
"id": {
10571057
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
@@ -1153,7 +1153,7 @@ Feature: filter sharing permissions
11531153
"const": "View, download and edit."
11541154
},
11551155
"displayName": {
1156-
"const": "Can edit"
1156+
"const": "Can edit without versions"
11571157
},
11581158
"id": {
11591159
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
@@ -1206,7 +1206,7 @@ Feature: filter sharing permissions
12061206
"properties": {
12071207
"@libre.graph.weight": {"const": 2},
12081208
"description": {"const": "View, download and edit."},
1209-
"displayName": {"const": "Can edit"},
1209+
"displayName": {"const": "Can edit without versions"},
12101210
"id": {"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a" }
12111211
}
12121212
}
@@ -1256,7 +1256,7 @@ Feature: filter sharing permissions
12561256
"properties": {
12571257
"@libre.graph.weight": {"const": 2},
12581258
"description": {"const": "View, download, upload, edit, add and delete."},
1259-
"displayName": {"const": "Can edit"},
1259+
"displayName": {"const": "Can edit without versions"},
12601260
"id": {"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"}
12611261
}
12621262
}
@@ -1309,7 +1309,7 @@ Feature: filter sharing permissions
13091309
"properties": {
13101310
"@libre.graph.weight": {"const": 2},
13111311
"description": {"const": "View, download and edit."},
1312-
"displayName": {"const": "Can edit"},
1312+
"displayName": {"const": "Can edit without versions"},
13131313
"id": {"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"}
13141314
}
13151315
}
@@ -1362,7 +1362,7 @@ Feature: filter sharing permissions
13621362
"properties": {
13631363
"@libre.graph.weight": {"const": 2},
13641364
"description": {"const": "View, download, upload, edit, add and delete."},
1365-
"displayName": {"const": "Can edit"},
1365+
"displayName": {"const": "Can edit without versions"},
13661366
"id": {"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"}
13671367
}
13681368
}

‎tests/acceptance/features/apiSharingNg1/listPermissions.feature

+7-7
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Feature: List a sharing permissions
112112
"const": "View, download, upload, edit, add and delete."
113113
},
114114
"displayName": {
115-
"const": "Can edit"
115+
"const": "Can edit without versions"
116116
},
117117
"id": {
118118
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
@@ -609,7 +609,7 @@ Feature: List a sharing permissions
609609
"const": "View, download and edit."
610610
},
611611
"displayName": {
612-
"const": "Can edit"
612+
"const": "Can edit without versions"
613613
},
614614
"id": {
615615
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
@@ -732,7 +732,7 @@ Feature: List a sharing permissions
732732
"const": "View, download, upload, edit, add and delete."
733733
},
734734
"displayName": {
735-
"const": "Can edit"
735+
"const": "Can edit without versions"
736736
},
737737
"id": {
738738
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
@@ -832,7 +832,7 @@ Feature: List a sharing permissions
832832
"const": "View, download and edit."
833833
},
834834
"displayName": {
835-
"const": "Can edit"
835+
"const": "Can edit without versions"
836836
},
837837
"id": {
838838
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
@@ -2239,7 +2239,7 @@ Feature: List a sharing permissions
22392239
],
22402240
"properties": {
22412241
"displayName": {
2242-
"const": "Can edit"
2242+
"const": "Can edit without versions"
22432243
}
22442244
}
22452245
}
@@ -2428,7 +2428,7 @@ Feature: List a sharing permissions
24282428
],
24292429
"properties": {
24302430
"displayName": {
2431-
"const": "Can edit"
2431+
"const": "Can edit without versions"
24322432
}
24332433
}
24342434
}
@@ -2525,7 +2525,7 @@ Feature: List a sharing permissions
25252525
],
25262526
"properties": {
25272527
"displayName": {
2528-
"const": "Can edit"
2528+
"const": "Can edit without versions"
25292529
}
25302530
}
25312531
}

0 commit comments

Comments
 (0)