Skip to content

Fix #2874 shouldn't use the words "success" and "failure" #4000

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

Closed
wants to merge 18 commits into from

Conversation

isdl03
Copy link

@isdl03 isdl03 commented Oct 28, 2020

Description (required)

Fixes #2874

What changes did you make and why?
Replaced the following three strings :
1)Login success!
You are logged in!

Wallpaper set successfully!
Wallpaper set!

Sending Thanks: Success
Thanks Sent!

Tests performed (required)

Tested on Pixel 3 with API level 28.

Need help? See https://support.google.com/android/answer/9075928

@codecov-io
Copy link

codecov-io commented Oct 28, 2020

Codecov Report

Merging #4000 (cc71341) into master (8e9b39f) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #4000   +/-   ##
=========================================
  Coverage     10.58%   10.58%           
  Complexity      476      476           
=========================================
  Files           343      343           
  Lines         12906    12906           
  Branches       1008     1008           
=========================================
  Hits           1366     1366           
  Misses        11472    11472           
  Partials         68       68           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8e9b39f...cc71341. Read the comment docs.

Copy link
Member

@sivaraam sivaraam left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! I've left one inline comment. Also, to completely address #2874 we would've to replace all instances of the usage mentioned there. It looks like there are still some strings left even after this change. A few instances are,

<string name="send_thank_success_message">Successfully sent thanks to %1$s</string>

<string name="send_thank_failure_title">Sending Thanks: Failure</string>

<string name="send_thank_failure_message">Failed to send thanks %1$s</string>

So, it would be great if you could fix those too.

Also, make sure to properly update the "Fixes #INSERT_ISSUE_NUMBER_HERE" template in the PR description to mention #2874

@@ -50,7 +50,7 @@
<string name="signup">Sign up</string>
<string name="logging_in_title">Logging in</string>
<string name="logging_in_message">Please wait…</string>
<string name="login_success">Login success!</string>
<string name="login_success">You are logged in!</string>
Copy link
Member

Choose a reason for hiding this comment

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

I believe "Logged in!" would be shorter and equally precise here.

@sivaraam sivaraam mentioned this pull request Dec 22, 2020
@arishtajain14
Copy link

@sivaraam We have made the changes as requested. Kindly review the same.

@misaochan misaochan requested a review from sivaraam January 14, 2021 15:39
@sivaraam
Copy link
Member

@sivaraam We have made the changes as requested. Kindly review the same.

Apologies for the delay. I was supposed to get around to this long ago but it slipped. Currently, I'm in lack of time due to a medical emergency in my family. I'll be sure to review when I find the time. We'll see if someone else could beat me to it, instead :)

Copy link
Collaborator

@neslihanturan neslihanturan left a comment

Choose a reason for hiding this comment

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

Hey @isdl03 , thanks for changes. I have added some minor suggestions. Please do not hesitate to say if you have doubts about my reviews, considering I am not a native speaker.

Also, plase fix conflicts.

<string name="upload_paused_notification_title">Uploading %1$s paused</string>
<string name="upload_failed_notification_subtitle">Tap to view</string>
<string name="upload_paused_notification_subtitle">Tap to view</string>
<string name="title_activity_contributions">My Recent Uploads</string>
<string name="contribution_state_queued">Queued</string>
<string name="contribution_state_failed">Failed</string>
<string name="contribution_state_failed">Error detected</string>
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think failed fits better for this specific usage. Error detected does not indicate that upload process failed, ie. we may have an error for adding categories (so error detected) and upload may be done. So, "error detected" is not necessarily mean "upload failed".

Suggestions are welcome, I am not the most native Ensglish speaker I know.

<string name="login_failed_blocked">Sorry, this user has been blocked on Commons</string>
<string name="login_failed_2fa_needed">You must provide your two factor authentication code.</string>
<string name="login_failed_generic">Login failed</string>
<string name="login_failed_generic">Error logging in</string>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is it legal to say "Error logging in" gramatically?

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure about whether it's legal or not (I'm not a native speaker, too 🙂). But I could certainly say that "Error logging in doesn't sound any better than "Login failed".

<string name="delete_helper_show_deletion_message_if">Nominated %1$s for deletion.</string>
<string name="delete_helper_show_deletion_title_failed">Failed</string>
<string name="delete_helper_show_deletion_title_failed">Title could not be deleted</string>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please use "Cannot be deleted" or "Could not be deleted" instead. Do not include title here.

@neslihanturan neslihanturan changed the title Replaced three strings Fix #2874 shouldn't use the words "success" and "failure" Feb 15, 2021
@neslihanturan
Copy link
Collaborator

Hey @isdl03 , how is the things going with this issue? Please do not hesitate to ask if you need further explanation. Currently minor reviews and conflict fixes should be done:)

@isdl03
Copy link
Author

isdl03 commented Feb 23, 2021 via email

@nicolas-raoul
Copy link
Member

Would you mind solving the conflicts? :-)

@isdl03
Copy link
Author

isdl03 commented Jun 19, 2021

@nicolas-raoul I have made the changes as requested. Kindly review the same.

@nicolas-raoul
Copy link
Member

Oops, seems that there is already another conflict... sorry but would you mind solving again? Thanks!

@nicolas-raoul
Copy link
Member

You can either rebase on master, or just pull from master. Please let me know when you are done :-)

@isdl03
Copy link
Author

isdl03 commented Jun 21, 2021

@nicolas-raoul I have resolved the conflicts.

Copy link
Collaborator

@neslihanturan neslihanturan left a comment

Choose a reason for hiding this comment

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

Some irrelevant changes exists

<string name="login_failed_throttled">Too many unsuccessful attempts. Please try again in a few minutes.</string>
<string name="login_failed_blocked">Sorry, this user has been blocked on Commons</string>
<string name="login_failed_2fa_needed">You must provide your two factor authentication code.</string>
<string name="login_failed_generic">Login failed</string>
<string name="share_upload_button">Upload</string>
<string name="multiple_share_base_title">Name this set</string>
<string name="add_set_name_toast">Please provide a name for this set</string>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Seems like some strings are removed in this PR and this is irrelevant with avoiding usage of "failure/success"

@neslihanturan
Copy link
Collaborator

hey @isdl03 , are you still interested?:)

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