Skip to content

Make client language gender-neutral and more clear#4667

Merged
mgallien merged 1 commit into
masterfrom
bugfix/gender-neutral-wording
Jun 24, 2022
Merged

Make client language gender-neutral and more clear#4667
mgallien merged 1 commit into
masterfrom
bugfix/gender-neutral-wording

Conversation

@claucambra

@claucambra claucambra commented Jun 23, 2022

Copy link
Copy Markdown
Collaborator

Closes #4644

@claucambra claucambra self-assigned this Jun 23, 2022
nimishavijay
nimishavijay requested changes Jun 23, 2022
View reviewed changes

@nimishavijay nimishavijay left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Great improvements 👍🏽 I suggested some changes you can review :)

Comment thread src/gui/creds/webflowcredentials.cpp
Comment thread src/libsync/syncresult.cpp Outdated
Comment thread src/gui/folderman.cpp Outdated
Comment thread src/libsync/syncresult.cpp Outdated
Comment thread src/gui/userstatusselectormodel.cpp Outdated
Comment thread src/gui/creds/oauth.cpp Outdated
Comment thread src/gui/creds/oauth.cpp Outdated
@claucambra claucambra force-pushed the bugfix/gender-neutral-wording branch 2 times, most recently from 165b658 to ee1caac Compare June 24, 2022 09:46
@claucambra claucambra force-pushed the bugfix/gender-neutral-wording branch from e1e8a52 to d244740 Compare June 24, 2022 10:20
nimishavijay
nimishavijay approved these changes Jun 24, 2022
View reviewed changes

@nimishavijay nimishavijay left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Super nice! :) 🚀

@claucambra claucambra force-pushed the bugfix/gender-neutral-wording branch from d244740 to 2eb36d3 Compare June 24, 2022 10:34
@codecov

codecov Bot commented Jun 24, 2022 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #4667 (5337d4b) into master (d23305f) will decrease coverage by 0.01%.
The diff coverage is n/a.

❗ Current head 5337d4b differs from pull request most recent head b7c2e16. Consider uploading reports for the commit b7c2e16 to get more accurate results

@@            Coverage Diff             @@
##           master    #4667      +/-   ##
==========================================
- Coverage   56.44%   56.42%   -0.02%     
==========================================
  Files         138      138              
  Lines       17071    17071              
==========================================
- Hits         9635     9632       -3     
- Misses       7436     7439       +3
Impacted Files Coverage Δ
src/libsync/discovery.cpp 84.56% <0.00%> (-0.30%) ⬇️

@mgallien

mgallien commented Jun 24, 2022

Copy link
Copy Markdown
Collaborator

@claucambra there is a conflict, I cannot rebase via github

@claucambra claucambra force-pushed the bugfix/gender-neutral-wording branch from 2eb36d3 to d3a274a Compare June 24, 2022 12:08
@claucambra

claucambra commented Jun 24, 2022

Copy link
Copy Markdown
Collaborator Author

@claucambra there is a conflict, I cannot rebase via github

I rebased manually now

@claucambra
Make client language gender-neutral and more clear
b7c2e16 
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
@claucambra claucambra force-pushed the bugfix/gender-neutral-wording branch from d3a274a to b7c2e16 Compare June 24, 2022 12:36
@nextcloud-desktop-bot

nextcloud-desktop-bot commented Jun 24, 2022

Copy link
Copy Markdown

AppImage file: Nextcloud-PR-4667-b7c2e16aa96c8e4fabc9549be941cc7a9bd3f911-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarqubecloud

sonarqubecloud Bot commented Jun 24, 2022

Copy link
Copy Markdown

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

23.8% 23.8% Coverage
0.0% 0.0% Duplication

@mgallien mgallien merged commit 1f6eed6 into master Jun 24, 2022
@mgallien mgallien deleted the bugfix/gender-neutral-wording branch June 24, 2022 13:23
@mgallien mgallien added this to the 3.6.0 milestone Jun 24, 2022
jancborchardt
jancborchardt reviewed Jul 10, 2022
View reviewed changes

@jancborchardt jancborchardt left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Sorry for the late review, found some stray "user" wording we shouldn’t use anymore. Let me know if some of that is wrongly reviewed @claucambra

Comment thread src/cmd/cmd.cpp
{
EchoDisabler disabler;
std::cout << "Password for user " << qPrintable(user) << ": ";
std::cout << "Password for account with username " << qPrintable(user) << ": ";

@jancborchardt jancborchardt Jul 10, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just "Password for account " is enough.

Comment thread src/cmd/cmd.cpp
if (options.interactive) {
if (user.isEmpty()) {
std::cout << "Please enter user name: ";
std::cout << "Please enter username: ";

@jancborchardt jancborchardt Jul 10, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is basically the same though. ;) We should not have the word "user" anywhere, thus "Please enter account name: " would be a proper fix.

Comment thread src/gui/authenticationdialog.cpp

auto *form = new QFormLayout;
form->addRow(tr("&User:"), _user);
form->addRow(tr("&Username:"), _user);

@jancborchardt jancborchardt Jul 10, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Not sure this is actual wording, but "Account" would be correct here too.

Comment thread src/gui/creds/httpcredentialsgui.cpp
QString msg = tr("Please enter %1 password:<br>"
"<br>"
"User: %2<br>"
"Username: %2<br>"

@jancborchardt jancborchardt Jul 10, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

"Account: " here too

Comment thread src/gui/wizard/owncloudadvancedsetuppage.ui
</property>
<property name="text">
<string>User name</string>
<string>Username</string>

@jancborchardt jancborchardt Jul 10, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Account name

Comment thread src/libsync/clientsideencryption.cpp
QString msg = tr("Please enter your end to end encryption passphrase:<br>"
"<br>"
"User: %2<br>"
"Username: %2<br>"

@jancborchardt jancborchardt Jul 10, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Account name

@claucambra

claucambra commented Jul 11, 2022

Copy link
Copy Markdown
Collaborator Author

@jancborchardt I think a lot of these comments miss the fact that we use "account" in several places of the client to mean username@server.com , and replacing "username" with "account" risks creating confusion -- perfect example is your suggested change here

Not sure how to proceed, thoughts?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jancborchardt jancborchardt jancborchardt left review comments
@mgallien mgallien mgallien approved these changes
@nimishavijay nimishavijay nimishavijay approved these changes
@camilasan camilasan Awaiting requested review from camilasan camilasan is a code owner
@allexzander allexzander Awaiting requested review from allexzander

Assignees

@claucambra claucambra

Labels

None yet

Projects

None yet

Milestone

3.6.0

Development

Successfully merging this pull request may close these issues.

Gender-neutral language

5 participants

@claucambra @mgallien @nextcloud-desktop-bot @jancborchardt @nimishavijay