From f499574b86480de7eff137598a31070111cfab23 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2020 11:49:49 +0200
Subject: [PATCH 1/2] Rename collaborator/s to person/people

---
 .../components/Collaborators/Collaborator.vue  |  4 ++--
 .../Collaborators/NewCollaborator.vue          | 18 ++++++++----------
 .../Collaborators/SharedFilesList.vue          |  8 ++++----
 apps/files/src/components/FileLinkSidebar.vue  | 11 +++++------
 .../src/components/FileSharingSidebar.vue      |  6 +++---
 apps/files/src/mixins/filesListIndicators.js   |  4 ++--
 apps/files/src/quickActions.js                 |  2 +-
 .../unreleased/rename-collaborators-to-people  |  8 ++++++++
 .../pageObjects/FilesPageElement/appSideBar.js |  2 +-
 .../pageObjects/FilesPageElement/filesList.js  |  6 +++---
 .../stepDefinitions/sharingContext.js          |  2 +-
 11 files changed, 38 insertions(+), 33 deletions(-)
 create mode 100644 changelog/unreleased/rename-collaborators-to-people

diff --git a/apps/files/src/components/Collaborators/Collaborator.vue b/apps/files/src/components/Collaborators/Collaborator.vue
index acd5be493c0..daae98964d2 100644
--- a/apps/files/src/components/Collaborators/Collaborator.vue
+++ b/apps/files/src/components/Collaborators/Collaborator.vue
@@ -69,7 +69,7 @@
         </oc-button>
         <oc-spinner
           v-else-if="$_loadingSpinnerVisible"
-          :aria-label="$gettext('Removing collaborator…')"
+          :aria-label="$gettext('Removing person…')"
           size="small"
         />
         <oc-icon v-else name="lock" class="uk-invisible"></oc-icon>
@@ -112,7 +112,7 @@
             }}</span>
             <translate
               v-if="collaborator.collaborator.name === user.id"
-              translate-comment="Indicator for current user in collaborators list"
+              translate-comment="Indicator for current user in list of people"
               class="uk-text-meta files-collaborators-collaborator-additional-info"
             >
               (me)
diff --git a/apps/files/src/components/Collaborators/NewCollaborator.vue b/apps/files/src/components/Collaborators/NewCollaborator.vue
index d8c3c5c0286..3e555631648 100644
--- a/apps/files/src/components/Collaborators/NewCollaborator.vue
+++ b/apps/files/src/components/Collaborators/NewCollaborator.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="files-collaborators-collaborator-add-dialog">
-    <label for="oc-sharing-autocomplete"><translate>New Collaborators:</translate></label>
+    <label for="oc-sharing-autocomplete"><translate>New People:</translate></label>
     <oc-grid gutter="small">
       <oc-autocomplete
         id="oc-sharing-autocomplete"
         ref="ocSharingAutocomplete"
-        :aria-label="$gettext('Select a collaborator to add')"
+        :aria-label="$gettext('Select a person to add')"
         :items="autocompleteResults"
         :items-loading="autocompleteInProgress"
         :placeholder="$_ocCollaborationStatus_autocompletePlaceholder"
@@ -24,7 +24,7 @@
     <oc-grid v-if="selectedCollaborators.length > 0" gutter="small">
       <div>
         <div>
-          <translate>Selected collaborators:</translate>
+          <translate>Selected people:</translate>
         </div>
         <oc-table middle class="uk-width-expand files-collaborators-collaborator-autocomplete-item">
           <oc-table-row
@@ -66,13 +66,11 @@
         </oc-button>
         <oc-button v-if="saving" key="new-collaborator-saving-button" :disabled="true">
           <oc-spinner
-            :aria-label="$gettext('Adding Collaborators')"
+            :aria-label="$gettext('Adding People')"
             class="uk-position-small uk-position-center-left"
             size="xsmall"
           />
-          <span v-translate :aria-hidden="true" class="uk-margin-small-left"
-            >Adding Collaborators</span
-          >
+          <span v-translate :aria-hidden="true" class="uk-margin-small-left">Adding People</span>
         </oc-button>
         <oc-button
           v-else
@@ -82,7 +80,7 @@
           variation="primary"
           @click="$_ocCollaborators_newCollaboratorsAdd(selectedCollaborators)"
         >
