Rename collaborator/s to person/people

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)

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() {

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.

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

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: {

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) {

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

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
+

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: {

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: {

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`
  )
 })