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.

Sign up for GitHub

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

Jump to bottom

Rename collaborator/s to person/people #4070

Merged
merged 2 commits into from
Sep 15, 2020
Merged

Rename collaborator/s to person/people #4070

merged 2 commits into from
Sep 15, 2020

Conversation

PVince81
Copy link
Contributor

Description

Rename "collaborator" to "person".
Rename "collaborators" to "people".
Rename "Add Collaborator" to "share".

Related Issue

Part 1 and part 4a of owncloud/product#231

Motivation and Context

How Has This Been Tested?

  • test environment:
  • test case 1:
  • test case 2:
  • ...

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • ...

@PVince81 PVince81 self-assigned this Sep 15, 2020
@update-docs
Copy link

update-docs bot commented Sep 15, 2020

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@PVince81 PVince81 force-pushed the wording-changes-collaborator-to-people branch from 0f23075 to f499574 Compare September 15, 2020 10:07
@PVince81
Copy link
Contributor Author

changelog added.

let's hope tests passed as I had to change some labels there

@PVince81
Copy link
Contributor Author

this will take a bit longer... seems some sidebar tab selectors are based on the text given in Gherkin scenarios

LukasHirt
LukasHirt approved these changes Sep 15, 2020
View reviewed changes
Copy link
Contributor

@LukasHirt LukasHirt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just two small comments. More questions then requested changes 😉

apps/files/src/components/Collaborators/Collaborator.vue Outdated Show resolved Hide resolved
apps/files/src/components/Collaborators/NewCollaborator.vue Outdated Show resolved Hide resolved
@phil-davis
Copy link
Contributor

this will take a bit longer... seems some sidebar tab selectors are based on the text given in Gherkin scenarios

Steps like this seem to get confused:

    When the user switches to "collaborators" tab in details panel using the webUI
    Then the "collaborators" details panel should be visible

But I don't immediately see which thing changed that breaks that test code.

@PVince81
Copy link
Contributor Author

@phil-davis already on it.

the first row uses a selector that hard-codes the panel name into the selector.
the second row uses an if statement...

I have a local fix, testing now... then will push.

Adjustments + tests for collaborator to people renaming
2ab90a9 
Adjust wording further.
Fix tests that were passing in the given tab name as string to the
selector.
@PVince81
Copy link
Contributor Author

I've fixed the tests, they passed locally. Let's see.

@PVince81 PVince81 merged commit 2003024 into master Sep 15, 2020
@delete-merged-branch delete-merged-branch bot deleted the wording-changes-collaborator-to-people branch September 15, 2020 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LukasHirt LukasHirt LukasHirt approved these changes

@kulmann kulmann Awaiting requested review from kulmann

Assignees

@PVince81 PVince81

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@PVince81 @phil-davis @LukasHirt