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.

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] Rename roles permissions #8876

Merged
merged 66 commits into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
9e08aee
Update label
hurradieweltgehtunter Apr 20, 2023
50c475e
change prepended text as role names change
hurradieweltgehtunter Apr 20, 2023
4804571
center warning message
hurradieweltgehtunter Apr 20, 2023
b08e8d2
add space below icon
hurradieweltgehtunter Apr 20, 2023
cfd03ec
Use more descriptive texts and icons
hurradieweltgehtunter Apr 20, 2023
d420c57
use more descriptive texts
hurradieweltgehtunter Apr 20, 2023
938348a
Update roles and permission names and descriptions
hurradieweltgehtunter Apr 20, 2023
8a4eb71
change label for member search input field
hurradieweltgehtunter Apr 20, 2023
09b86c4
replace trashbin text fragments
hurradieweltgehtunter Apr 20, 2023
3f5d9b3
use more suitable icon
hurradieweltgehtunter Apr 20, 2023
101e1f5
lint
hurradieweltgehtunter Apr 20, 2023
6c61911
use better icon
hurradieweltgehtunter Apr 20, 2023
79250de
update snapshots
hurradieweltgehtunter Apr 20, 2023
bb82833
update changelog
hurradieweltgehtunter Apr 20, 2023
255e2ac
fixes
hurradieweltgehtunter Apr 21, 2023
4d54054
update changelog
hurradieweltgehtunter Apr 21, 2023
cec34e2
change add to create
hurradieweltgehtunter Apr 21, 2023
f451ef0
lint
hurradieweltgehtunter Apr 21, 2023
881e401
update snapshots
hurradieweltgehtunter Apr 21, 2023
473eaec
update changelog
hurradieweltgehtunter Apr 24, 2023
cee57b6
fix text and icon
hurradieweltgehtunter Apr 24, 2023
db1ee1d
Update snapshots
JammingBen Apr 24, 2023
f11e91f
Run linter
JammingBen Apr 24, 2023
67676f4
fix icon
hurradieweltgehtunter Apr 24, 2023
1c78f8b
changes
hurradieweltgehtunter Apr 25, 2023
bd1c58c
add custom texts
hurradieweltgehtunter Apr 26, 2023
23811bc
set correct role labels
hurradieweltgehtunter Apr 26, 2023
b8efa1d
lint + snapshots
hurradieweltgehtunter Apr 26, 2023
16ff53d
use longLabel instead of concat
hurradieweltgehtunter Apr 26, 2023
de5697f
fixes
hurradieweltgehtunter Apr 26, 2023
dabda2b
fix texts
hurradieweltgehtunter Apr 26, 2023
352e8b2
Update label
hurradieweltgehtunter Apr 20, 2023
60b9412
change prepended text as role names change
hurradieweltgehtunter Apr 20, 2023
c40d9bb
center warning message
hurradieweltgehtunter Apr 20, 2023
d19967b
add space below icon
hurradieweltgehtunter Apr 20, 2023
9f11494
Use more descriptive texts and icons
hurradieweltgehtunter Apr 20, 2023
688d8c0
use more descriptive texts
hurradieweltgehtunter Apr 20, 2023
880398b
Update roles and permission names and descriptions
hurradieweltgehtunter Apr 20, 2023
ac4f7c1
change label for member search input field
hurradieweltgehtunter Apr 20, 2023
c42a121
replace trashbin text fragments
hurradieweltgehtunter Apr 20, 2023
88eae2e
use more suitable icon
hurradieweltgehtunter Apr 20, 2023
48ffe13
lint
hurradieweltgehtunter Apr 20, 2023
9c11702
use better icon
hurradieweltgehtunter Apr 20, 2023
daafc76
update snapshots
hurradieweltgehtunter Apr 20, 2023
593a2f2
update changelog
hurradieweltgehtunter Apr 20, 2023
f7b2bef
fixes
hurradieweltgehtunter Apr 21, 2023
770fab8
update changelog
hurradieweltgehtunter Apr 21, 2023
bde5476
change add to create
hurradieweltgehtunter Apr 21, 2023
9b3e399
lint
hurradieweltgehtunter Apr 21, 2023
c5afd84
update snapshots
hurradieweltgehtunter Apr 21, 2023
1978c70
update changelog
hurradieweltgehtunter Apr 24, 2023
c3e8560
fix text and icon
hurradieweltgehtunter Apr 24, 2023
1546652
Update snapshots
JammingBen Apr 24, 2023
fb4611f
Run linter
JammingBen Apr 24, 2023
165d5bf
fix icon
hurradieweltgehtunter Apr 24, 2023
98fcf18
changes
hurradieweltgehtunter Apr 25, 2023
e72648f
add custom texts
hurradieweltgehtunter Apr 26, 2023
7098e59
set correct role labels
hurradieweltgehtunter Apr 26, 2023
809b1fe
lint + snapshots
hurradieweltgehtunter Apr 26, 2023
bca77ed
use longLabel instead of concat
hurradieweltgehtunter Apr 26, 2023
ce98e4f
fixes
hurradieweltgehtunter Apr 26, 2023
3e75adc
fix texts
hurradieweltgehtunter Apr 26, 2023
37029f7
Merge branch 'rename-roles-permissions' of https://github.com/ownclou…
hurradieweltgehtunter Apr 26, 2023
30b5e2a
Fix acceptance tests
JammingBen Apr 26, 2023
f22ce08
Fix more acceptance tests
JammingBen Apr 26, 2023
6519030
Fix even more acceptance tests
JammingBen Apr 26, 2023
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: Update roles and permissions names, labels, texts and icons