-          <translate>Add Collaborators</translate>
+          <translate>Share</translate>
         </oc-button>
       </div>
     </oc-grid>
@@ -126,11 +124,11 @@ export default {
     ...mapGetters(['user']),
 
     $_ocCollaborationStatus_autocompletePlaceholder() {
-      return this.$gettext("Add new collaborator by name, email or federation ID's")
+      return this.$gettext("Add new person by name, email or federation ID's")
     },
 
     $_announcementWhenCollaboratorAdded() {
-      return this.$gettext('Collaborator was added')
+      return this.$gettext('Person was added')
     },
 
     $_isValid() {
diff --git a/apps/files/src/components/Collaborators/SharedFilesList.vue b/apps/files/src/components/Collaborators/SharedFilesList.vue
index e0c1cfc0608..68279c54040 100644
--- a/apps/files/src/components/Collaborators/SharedFilesList.vue
+++ b/apps/files/src/components/Collaborators/SharedFilesList.vue
@@ -22,8 +22,8 @@
         v-if="!$_isSharedWithMe"
         key="shared-with-header-cell"
         class="uk-visible@s uk-text-nowrap uk-text-meta uk-width-medium uk-text-right"
-        translate-context="Collaborators table column"
-        v-text="$gettext('Collaborators')"
+        translate-context="'People' table column"
+        v-text="$gettext('People')"
       />
       <div
         v-else
@@ -231,9 +231,9 @@ export default {
     ]),
 
     /**
-     * Prepare the given collaboratoes list for display.
+     * Prepare the given peoples list for display.
      * Sorts first by share type (user, group, link, remote)
-     * and then by the collaborator's display name using natural
+     * and then by the people's display name using natural
      * sort. Public links entries are deduplicated into a single
      * one in order to only show "Public" once even when
      * there are multiple link shares.
diff --git a/apps/files/src/components/FileLinkSidebar.vue b/apps/files/src/components/FileLinkSidebar.vue
index cba0cbc23a2..5e7d50c1411 100644
--- a/apps/files/src/components/FileLinkSidebar.vue
+++ b/apps/files/src/components/FileLinkSidebar.vue
@@ -33,7 +33,7 @@
             </oc-button>
           </div>
           <div class="uk-text-meta">
-            <i><translate>Only invited collaborators can use this link.</translate></i>
+            <i><translate>Only invited people can use this link.</translate></i>
           </div>
           <hr />
         </section>
@@ -44,11 +44,10 @@
           <div class="uk-text-meta">
             <i
               ><translate
-                >Any external collaborator with the respective link can access this resource. No
-                sign-in required. Assign a password to avoid unintended document
-                exposure.</translate
-              ></i
-            >
+                >Any external person with the respective link can access this resource. No sign-in
+                required. Assign a password to avoid unintended document exposure.
+              </translate>
+            </i>
           </div>
           <div class="uk-margin-small-top uk-margin-small-bottom">
             <oc-button
diff --git a/apps/files/src/components/FileSharingSidebar.vue b/apps/files/src/components/FileSharingSidebar.vue
index e0a43357857..4d94e24f88d 100644
--- a/apps/files/src/components/FileSharingSidebar.vue
+++ b/apps/files/src/components/FileSharingSidebar.vue
@@ -5,7 +5,7 @@
       :key="PANEL_SHOW"
       :aria-hidden="currentPanel !== PANEL_SHOW"
     >
-      <oc-loader v-if="sharesLoading" :aria-label="$gettext('Loading collaborator list')" />
+      <oc-loader v-if="sharesLoading" :aria-label="$gettext('Loading people list')" />
       <template v-else>
         <div v-if="$_ocCollaborators_canShare" class="uk-margin-small-top uk-margin-small-bottom">
           <oc-button
@@ -14,7 +14,7 @@
             class="files-collaborators-open-add-share-dialog-button"
             @click="$_ocCollaborators_addShare"
           >
-            <translate>Add Collaborators</translate>
+            <translate>Share</translate>
           </oc-button>
         </div>
         <p
@@ -107,7 +107,7 @@ const PANEL_NEW = 'newCollaborator'
 
 export default {
   title: $gettext => {
-    return $gettext('Collaborators')
+    return $gettext('People')
   },
   name: 'FileSharingSidebar',
   components: {
diff --git a/apps/files/src/mixins/filesListIndicators.js b/apps/files/src/mixins/filesListIndicators.js
index bec0a557e98..227cf65f039 100644
--- a/apps/files/src/mixins/filesListIndicators.js
+++ b/apps/files/src/mixins/filesListIndicators.js
@@ -97,8 +97,8 @@ export default {
 
     shareUserIconLabel(item) {
       return this.isDirectUserShare(item)
-        ? this.$gettext('Directly shared with collaborators')
-        : this.$gettext('Shared with collaborators through one of the parent folders')
+        ? this.$gettext('Directly shared with people')
+        : this.$gettext('Shared with people through one of the parent folders')
     },
 
     shareLinkIconLabel(item) {
diff --git a/apps/files/src/quickActions.js b/apps/files/src/quickActions.js
index fffa4a6a119..63c5093da2c 100644
--- a/apps/files/src/quickActions.js
+++ b/apps/files/src/quickActions.js
@@ -60,7 +60,7 @@ function canShare(item, store) {
 export default {
   collaborators: {
     id: 'collaborators',
-    label: $gettext('Add new collaborators'),
+    label: $gettext('Add new people'),
     icon: 'group',
     handler: openNewCollaboratorsPanel,
     displayed: canShare
diff --git a/changelog/unreleased/rename-collaborators-to-people b/changelog/unreleased/rename-collaborators-to-people
new file mode 100644
index 00000000000..c0730374504
--- /dev/null
+++ b/changelog/unreleased/rename-collaborators-to-people
@@ -0,0 +1,8 @@
+Change: Renamed collaborators to people
+
+All visible occurrences of "collaborator" or "collaborators" have been replaced by "person" or "people" respectively.
+Additionally, the action "Add Collaborator" was changed to "Share".
+
+https://github.com/owncloud/phoenix/pull/4070
+https://github.com/owncloud/product/issues/231
+
diff --git a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
index 4914c992984..8edacde5c1d 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js
@@ -93,7 +93,7 @@ module.exports = {
       locateStrategy: 'xpath'
     },
     sidebarCollaboratorsTab: {
-      selector: '//div[@class="sidebar-container"]//a[contains(text(),"Collaborators")]',
+      selector: '//div[@class="sidebar-container"]//a[contains(text(),"People")]',
       locateStrategy: 'xpath'
     },
     sidebarVersionsTab: {
diff --git a/tests/acceptance/pageObjects/FilesPageElement/filesList.js b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
index a7b7c26025b..0b4416b7035 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/filesList.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/filesList.js
@@ -551,10 +551,10 @@ module.exports = {
               }
               this.api.elementIdAttribute(element.ELEMENT, 'aria-label', attr => {
                 switch (attr.value) {
-                  case 'Directly shared with collaborators':
+                  case 'Directly shared with people':
                     indicators.push('user-direct')
                     break
-                  case 'Shared with collaborators through one of the parent folders':
+                  case 'Shared with people through one of the parent folders':
                     indicators.push('user-indirect')
                     break
                   case 'Directly shared with links':
@@ -747,7 +747,7 @@ module.exports = {
       selector: '#files-list-container .files-list-no-content-message'
     },
     shareButtonInFileRow: {
-      selector: '//button[@aria-label="Collaborators"]',
+      selector: '//button[@aria-label="People"]',
       locateStrategy: 'xpath'
     },
     fileRowByName: {
diff --git a/tests/acceptance/stepDefinitions/sharingContext.js b/tests/acceptance/stepDefinitions/sharingContext.js
index df24f2cb46f..9d46e475f6c 100644
--- a/tests/acceptance/stepDefinitions/sharingContext.js
+++ b/tests/acceptance/stepDefinitions/sharingContext.js
@@ -703,7 +703,7 @@ Then('it should not be possible to share file/folder {string} using the webUI',
   const sidebarCollaboratorsTabState = await appSideBar.isCollaboratorsTabPresentOnCurrentSidebar()
   assert.ok(
     !sidebarCollaboratorsTabState,
-    `Error: Sidebar 'Collaborators' tab for resource ${resource} is present`
+    `Error: Sidebar 'People' tab for resource ${resource} is present`
   )
 })
 

From 2ab90a94d04a8375455873fdbc3717c770e10b7d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2020 13:03:19 +0200
Subject: [PATCH 2/2] Adjustments + tests for collaborator to people renaming

Adjust wording further.
Fix tests that were passing in the given tab name as string to the
selector.
---
 .../components/Collaborators/Collaborator.vue |  2 +-
 .../Collaborators/NewCollaborator.vue         |  2 +-
 apps/files/src/quickActions.js                |  2 +-
 .../features/webUIFiles/fileDetails.feature   | 24 +++++++++----------
 .../shareByPublicLink.feature                 |  4 ++--
 tests/acceptance/pageObjects/filesPage.js     |  5 +++-
 .../stepDefinitions/sharingContext.js         |  4 ++--
 7 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/apps/files/src/components/Collaborators/Collaborator.vue b/apps/files/src/components/Collaborators/Collaborator.vue
index daae98964d2..b562cd59a66 100644
--- a/apps/files/src/components/Collaborators/Collaborator.vue
+++ b/apps/files/src/components/Collaborators/Collaborator.vue
@@ -69,7 +69,7 @@
         </oc-button>
         <oc-spinner
           v-else-if="$_loadingSpinnerVisible"
-          :aria-label="$gettext('Removing person…')"
+          :aria-label="$gettext('Removing person')"
           size="small"
         />
         <oc-icon v-else name="lock" class="uk-invisible"></oc-icon>
diff --git a/apps/files/src/components/Collaborators/NewCollaborator.vue b/apps/files/src/components/Collaborators/NewCollaborator.vue
index 3e555631648..57950550dcb 100644
--- a/apps/files/src/components/Collaborators/NewCollaborator.vue
+++ b/apps/files/src/components/Collaborators/NewCollaborator.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="files-collaborators-collaborator-add-dialog">
-    <label for="oc-sharing-autocomplete"><translate>New People:</translate></label>
+    <label for="oc-sharing-autocomplete"><translate>Add People:</translate></label>
     <oc-grid gutter="small">
       <oc-autocomplete
         id="oc-sharing-autocomplete"
diff --git a/apps/files/src/quickActions.js b/apps/files/src/quickActions.js
index 63c5093da2c..cde60863e6d 100644
--- a/apps/files/src/quickActions.js
+++ b/apps/files/src/quickActions.js
@@ -60,7 +60,7 @@ function canShare(item, store) {
 export default {
   collaborators: {
     id: 'collaborators',
-    label: $gettext('Add new people'),
+    label: $gettext('Add people'),
     icon: 'group',
     handler: openNewCollaboratorsPanel,
     displayed: canShare
diff --git a/tests/acceptance/features/webUIFiles/fileDetails.feature b/tests/acceptance/features/webUIFiles/fileDetails.feature
index 5e99f7c0210..2d1b1971c0f 100644
--- a/tests/acceptance/features/webUIFiles/fileDetails.feature
+++ b/tests/acceptance/features/webUIFiles/fileDetails.feature
@@ -17,15 +17,15 @@ Feature: User can open the details panel for any file or folder
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
     And the "versions" details panel should be visible
-    When the user switches to "collaborators" tab in details panel using the webUI
-    Then the "collaborators" details panel should be visible
+    When the user switches to "people" tab in details panel using the webUI
+    Then the "people" details panel should be visible
 
   @files_versions-app-required
   Scenario: View different areas of the app-sidebar for a folder in files page
     When the user picks the row of folder "simple-folder" in the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
-    And the "collaborators" details panel should be visible
+    And the "people" details panel should be visible
     And no "links" tab should be available in the details panel
     And no "versions" tab should be available in the details panel
 
@@ -37,8 +37,8 @@ Feature: User can open the details panel for any file or folder
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
     And the "versions" details panel should be visible
-    When the user switches to "collaborators" tab in details panel using the webUI
-    Then the "collaborators" details panel should be visible
+    When the user switches to "people" tab in details panel using the webUI
+    Then the "people" details panel should be visible
 
   @files_versions-app-required @skipOnOCIS @ocis-reva-issue-39
   Scenario: View different areas of the app-sidebar for a folder in favorites page
@@ -47,7 +47,7 @@ Feature: User can open the details panel for any file or folder
     When the user picks the row of folder "simple-folder" in the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
-    And the "collaborators" details panel should be visible
+    And the "people" details panel should be visible
     And no "links" tab should be available in the details panel
     And no "versions" tab should be available in the details panel
 
@@ -74,8 +74,8 @@ Feature: User can open the details panel for any file or folder
     When the user picks the row of folder "simple-folder" in the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
-    When the user switches to "collaborators" tab in details panel using the webUI
-    Then the "collaborators" details panel should be visible
+    When the user switches to "people" tab in details panel using the webUI
+    Then the "people" details panel should be visible
 #    When the user switches to "comments" tab in details panel using the webUI
 #    Then the "comments" details panel should be visible
     When the user switches to "links" tab in details panel using the webUI
@@ -89,8 +89,8 @@ Feature: User can open the details panel for any file or folder
     When the user picks the row of folder "simple-folder" in the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
-    When the user switches to "collaborators" tab in details panel using the webUI
-    Then the "collaborators" details panel should be visible
+    When the user switches to "people" tab in details panel using the webUI
+    Then the "people" details panel should be visible
 #    When the user switches to "comments" tab in details panel using the webUI
 #    Then the "comments" details panel should be visible
     When the user switches to "links" tab in details panel using the webUI
@@ -105,8 +105,8 @@ Feature: User can open the details panel for any file or folder
     When the user picks the row of folder "simple-folder (2)" in the webUI
     Then the app-sidebar should be visible
     And the thumbnail should be visible in the app-sidebar
-    When the user switches to "collaborators" tab in details panel using the webUI
-    Then the "collaborators" details panel should be visible
+    When the user switches to "people" tab in details panel using the webUI
+    Then the "people" details panel should be visible
 #    When the user switches to "comments" tab in details panel using the webUI
 #    Then the "comments" details panel should be visible
     When the user switches to "links" tab in details panel using the webUI
diff --git a/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature b/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature
index baec0e8c1ff..850addd1523 100644
--- a/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature
+++ b/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature
@@ -698,11 +698,11 @@ Feature: Share by public link
       | name          |
       | versions      |
       | links         |
-      | collaborators |
+      | people        |
 #    Then the following tabs should not be visible in the details dialog
 #      | name          |
 #      | links         |
-#      | collaborators |
+#      | people        |
 
   @issue-2060 @skipOnOCIS @issue-ocis-reva-243
   Scenario: sharing indicator inside a shared folder
diff --git a/tests/acceptance/pageObjects/filesPage.js b/tests/acceptance/pageObjects/filesPage.js
index 161fd9d7732..22417049a5a 100644
--- a/tests/acceptance/pageObjects/filesPage.js
+++ b/tests/acceptance/pageObjects/filesPage.js
@@ -238,7 +238,10 @@ module.exports = {
     },
     isPanelVisible: function(panelName, callback) {
       let selector = ''
-      if (panelName === 'collaborators') {
+      if (panelName === 'people') {
+        selector = this.elements.collaboratorsPanel
+      } else if (panelName === 'collaborators') {
+        // FIXME: rename once renamed in all tests
         selector = this.elements.collaboratorsPanel
       } else if (panelName === 'versions') {
         selector = this.elements.versionsPanel
diff --git a/tests/acceptance/stepDefinitions/sharingContext.js b/tests/acceptance/stepDefinitions/sharingContext.js
index 9d46e475f6c..5c923cd15e0 100644
--- a/tests/acceptance/stepDefinitions/sharingContext.js
+++ b/tests/acceptance/stepDefinitions/sharingContext.js
@@ -954,7 +954,7 @@ Then(
   'the share {string} shared with user {string} should have no expiration information displayed on the WebUI',
   async function(item, user) {
     await client.page.FilesPageElement.filesList().clickRow(item)
-    await client.page.filesPage().selectTabInSidePanel('collaborators')
+    await client.page.filesPage().selectTabInSidePanel('people')
     const elementID = await client.page.FilesPageElement.SharingDialog.collaboratorsDialog().getCollaboratorExpirationInfo(
       user
     )
@@ -970,7 +970,7 @@ Then(
   'the expiration information displayed on the WebUI of share {string} shared with user {string} should be {string} or {string}',
   async function(item, user, information1, information2) {
     await client.page.FilesPageElement.filesList().clickRow(item)
-    await client.page.filesPage().selectTabInSidePanel('collaborators')
+    await client.page.filesPage().selectTabInSidePanel('people')
     const actualInfo = await client.page.FilesPageElement.SharingDialog.collaboratorsDialog().getCollaboratorExpirationInfo(
       user
     )