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

Use gender-neutral wording where possible #10982

Merged
merged 2 commits into from Jan 7, 2017
Merged

Use gender-neutral wording where possible #10982

merged 2 commits into from Jan 7, 2017

Conversation

x3ro
Copy link
Contributor

@x3ro x3ro commented Dec 7, 2016

My first PR draft to tackle #10753. I essentially scanned through git grep -iE "[^a-z](his/he/she/her)[^a-z]" to see what was change-worthy, and used "singular they" to remove the gender-specificity. Let me know if this is what you were aiming at @mattab, or if I missed something obvious.

@mattab mattab added this to the 3.0.1 milestone Dec 8, 2016
@mattab
Copy link
Member

mattab commented Dec 9, 2016

@x3ro Looks good! Thanks for the PR. Some tests are failing because report documentation changed, but don't worry we can also update them afterwards. Is this finished or do you find more cases in the UI? Could you maybe try also in our submodules that may contain such strings. our submodules are init with git submodule update --init

@michaelnordmeyer
Copy link

Looks like the work is not finished: "they visits"

@@ -62,11 +62,11 @@
"ColumnNbActions": "Actions",
"ColumnNbActionsDocumentation": "The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.",
"ColumnNbUniqVisitors": "Unique visitors",
"ColumnNbUniqVisitorsDocumentation": "The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.",
"ColumnNbUniqVisitorsDocumentation": "The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visits the website multiple times a day.",
Copy link
Member

Choose a reason for hiding this comment

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

should be "they visit"

"ColumnNbUsers": "Users",
"ColumnNbUsersDocumentation": "The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').",
"ColumnNbVisits": "Visits",
"ColumnNbVisitsDocumentation": "If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.",
"ColumnNbVisitsDocumentation": "If a visitor comes to your website for the first time or if they visits a page more than 30 minutes after their last page view, this will be recorded as a new visit.",
Copy link
Member

Choose a reason for hiding this comment

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

should be "they visit"

@x3ro
Copy link
Contributor Author

x3ro commented Dec 26, 2016

Whoops, thanks. Fixed now.

@mattab mattab merged commit 0fc30b6 into matomo-org:3.x-dev Jan 7, 2017
@mattab
Copy link
Member

mattab commented Jan 7, 2017

Thanks @x3ro for this PR! If you like to contribute to other parts of Piwik please check out our Priority Backlog

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants