Make client language gender-neutral and more clear #4667

claucambra · 2022-06-23T09:14:42Z

Closes #4644

nimishavijay

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

src/gui/creds/webflowcredentials.cpp

src/libsync/syncresult.cpp

src/gui/folderman.cpp

src/libsync/syncresult.cpp

src/gui/userstatusselectormodel.cpp

src/gui/creds/oauth.cpp

nimishavijay

Super nice! :) 🚀

codecov · 2022-06-24T11:01:04Z

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 · 2022-06-24T11:54:49Z

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

claucambra · 2022-06-24T12:08:43Z

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

I rebased manually now

Signed-off-by: Claudio Cambra <[email protected]>

nextcloud-desktop-bot · 2022-06-24T12:42:15Z

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 · 2022-06-24T13:04:36Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

23.8% Coverage
0.0% Duplication

jancborchardt

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

jancborchardt · 2022-07-10T21:58:42Z

src/cmd/cmd.cpp

@@ -125,7 +125,7 @@ class EchoDisabler
 QString queryPassword(const QString &user)
 {
    EchoDisabler disabler;
-    std::cout << "Password for user " << qPrintable(user) << ": ";
+    std::cout << "Password for account with username " << qPrintable(user) << ": ";


Just "Password for account " is enough.

jancborchardt · 2022-07-10T21:59:34Z

src/cmd/cmd.cpp

@@ -383,7 +383,7 @@ int main(int argc, char **argv)

    if (options.interactive) {
        if (user.isEmpty()) {
-            std::cout << "Please enter user name: ";
+            std::cout << "Please enter username: ";


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

jancborchardt · 2022-07-10T22:00:14Z

src/gui/authenticationdialog.cpp

@@ -34,7 +34,7 @@ AuthenticationDialog::AuthenticationDialog(const QString &realm, const QString &
    lay->addWidget(label);

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


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

jancborchardt · 2022-07-10T22:00:24Z

src/gui/creds/httpcredentialsgui.cpp

@@ -96,7 +96,7 @@ void HttpCredentialsGui::showDialog()
 {
    QString msg = tr("Please enter %1 password:<br>"
                     "<br>"
-                     "User: %2<br>"
+                     "Username: %2<br>"


"Account: " here too

jancborchardt · 2022-07-10T22:01:05Z

src/gui/wizard/owncloudadvancedsetuppage.ui

@@ -90,7 +90,7 @@
          </font>
         </property>
         <property name="text">
-          <string>User name</string>
+          <string>Username</string>


Account name

jancborchardt · 2022-07-10T22:01:25Z

src/libsync/clientsideencryption.cpp

@@ -1240,7 +1240,7 @@ bool ClientSideEncryption::newMnemonicGenerated() const
 void ClientSideEncryption::decryptPrivateKey(const AccountPtr &account, const QByteArray &key) {
    QString msg = tr("Please enter your end to end encryption passphrase:<br>"
                     "<br>"
-                     "User: %2<br>"
+                     "Username: %2<br>"


Account name

claucambra · 2022-07-11T09:53:05Z

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

Not sure how to proceed, thoughts?

claucambra requested review from mgallien, camilasan and allexzander June 23, 2022 09:14

claucambra self-assigned this Jun 23, 2022

camilasan requested review from jancborchardt and nimishavijay June 23, 2022 11:21

nimishavijay requested changes Jun 23, 2022

View reviewed changes

claucambra force-pushed the bugfix/gender-neutral-wording branch 2 times, most recently from 165b658 to ee1caac Compare June 24, 2022 09:46

mgallien approved these changes Jun 24, 2022

View reviewed changes

claucambra force-pushed the bugfix/gender-neutral-wording branch from e1e8a52 to d244740 Compare June 24, 2022 10:20

nimishavijay approved these changes Jun 24, 2022

View reviewed changes

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

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

Make client language gender-neutral and more clear

b7c2e16

Signed-off-by: Claudio Cambra <[email protected]>

claucambra force-pushed the bugfix/gender-neutral-wording branch from d3a274a to b7c2e16 Compare June 24, 2022 12:36

mgallien merged commit 1f6eed6 into master Jun 24, 2022

mgallien deleted the bugfix/gender-neutral-wording branch June 24, 2022 13:23

mgallien added this to the 3.6.0 milestone Jun 24, 2022

jancborchardt reviewed Jul 10, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make client language gender-neutral and more clear #4667

Make client language gender-neutral and more clear #4667

claucambra commented Jun 23, 2022

nimishavijay left a comment

nimishavijay left a comment

codecov bot commented Jun 24, 2022 •

edited

Loading

mgallien commented Jun 24, 2022

claucambra commented Jun 24, 2022

nextcloud-desktop-bot commented Jun 24, 2022

sonarqubecloud bot commented Jun 24, 2022

jancborchardt left a comment •

edited

Loading

jancborchardt Jul 10, 2022

jancborchardt Jul 10, 2022

jancborchardt Jul 10, 2022

jancborchardt Jul 10, 2022

jancborchardt Jul 10, 2022

jancborchardt Jul 10, 2022

claucambra commented Jul 11, 2022

Make client language gender-neutral and more clear #4667

Make client language gender-neutral and more clear #4667

Conversation

claucambra commented Jun 23, 2022

nimishavijay left a comment

Choose a reason for hiding this comment

nimishavijay left a comment

Choose a reason for hiding this comment

codecov bot commented Jun 24, 2022 • edited Loading

Codecov Report

mgallien commented Jun 24, 2022

claucambra commented Jun 24, 2022

nextcloud-desktop-bot commented Jun 24, 2022

sonarqubecloud bot commented Jun 24, 2022

jancborchardt left a comment • edited Loading

Choose a reason for hiding this comment

jancborchardt Jul 10, 2022

Choose a reason for hiding this comment

jancborchardt Jul 10, 2022

Choose a reason for hiding this comment

jancborchardt Jul 10, 2022

Choose a reason for hiding this comment

jancborchardt Jul 10, 2022

Choose a reason for hiding this comment

jancborchardt Jul 10, 2022

Choose a reason for hiding this comment

jancborchardt Jul 10, 2022

Choose a reason for hiding this comment

claucambra commented Jul 11, 2022

codecov bot commented Jun 24, 2022 •

edited

Loading

jancborchardt left a comment •

edited

Loading