[full-ci] Rename roles permissions (#8876)

* rephrase sharing roles --------- Co-authored-by: Jannik Stehle <[email protected]>
owncloud · Apr 26, 2023 · 335078c · 335078c
1 parent 5610aa9
commit 335078c
Show file tree

Hide file tree

Showing 46 changed files with 319 additions and 282 deletions.
diff --git a/changelog/unreleased/enhancement-change-role-and-permission-names b/changelog/unreleased/enhancement-change-role-and-permission-names
@@ -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
diff --git a/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue b/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue
@@ -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>

diff --git a/...src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/...src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -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() {

diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue
@@ -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() {

diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
@@ -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
@@ -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() {

diff --git a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
@@ -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">

diff --git a/packages/web-app-files/src/components/SideBar/SideBar.vue b/packages/web-app-files/src/components/SideBar/SideBar.vue
@@ -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

diff --git a/packages/web-app-files/src/composables/actions/files/useFileActionsEmptyTrashBin.ts b/packages/web-app-files/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
@@ -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'
         })
@@ -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'),

diff --git a/packages/web-app-files/src/helpers/contextualHelpers.ts b/packages/web-app-files/src/helpers/contextualHelpers.ts
@@ -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 },
         {
@@ -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 },
         {
@@ -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.'
           )
         }
       ],

diff --git a/packages/web-app-files/src/views/shares/SharedViaLink.vue b/packages/web-app-files/src/views/shares/SharedViaLink.vue
@@ -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

diff --git a/packages/web-app-files/src/views/shares/SharedWithMe.vue b/packages/web-app-files/src/views/shares/SharedWithMe.vue
@@ -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

diff --git a/packages/web-app-files/src/views/shares/SharedWithOthers.vue b/packages/web-app-files/src/views/shares/SharedWithOthers.vue
@@ -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

diff --git a/packages/web-app-files/src/views/spaces/GenericTrash.vue b/packages/web-app-files/src/views/spaces/GenericTrash.vue
@@ -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>