We changed the names of roles and permissions in sharing dialogs to verb-based terms.
Also we changed other permission related labels, texts and icons.

https://github.com/owncloud/web/pull/8876
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
<span class="oc-text-medium">({{ items.length }})</span>
</h2>

<no-content-message v-if="!items.length" class="files-empty oc-flex-stretch" icon="group">
<no-content-message
v-if="!items.length"
class="files-empty oc-flex-stretch"
icon="share-forward"
>
<template #message>
<span>{{ emptyMessage }}</span>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export default defineComponent({
return parseInt(this.user.capabilities.files_sharing.search_min_length, 10)
},
selectedCollaboratorsLabel() {
return this.inviteLabel || this.$gettext('Invite')
return this.inviteLabel || this.$gettext('Search')
},

resourceIsSpace() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,7 @@ export default defineComponent({
} else if (this.selectedRole.permissions().includes(SharePermissions.denied)) {
return this.$gettext('Deny access')
} else {
const name = this.$gettext(this.selectedRole.inlineLabel) || ''
return this.$gettext('Invite as %{ name }', { name })
return this.$gettext(this.selectedRole.label) || ''
}
},
customPermissionsRole() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="edit-public-link-role-dropdown-toggle oc-text-left"
gap-size="none"
>
<span class="link-current-role" v-text="$gettext(currentLinkRoleLabel)" />
<span class="link-current-role" v-text="currentLinkRoleLabel" />
<oc-icon name="arrow-down-s" />
</oc-button>
<oc-drop
Expand Down Expand Up @@ -245,7 +245,11 @@ export default defineComponent({
},

currentLinkRoleLabel() {
return this.currentLinkRole.label
if (this.currentLinkRole.longLabel !== '') {
return this.$gettext(this.currentLinkRole.longLabel)
} else {
return this.$gettext(this.currentLinkRole.label)
}
},

editOptions() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
v-if="currentUserCanShare"
key="new-collaborator"
:save-button-label="$gettext('Add')"
:invite-label="$gettext('Add members')"
:invite-label="$gettext('Search')"
class="oc-my-s"
/>
<template v-if="hasCollaborators">
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/components/SideBar/SideBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export default defineComponent({
})
const warningMessage = computed(() => {
if (!unref(isShareAccepted)) {
return $gettext('Please, accept this share first to display available actions')
return $gettext('Select an accepted share to show details.')
}

return null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } =
console.error(error)
store.dispatch('showMessage', {
title: $pgettext(
'Error message in case clearing the trash bin fails',
'Failed to delete all files permanently'
'Error message in case emptying trash bin fails',
'Failed to empty trash bin'
),
status: 'danger'
})
Expand All @@ -59,7 +59,7 @@ export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } =
cancelText: $gettext('Cancel'),
confirmText: $gettext('Delete'),
message: $gettext(
'Are you sure you want to permanently delete your items in the trash bin? You can’t undo this action.'
'Are you sure you want to permanently delete the listed items? You can’t undo this action.'
),
hasInput: false,
onCancel: () => store.dispatch('hideModal'),
Expand Down
20 changes: 12 additions & 8 deletions packages/web-app-files/src/helpers/contextualHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ export interface ContextualHelperOptions {
export const shareInviteCollaboratorHelp = (options: ContextualHelperOptions) =>
filterContextHelper(
{
title: $gettext('Invite specific people'),
text: $gettext('Enter a name or group to share this item.'),
title: $gettext('Share with people'),
text: $gettext(
'Use the input field to search for users and groups. Select them to share the item.'
),
list: [
{ text: $gettext('Subfolders'), headline: true },
{
Expand All @@ -35,11 +37,13 @@ export const shareInviteCollaboratorHelp = (options: ContextualHelperOptions) =>
},
{ text: $gettext('Notification'), headline: true },
{
text: $gettext('Invited people will be notified via email or in-app notification.')
text: $gettext(
'People you share resources with will be notified via email or in-app notification.'
)
},
{ text: $gettext('Incognito'), headline: true },
{
text: $gettext('Invited people can not see who else has access..')
text: $gettext('People you share resources with can not see who else has access.')
},
{ text: $gettext('“via folder”'), headline: true },
{
Expand Down Expand Up @@ -75,16 +79,16 @@ export const shareSpaceAddMemberHelp = (options: ContextualHelperOptions) =>
title: $gettext('Add members to this Space'),
text: $gettext('Enter a name to add people or groups as members to this Space.'),
list: [
{ text: $gettext('What members can do'), headline: true },
{ text: $gettext('Member capabilities'), headline: true },
{
text: $gettext(
'Members can see who else has access to this space and can access all files in this space. Read or write permissions can be set by the member’s role.'
'Members are able to see who has access to this space and access all files in this space. Read or write permissions can be set by assigning a role.'
)
},
{ text: $gettext('What Space managers can do'), headline: true },
{ text: $gettext('Space manager capabilities'), headline: true },
{
text: $gettext(
'Space managers can edit all properties and content of a Space, such as adding or removing members, sharing subfolders with non-members, or creating links to share.'
'Members with the Manager role are able to edit all properties and content of a Space, such as adding or removing members, sharing subfolders with non-members, or creating links to share.'
)
}
],
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/shares/SharedViaLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
icon="link"
>
<template #message>
<span v-translate>There are no resources with a public link at the moment</span>
<span v-translate>You have not shared any resource via link.</span>
</template>
</no-content-message>
<resource-table
Expand Down
4 changes: 2 additions & 2 deletions packages/web-app-files/src/views/shares/SharedWithMe.vue
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,14 @@ export default defineComponent({
return this.$gettext('Accepted shares')
},
acceptedEmptyMessage() {
return this.$gettext("You are not collaborating on other people's resources.")
return this.$gettext('You have no accepted shares.')
},

declinedTitle() {
return this.$gettext('Declined shares')
},
declinedEmptyMessage() {
return this.$gettext("You don't have any previously declined shares.")
return this.$gettext('You have no declined shares.')
},
displayThumbnails() {
return !this.configuration?.options?.disablePreviews
Expand Down
6 changes: 2 additions & 4 deletions packages/web-app-files/src/views/shares/SharedWithOthers.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@
v-if="isEmpty"
id="files-shared-with-others-empty"
class="files-empty"
icon="group"
icon="reply"
>
<template #message>
<span v-translate>
You are currently not collaborating on any of your resources with other people
</span>
<span v-translate> You have not shared any resources with other people. </span>
</template>
</no-content-message>
<resource-table
Expand Down
3 changes: 2 additions & 1 deletion packages/web-app-files/src/views/spaces/GenericTrash.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
v-if="isEmpty"
id="files-trashbin-empty"
class="files-empty"
icon="delete-bin-5"
icon="delete-bin-7"
icon-fill-type="line"
>
<template #message>
<span>{{ noContentMessage }}</span>
Expand Down
Loading