Commit 2a1ff9be authored by harrisonsean's avatar harrisonsean Committed by Commit Bot

[iOS][Safety Check] Add new default strings for Safety Check

Adds new default strings to safety check so that rows don't resize.

Running state keeps the same detail text as the previous state.

Bug: 1078782
Change-Id: Iffa246a5baca2b2cf8051e87cc10a1d6d80f6c2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2443729Reviewed-by: default avatarMartin Šrámek <msramek@chromium.org>
Commit-Queue: Sean Harrison <harrisonsean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812977}
parent 2af0583b
...@@ -325,6 +325,9 @@ locale. The strings in this file are specific to iOS. ...@@ -325,6 +325,9 @@ locale. The strings in this file are specific to iOS.
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PAGE_HEADER" desc="Informational header at the top of the safety check page"> <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PAGE_HEADER" desc="Informational header at the top of the safety check page">
Chromium can help keep you safe from data breaches, unsafe websites and more. Chromium can help keep you safe from data breaches, unsafe websites and more.
</message> </message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION" desc="Description text on the update element describing what the update check does.">
Keep Chromium up to date
</message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_CHANNEL_CANARY_DESC" desc="Description text for when the app is on Canary and unable to run the check"> <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_CHANNEL_CANARY_DESC" desc="Description text for when the app is on Canary and unable to run the check">
Not supported on Chromium Canary Not supported on Chromium Canary
</message> </message>
......
...@@ -325,6 +325,9 @@ locale. The strings in this file are specific to iOS. ...@@ -325,6 +325,9 @@ locale. The strings in this file are specific to iOS.
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PAGE_HEADER" desc="Informational header at the top of the safety check page"> <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PAGE_HEADER" desc="Informational header at the top of the safety check page">
Chrome can help keep you safe from data breaches, unsafe websites and more. Chrome can help keep you safe from data breaches, unsafe websites and more.
</message> </message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION" desc="Description text on the update element describing what the update check does.">
Keep Chrome up to date
</message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_CHANNEL_CANARY_DESC" desc="Description text for when the app is on Canary and unable to run the check"> <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_CHANNEL_CANARY_DESC" desc="Description text for when the app is on Canary and unable to run the check">
Not supported on Chrome Canary Not supported on Chrome Canary
</message> </message>
......
...@@ -1795,9 +1795,15 @@ Follow the steps below: ...@@ -1795,9 +1795,15 @@ Follow the steps below:
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PASSWORDS_TITLE" desc="Title for the passwords element of safety check" meaning="Row title to access the passowrd check subpage if a probelm is found with user's saved passwords [CHAR_LIMIT=20]"> <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PASSWORDS_TITLE" desc="Title for the passwords element of safety check" meaning="Row title to access the passowrd check subpage if a probelm is found with user's saved passwords [CHAR_LIMIT=20]">
Passwords Passwords
</message> </message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_PASSWORDS_DESCRIPTION" desc="Description text on the password element describing what the password check does.">
Check for compromised passwords
</message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_TITLE" desc="Title for the safe browsing element of safety check" meaning="Row title to display the user's safe browsing status [CHAR_LIMIT=20]"> <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_TITLE" desc="Title for the safe browsing element of safety check" meaning="Row title to display the user's safe browsing status [CHAR_LIMIT=20]">
Safe Browsing Safe Browsing
</message> </message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DESCRIPTION" desc="Description text on the Safe Browsing element describing what the Safe Browsing check does.">
Stay protected from dangerous websites
</message>
<message name="IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DISABLED_DESC" desc="Detail text for the Safe Browsing check if the user has Safe Browsing disabled"> <message name="IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DISABLED_DESC" desc="Detail text for the Safe Browsing check if the user has Safe Browsing disabled">
Off - Not recommended Off - Not recommended
</message> </message>
......
0935cf19143c008554f328bad3990520df8be283
\ No newline at end of file
...@@ -978,7 +978,6 @@ typedef NS_ENUM(NSInteger, CheckStartStates) { ...@@ -978,7 +978,6 @@ typedef NS_ENUM(NSInteger, CheckStartStates) {
self.updateCheckItem.enabled = YES; self.updateCheckItem.enabled = YES;
self.updateCheckItem.indicatorHidden = YES; self.updateCheckItem.indicatorHidden = YES;
self.updateCheckItem.infoButtonHidden = YES; self.updateCheckItem.infoButtonHidden = YES;
self.updateCheckItem.detailText = nil;
self.updateCheckItem.trailingImage = nil; self.updateCheckItem.trailingImage = nil;
self.updateCheckItem.trailingImageTintColor = nil; self.updateCheckItem.trailingImageTintColor = nil;
self.updateCheckItem.accessoryType = UITableViewCellAccessoryNone; self.updateCheckItem.accessoryType = UITableViewCellAccessoryNone;
...@@ -987,8 +986,11 @@ typedef NS_ENUM(NSInteger, CheckStartStates) { ...@@ -987,8 +986,11 @@ typedef NS_ENUM(NSInteger, CheckStartStates) {
[self resetsCheckStartItemIfNeeded]; [self resetsCheckStartItemIfNeeded];
switch (self.updateCheckRowState) { switch (self.updateCheckRowState) {
case UpdateCheckRowStateDefault: case UpdateCheckRowStateDefault: {
self.updateCheckItem.detailText =
GetNSString(IDS_IOS_SETTINGS_SAFETY_CHECK_UPDATES_DESCRIPTION);
break; break;
}
case UpdateCheckRowStateRunning: { case UpdateCheckRowStateRunning: {
self.updateCheckItem.indicatorHidden = NO; self.updateCheckItem.indicatorHidden = NO;
break; break;
...@@ -1063,7 +1065,6 @@ typedef NS_ENUM(NSInteger, CheckStartStates) { ...@@ -1063,7 +1065,6 @@ typedef NS_ENUM(NSInteger, CheckStartStates) {
self.passwordCheckItem.enabled = YES; self.passwordCheckItem.enabled = YES;
self.passwordCheckItem.indicatorHidden = YES; self.passwordCheckItem.indicatorHidden = YES;
self.passwordCheckItem.infoButtonHidden = YES; self.passwordCheckItem.infoButtonHidden = YES;
self.passwordCheckItem.detailText = nil;
self.passwordCheckItem.trailingImage = nil; self.passwordCheckItem.trailingImage = nil;
self.passwordCheckItem.trailingImageTintColor = nil; self.passwordCheckItem.trailingImageTintColor = nil;
self.passwordCheckItem.accessoryType = UITableViewCellAccessoryNone; self.passwordCheckItem.accessoryType = UITableViewCellAccessoryNone;
...@@ -1072,8 +1073,11 @@ typedef NS_ENUM(NSInteger, CheckStartStates) { ...@@ -1072,8 +1073,11 @@ typedef NS_ENUM(NSInteger, CheckStartStates) {
[self resetsCheckStartItemIfNeeded]; [self resetsCheckStartItemIfNeeded];
switch (self.passwordCheckRowState) { switch (self.passwordCheckRowState) {
case PasswordCheckRowStateDefault: case PasswordCheckRowStateDefault: {
self.passwordCheckItem.detailText =
GetNSString(IDS_IOS_SETTINGS_SAFETY_CHECK_PASSWORDS_DESCRIPTION);
break; break;
}
case PasswordCheckRowStateRunning: { case PasswordCheckRowStateRunning: {
self.passwordCheckItem.indicatorHidden = NO; self.passwordCheckItem.indicatorHidden = NO;
break; break;
...@@ -1123,7 +1127,6 @@ typedef NS_ENUM(NSInteger, CheckStartStates) { ...@@ -1123,7 +1127,6 @@ typedef NS_ENUM(NSInteger, CheckStartStates) {
self.safeBrowsingCheckItem.enabled = YES; self.safeBrowsingCheckItem.enabled = YES;
self.safeBrowsingCheckItem.indicatorHidden = YES; self.safeBrowsingCheckItem.indicatorHidden = YES;
self.safeBrowsingCheckItem.infoButtonHidden = YES; self.safeBrowsingCheckItem.infoButtonHidden = YES;
self.safeBrowsingCheckItem.detailText = nil;
self.safeBrowsingCheckItem.trailingImage = nil; self.safeBrowsingCheckItem.trailingImage = nil;
self.safeBrowsingCheckItem.trailingImageTintColor = nil; self.safeBrowsingCheckItem.trailingImageTintColor = nil;
self.safeBrowsingCheckItem.accessoryType = UITableViewCellAccessoryNone; self.safeBrowsingCheckItem.accessoryType = UITableViewCellAccessoryNone;
...@@ -1132,8 +1135,11 @@ typedef NS_ENUM(NSInteger, CheckStartStates) { ...@@ -1132,8 +1135,11 @@ typedef NS_ENUM(NSInteger, CheckStartStates) {
[self resetsCheckStartItemIfNeeded]; [self resetsCheckStartItemIfNeeded];
switch (self.safeBrowsingCheckRowState) { switch (self.safeBrowsingCheckRowState) {
case SafeBrowsingCheckRowStateDefault: case SafeBrowsingCheckRowStateDefault: {
self.safeBrowsingCheckItem.detailText =
GetNSString(IDS_IOS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_DESCRIPTION);
break; break;
}
case SafeBrowsingCheckRowStateRunning: { case SafeBrowsingCheckRowStateRunning: {
self.safeBrowsingCheckItem.indicatorHidden = NO; self.safeBrowsingCheckItem.indicatorHidden = NO;
break; break;
......
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