Commit 1361f5f5 authored by Rainhard Findling's avatar Rainhard Findling Committed by Commit Bot

Password check string fine tuning

* For quota limit, replaces "Try again tomorrow" with "Try again after
  24 hours", as "tomorrow" is too soon for some time zones. 24 hours
  works in any case.
* For generic error, adds "Try again later", as there are some
  errors where retrying would help (and otherwise it sounds like
  users can't do anything in any of those cases).
* Per our guidelines, removes the period from the end of strings
  if it's a single sentence.

Bug: 1067175
Change-Id: Ide3ac2b2f4da1acefc85fc6934ef2767850cf17f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2133973
Commit-Queue: Rainhard Findling <rainhard@chromium.org>
Reviewed-by: default avatarVasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756524}
parent e58ca201
...@@ -339,19 +339,19 @@ ...@@ -339,19 +339,19 @@
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. Try checking your internet connection. <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. Try checking your internet connection.
</message> </message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_SIGNED_OUT" desc="Error message when the password check can't be completed because the user is not signed in."> <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_SIGNED_OUT" desc="Error message when the password check can't be completed because the user is not signed in.">
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can check your passwords when you sign in with your Google Account. <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can check your passwords when you sign in with your Google Account
</message> </message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_NO_PASSWORDS" desc="Error message when the password check can't be completed since no passwords could be checked."> <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_NO_PASSWORDS" desc="Error message when the password check can't be completed since no passwords could be checked.">
No saved passwords. <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can check your passwords when you save them. No saved passwords. <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can check your passwords when you save them.
</message> </message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT_GOOGLE_ACCOUNT" desc="Error message when the password check can't be completed since the user hit the quota limit, but the user is able to check their passwords in their Google account."> <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT_GOOGLE_ACCOUNT" desc="Error message when the password check can't be completed since the user hit the quota limit, but the user is able to check their passwords in their Google account.">
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. Try again tomorrow or <ph name="BEGIN_LINK">&lt;a href="$2" target="_blank"&gt;</ph>check passwords in your Google Account<ph name="END_LINK">&lt;/a&gt;</ph>. <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. Try again after 24 hours or <ph name="BEGIN_LINK">&lt;a href="$2" target="_blank"&gt;</ph>check passwords in your Google Account<ph name="END_LINK">&lt;/a&gt;</ph>.
</message> </message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT" desc="Error message when the password check can't be completed since the user hit the quota limit."> <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT" desc="Error message when the password check can't be completed since the user hit the quota limit.">
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. Try again tomorrow. <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. Try again after 24 hours.
</message> </message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC" desc="Error message when the password check can't be completed for an unspecified reason."> <message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC" desc="Error message when the password check can't be completed for an unspecified reason.">
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. Try again later.
</message> </message>
<message name="IDS_SETTINGS_COMPROMISED_PASSWORDS_COUNT" desc="Number of compromised passwords present in the database"> <message name="IDS_SETTINGS_COMPROMISED_PASSWORDS_COUNT" desc="Number of compromised passwords present in the database">
{COUNT, plural, {COUNT, plural,
......
4de6e19b4772e8e130b87952ad8fcc10b79054e7 c9510ef8ee4d1eecf4a4f7b73bc3157636ee7071
\ No newline at end of file \ No newline at end of file
7685361448310ce06f9b704483d1ddd16721ee62 277e9976f88cca3ec849ff40ed227ac5691986d4
\ No newline at end of file \ No newline at end of file
5276cc79879bda188d7e8de493be26e482e77ac8 982891d3945486166a871200c49eb3e24aa9a4e3
\ No newline at end of file \ No newline at end of file
25b0c6ed74bd2313c5b7f954a7d34a0ec46cf2d7 4b655b3b8b7ef7cfb5161c7d949e4a4dc8cad1f4
\ No newline at end of file \ No newline at end of file
...@@ -730,7 +730,9 @@ TEST_F(SafetyCheckHandlerTest, CheckPasswords_Error) { ...@@ -730,7 +730,9 @@ TEST_F(SafetyCheckHandlerTest, CheckPasswords_Error) {
kPasswords, kPasswords,
static_cast<int>(SafetyCheckHandler::PasswordsStatus::kError)); static_cast<int>(SafetyCheckHandler::PasswordsStatus::kError));
ASSERT_TRUE(event); ASSERT_TRUE(event);
VerifyDisplayString(event, "Browser can't check your passwords."); VerifyDisplayString(event,
"Browser can't check your passwords. Try again "
"later.");
histogram_tester_.ExpectBucketCount( histogram_tester_.ExpectBucketCount(
"Settings.SafetyCheck.PasswordsResult", "Settings.SafetyCheck.PasswordsResult",
SafetyCheckHandler::PasswordsStatus::kError, 1); SafetyCheckHandler::PasswordsStatus::kError, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment