[iOS] Update the string for the delete all data button confirmation
dialog.
The current string has nested plural which is not supported by google
translation team go/plurals#nesting-plurals. This UX change is confirmed by the PMs.
Bug:394047369
Change-Id: Ibe44f6f5e3e3fdf592a48c2af57984d83540c7ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6234524
Reviewed-by: Ernesto Izquierdo Clua <eic@google.com>
Reviewed-by: Tommy Martino <tmartino@chromium.org>
Commit-Queue: Xu Li <mxlg@google.com>
Reviewed-by: Alexis Hétu <sugoi@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1416554}
NOKEYCHECK=True
GitOrigin-RevId: 26ac90c274e061c4cdec23439e5cc8435f3713b9
diff --git a/chrome/app/strings/ios_strings.grd b/chrome/app/strings/ios_strings.grd
index 144ee35..e8dffc3 100644
--- a/chrome/app/strings/ios_strings.grd
+++ b/chrome/app/strings/ios_strings.grd
@@ -4096,19 +4096,16 @@
From Google Password Manager, including passwords and passkeys
</message>
<message name="IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION" desc="Description of the confirmation alert when the user tap delete all data button. The 'list of sites & apps' corresponds to the data shown in the 'Never Saved' section in the home page of Password Manager. [iOS only]">
- {password, plural,
- =0 {{passkey, plural,
- =0 {You don't have any saved passwords or passkeys, but you can delete the list of sites & apps you chose to never save sign-in info. Any account you created for sites and apps won't be deleted.}
- =1 {You are about to delete 1 passkey and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.}
- other {You are about to delete {passkey} passkeys and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.}}}
- =1 {{passkey, plural,
- =0 {You are about to delete 1 password and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.}
- =1 {You are about to delete 1 password, 1 passkey, and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.}
- other {You are about to delete 1 password, {passkey} passkeys, and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.}}}
- other {{passkey, plural,
- =0 {You are about to delete {password} passwords and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.}
- =1 {You are about to delete {password} passwords, 1 passkey, and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.}
- other {You are about to delete {password} passwords, {passkey} passkeys, and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.}}}}
+ You are about to delete {password_count} passwords, {passkey_count} passkeys, and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.
+ </message>
+ <message name="IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_BLOCK_SITES_ONLY" desc="Description of the confirmation alert when the user tap delete all data button and only blocked sites data were saved. The 'list of sites & apps' corresponds to the data shown in the 'Never Saved' section in the home page of Password Manager. [iOS only]">
+ You don't have any saved passwords or passkeys, but you can delete the list of sites & apps you chose to never save sign-in info. Any account you created for sites and apps won't be deleted.
+ </message>
+ <message name="IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_NO_PASSKEYS" desc="Description of the confirmation alert when the user tap delete all data button and no passkeys were saved. The 'list of sites & apps' corresponds to the data shown in the 'Never Saved' section in the home page of Password Manager. [iOS only]">
+ You are about to delete {password_count} passwords and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.
+ </message>
+ <message name="IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_NO_PASSWORDS" desc="Description of the confirmation alert when the user tap delete all data button and no passwords were saved. The 'list of sites & apps' corresponds to the data shown in the 'Never Saved' section in the home page of Password Manager. [iOS only]">
+ You are about to delete {passkey_count} passkeys and the list of sites & apps you chose to never save sign-in into. Any account you created for sites and apps won't be deleted.
</message>
<message name="IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_TITLE" desc="Title of the confirmation alert when the user tap delete all data button. [iOS only]">
You're about to delete your Google Password Manager data
diff --git a/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION.png.sha1 b/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION.png.sha1
index 2964777..a6508ee 100644
--- a/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION.png.sha1
+++ b/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION.png.sha1
@@ -1 +1 @@
-45c5932b7f5000b2e5b5778d8a4d03fe08f09539
\ No newline at end of file
+0affac8ee9965e61c592d9e04f4630221946c368
\ No newline at end of file
diff --git a/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_BLOCK_SITES_ONLY.png.sha1 b/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_BLOCK_SITES_ONLY.png.sha1
new file mode 100644
index 0000000..399779e
--- /dev/null
+++ b/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_BLOCK_SITES_ONLY.png.sha1
@@ -0,0 +1 @@
+d97ed9f928449c2dd69fecb4ac69f3a0fe56b248
\ No newline at end of file
diff --git a/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_NO_PASSKEYS.png.sha1 b/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_NO_PASSKEYS.png.sha1
new file mode 100644
index 0000000..a47d418
--- /dev/null
+++ b/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_NO_PASSKEYS.png.sha1
@@ -0,0 +1 @@
+4777e2907cdd4f7de236614f072ea38d2e768ba9
\ No newline at end of file
diff --git a/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_NO_PASSWORDS.png.sha1 b/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_NO_PASSWORDS.png.sha1
new file mode 100644
index 0000000..f331282
--- /dev/null
+++ b/chrome/app/strings/ios_strings_grd/IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_NO_PASSWORDS.png.sha1
@@ -0,0 +1 @@
+9fbbcf6788110da20f3165f023cd84f54fb7e2d6
\ No newline at end of file
diff --git a/chrome/browser/settings/ui_bundled/password/password_settings/password_settings_coordinator.mm b/chrome/browser/settings/ui_bundled/password/password_settings/password_settings_coordinator.mm
index 21f9ec3..0ca823f 100644
--- a/chrome/browser/settings/ui_bundled/password/password_settings/password_settings_coordinator.mm
+++ b/chrome/browser/settings/ui_bundled/password/password_settings/password_settings_coordinator.mm
@@ -287,11 +287,30 @@
base::RecordAction(base::UserMetricsAction(kDeleteAllSavedDataButtonClicked));
CredentialCounts counts = [_mediator passwordAndPasskeyCounts];
- NSString* alertDescription = base::SysUTF16ToNSString(
- base::i18n::MessageFormatter::FormatWithNamedArgs(
- l10n_util::GetStringUTF16(
- IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION),
- "password", counts.passwordCounts, "passkey", counts.passkeyCounts));
+ NSString* alertDescription;
+ if (counts.passwordCounts == 0 && counts.passkeyCounts == 0) {
+ alertDescription = l10n_util::GetNSString(
+ IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_BLOCK_SITES_ONLY);
+ } else if (counts.passwordCounts == 0) {
+ alertDescription = base::SysUTF16ToNSString(
+ base::i18n::MessageFormatter::FormatWithNamedArgs(
+ l10n_util::GetStringUTF16(
+ IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_NO_PASSWORDS),
+ "passkey_count", counts.passkeyCounts));
+ } else if (counts.passkeyCounts == 0) {
+ alertDescription = base::SysUTF16ToNSString(
+ base::i18n::MessageFormatter::FormatWithNamedArgs(
+ l10n_util::GetStringUTF16(
+ IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION_NO_PASSKEYS),
+ "password_count", counts.passwordCounts));
+ } else {
+ alertDescription = base::SysUTF16ToNSString(
+ base::i18n::MessageFormatter::FormatWithNamedArgs(
+ l10n_util::GetStringUTF16(
+ IDS_IOS_PASSWORD_SETTINGS_DELETE_ALL_CREDENTIALS_DESCRIPTION),
+ "password_count", counts.passwordCounts, "passkey_count",
+ counts.passkeyCounts));
+ }
UIAlertController* deletionConfirmation = [UIAlertController
alertControllerWithTitle:
