Skip to content

GitLab

T
tangled
Commit 638640a4 authored by Rainhard Findling's avatar Rainhard Findling Committed by Commit Bot
Browse files
Options

Safety check UI: strings update 

* Aligns the safety check UI with the latest strings in the mocks.
* Adds links to the dynamic UI strings of safety check.

Bug: 1015841
Change-Id: I32c94c9b454c089aac5bfb1751e314e9911bb228
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2085371Reviewed-by: default avatardpapad <dpapad@chromium.org>
Commit-Queue: Rainhard Findling <rainhard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747144}
parent 4cc89038
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 51 deletions
chrome/app/settings_chromium_strings.grdp
View file @ 638640a4
...@@ -89,32 +89,29 @@ ...@@ -89,32 +89,29 @@
<message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE" desc="This text describes what the safety check is. (It's an area of the Settings page where users can quickly check whether their safety-related settings are fully protecting them.)"> <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE" desc="This text describes what the safety check is. (It's an area of the Settings page where users can quickly check whether their safety-related settings are fully protecting them.)">
Chromium can help keep you safe from data breaches, bad extensions, and more Chromium can help keep you safe from data breaches, bad extensions, and more
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_DISABLED_BY_ADMIN" desc="This text describles that updates are managed by the administrator.">
Your administrator manages Chromium updates
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED_OFFLINE" desc="This text describles that Chrome cannot check for updates because there currently is no internet connection."> <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED_OFFLINE" desc="This text describles that Chrome cannot check for updates because there currently is no internet connection.">
Chromium can't check for updates. Try checking your internet connection. Chromium can't check for updates. Try checking your internet connection.
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED" desc="This text describles that Chrome cannot update due to an unknown error."> <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED" desc="This text describles that Chrome cannot update due to an unknown error.">
Chromium didn't update, something went wrong. Fix Chrome update problems and failed updates. Chromium didn't update, something went wrong. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Fix Chromium update problems and failed updates.<ph name="END_LINK">&lt;/a&gt;</ph>
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_OFFLINE" desc="This text points out that the password check cannot run due to not having interent connection."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_OFFLINE" desc="This text points out that the password check cannot run due to not having interent connection.">
Chromium can't check your passwords. Try checking your internet connection. Chromium can't check your passwords. Try checking your internet connection.
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_NO_PASSWORDS" desc="This text points out that password check cannot run due to the user not having saved passwords.">
No saved passwords. Chromium can check your passwords when you save them in your Google Account.
</message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SIGNED_OUT" desc="This text points out that the password check can only run when the user is signed in."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SIGNED_OUT" desc="This text points out that the password check can only run when the user is signed in.">
Chromium can check your passwords when you sign in with your Google Account Chromium can't check your passwords because you're not signed in
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_QUOTA_LIMIT" desc="This text points out that the passwords check cannot run and that the user should try again tomorrow."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_QUOTA_LIMIT" desc="This text points out that the passwords check cannot run and that the user should try again tomorrow.">
Chromium can't check your passwords. Try again tomorrow. Chromium can't check all your passwords. Try again after 24 hours.
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_TOO_MANY_PASSWORDS" desc="This text points out that the password check cannot run due to the user having too many saved passwords."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_TOO_MANY_PASSWORDS" desc="This text points out that the password check cannot run due to the user having too many saved passwords.">
Chromium can't check your passwords because there are too many Chromium can't check your passwords because there are too many
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_ERROR" desc="This text points out that the passwords check encountered an unknown error."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_ERROR" desc="This text points out that the passwords check encountered an unknown error.">
Chromium can't check your passwords Chromium can't check your passwords. Try again later.
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_ERROR" desc="This text describles that safety check could not check extensions for an unkown reason.">
Chromium can't check your extensions. Try again later.
</message> </message>
<!-- People Page --> <!-- People Page -->
......
chrome/app/settings_google_chrome_strings.grdp
View file @ 638640a4
...@@ -89,32 +89,29 @@ ...@@ -89,32 +89,29 @@
<message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE" desc="This text describes what the safety check is. (It's an area of the Settings page where users can quickly check whether their safety-related settings are fully protecting them.)"> <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE" desc="This text describes what the safety check is. (It's an area of the Settings page where users can quickly check whether their safety-related settings are fully protecting them.)">
Chrome can help keep you safe from data breaches, bad extensions, and more Chrome can help keep you safe from data breaches, bad extensions, and more
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_DISABLED_BY_ADMIN" desc="This text describles that updates are managed by the administrator.">
Your administrator manages Chrome updates
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED_OFFLINE" desc="This text describles that Chrome cannot check for updates because there currently is no internet connection."> <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED_OFFLINE" desc="This text describles that Chrome cannot check for updates because there currently is no internet connection.">
Chrome can't check for updates. Try checking your internet connection. Chrome can't check for updates. Try checking your internet connection.
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED" desc="This text describles that Chrome cannot update due to an unknown error."> <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED" desc="This text describles that Chrome cannot update due to an unknown error.">
Chrome didn't update, something went wrong. Fix Chrome update problems and failed updates. Chrome didn't update, something went wrong. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Fix Chrome update problems and failed updates.<ph name="END_LINK">&lt;/a&gt;</ph>
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_OFFLINE" desc="This text points out that the password check cannot run due to not having interent connection."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_OFFLINE" desc="This text points out that the password check cannot run due to not having interent connection.">
Chrome can't check your passwords. Try checking your internet connection. Chrome can't check your passwords. Try checking your internet connection.
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_NO_PASSWORDS" desc="This text points out that password check cannot run due to the user not having saved passwords.">
No saved passwords. Chrome can check your passwords when you save them in your Google Account.
</message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SIGNED_OUT" desc="This text points out that the password check can only run when the user is signed in."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SIGNED_OUT" desc="This text points out that the password check can only run when the user is signed in.">
Chrome can check your passwords when you sign in with your Google Account Chrome can't check your passwords because you're not signed in
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_QUOTA_LIMIT" desc="This text points out that the passwords check cannot run and that the user should try again tomorrow."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_QUOTA_LIMIT" desc="This text points out that the passwords check cannot run and that the user should try again tomorrow.">
Chrome can't check your passwords. Try again tomorrow. Chrome can't check all your passwords. Try again after 24 hours.
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_TOO_MANY_PASSWORDS" desc="This text points out that the password check cannot run due to the user having too many saved passwords."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_TOO_MANY_PASSWORDS" desc="This text points out that the password check cannot run due to the user having too many saved passwords.">
Chrome can't check your passwords because there are too many Chrome can't check your passwords because there are too many
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_ERROR" desc="This text points out that the passwords check encountered an unknown error."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_ERROR" desc="This text points out that the passwords check encountered an unknown error.">
Chrome can't check your passwords Chrome can't check your passwords. Try again later.
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_ERROR" desc="This text describles that safety check could not check extensions for an unkown reason.">
Chrome can't check your extensions. Try again later.
</message> </message>
<!-- People Page --> <!-- People Page -->
......
chrome/app/settings_strings.grdp
View file @ 638640a4
...@@ -1507,7 +1507,7 @@ ...@@ -1507,7 +1507,7 @@
<message name="IDS_SETTINGS_SAFETY_CHECK_SECTION_TITLE" desc="'Safety check' is a noun phrase (sentence case). 'Safety check' refers to an area of the Settings page where users can quickly check whether their safety-related settings are fully protecting them."> <message name="IDS_SETTINGS_SAFETY_CHECK_SECTION_TITLE" desc="'Safety check' is a noun phrase (sentence case). 'Safety check' refers to an area of the Settings page where users can quickly check whether their safety-related settings are fully protecting them.">
Safety check Safety check
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_CHECKING" desc="A message shown on the top of the safety check feature, explaining to the user that the safety check is currently running."> <message name="IDS_SETTINGS_SAFETY_CHECK_RUNNING" desc="A message shown for the safety check or its subelements when the corresponding checks are currently performed.">
Running... Running...
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER" desc="A message shown on the top of the safety check feature, explaining to the user that it ran a moment ago."> <message name="IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER" desc="A message shown on the top of the safety check feature, explaining to the user that it ran a moment ago.">
...@@ -1519,6 +1519,12 @@ ...@@ -1519,6 +1519,12 @@
<message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL" desc="'Updates' is an element in safety check that shows the update status of Chrome."> <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL" desc="'Updates' is an element in safety check that shows the update status of Chrome.">
Updates Updates
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_DISABLED_BY_ADMIN" desc="This text describles that updates are managed by the administrator.">
Updates are managed by your <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>administrator<ph name="END_LINK">&lt;/a&gt;</ph>
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_PRIMARY_LABEL" desc="'Passwords' is an element in safety check that allows users to check for their passwords being compromised.">
Passwords
</message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SAFE" desc="This text points out that the safety check password check has not found any compromised passwords."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SAFE" desc="This text points out that the safety check password check has not found any compromised passwords.">
No compromised passwords found No compromised passwords found
</message> </message>
...@@ -1528,6 +1534,9 @@ ...@@ -1528,6 +1534,9 @@
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_COMPROMISED_PLURAL" desc="This text points out that the safety check password check has found multiple compromised passwords. The placeholder will be a numeral."> <message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_COMPROMISED_PLURAL" desc="This text points out that the safety check password check has found multiple compromised passwords. The placeholder will be a numeral.">
<ph name="NUM_PASSWORDS">$1<ex>42</ex></ph> compromised passwords <ph name="NUM_PASSWORDS">$1<ex>42</ex></ph> compromised passwords
</message> </message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_NO_PASSWORDS" desc="This text points out that password check cannot run due to the user not having saved passwords.">
No saved passwords
</message>
<message name="IDS_SAFETY_CHECK_PASSWORDS_BUTTON_COMPROMISED" desc="This button allows users to change their compromised passwords."> <message name="IDS_SAFETY_CHECK_PASSWORDS_BUTTON_COMPROMISED" desc="This button allows users to change their compromised passwords.">
Change passwords Change passwords
</message> </message>
...@@ -1541,7 +1550,7 @@ ...@@ -1541,7 +1550,7 @@
Safe Browsing is off. To stay safe on the web, turn it on. Safe Browsing is off. To stay safe on the web, turn it on.
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_DISABLED_BY_ADMIN" desc="This text points out that Safe Browsing is disabled by an administrator."> <message name="IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_DISABLED_BY_ADMIN" desc="This text points out that Safe Browsing is disabled by an administrator.">
Your administrator has turned off Safe Browsing Your <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>administrator<ph name="END_LINK">&lt;/a&gt;</ph> has turned off Safe Browsing
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_DISABLED_BY_EXTENSION" desc="This text points out that Safe Browsing is disabled by an extension."> <message name="IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_DISABLED_BY_EXTENSION" desc="This text points out that Safe Browsing is disabled by an extension.">
An extension has turned off Safe Browsing An extension has turned off Safe Browsing
...@@ -1552,9 +1561,6 @@ ...@@ -1552,9 +1561,6 @@
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_PRIMARY_LABEL" desc="'Extensions' is an element in safety check that shows the safety check status of installed extensions."> <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_PRIMARY_LABEL" desc="'Extensions' is an element in safety check that shows the safety check status of installed extensions.">
Extensions Extensions
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_ERROR" desc="This text describles that safety check could not check extensions for an unkown reason.">
The extension status could not be checked, something went wrong. Try again later.
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_SAFE" desc="This text describles that the user is protected from bad extensions."> <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_SAFE" desc="This text describles that the user is protected from bad extensions.">
You're protected from bad extensions You're protected from bad extensions
</message> </message>
...@@ -1565,10 +1571,10 @@ ...@@ -1565,10 +1571,10 @@
You turned <ph name="NUM_EXTENSIONS">$1<ex>42</ex></ph> bad extensions back on You turned <ph name="NUM_EXTENSIONS">$1<ex>42</ex></ph> bad extensions back on
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_OFF_SINGULAR" desc="This text describles that bad extensions have been disabled."> <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_OFF_SINGULAR" desc="This text describles that bad extensions have been disabled.">
1 bad extension has been disabled. You can also remove it. 1 bad extension is off. You can also remove it.
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_OFF_PLURAL" desc="This text describles that bad extensions have been disabled."> <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_BAD_EXTENSIONS_OFF_PLURAL" desc="This text describles that bad extensions have been disabled.">
<ph name="NUM_EXTENSIONS">$1<ex>42</ex></ph> bad extensions have been disabled. You can also remove them. <ph name="NUM_EXTENSIONS">$1<ex>42</ex></ph> bad extensions are off. You can also remove them.
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_MANAGED_BY_ADMIN_SINGULAR" desc="This text describles that an administrator has turned bad extensions back on."> <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_SUB_LABEL_MANAGED_BY_ADMIN_SINGULAR" desc="This text describles that an administrator has turned bad extensions back on.">
Your administrator turned 1 bad extension back on Your administrator turned 1 bad extension back on
......
chrome/browser/resources/settings/safety_check_page/safety_check_page.html
View file @ 638640a4
...@@ -82,8 +82,8 @@ ...@@ -82,8 +82,8 @@
</iron-icon> </iron-icon>
<div class="start settings-box-text"> <div class="start settings-box-text">
<div>$i18n{safetyCheckUpdatesPrimaryLabel}</div> <div>$i18n{safetyCheckUpdatesPrimaryLabel}</div>
<div class="secondary" no-search> <div class="secondary" no-search
[[getUpdatesSubLabelText_(updatesStatus_)]] inner-h-t-m-l="[[getUpdatesSubLabelText_(updatesStatus_)]]">
</div> </div>
</div> </div>
<template is="dom-if" <template is="dom-if"
...@@ -108,8 +108,8 @@ ...@@ -108,8 +108,8 @@
</iron-icon> </iron-icon>
<div class="start settings-box-text"> <div class="start settings-box-text">
<div>$i18n{passwords}</div> <div>$i18n{passwords}</div>
<div class="secondary" no-search> <div class="secondary" no-search
[[getPasswordsSubLabelText_(passwordsStatus_)]] inner-h-t-m-l="[[getPasswordsSubLabelText_(passwordsStatus_)]]">
</div> </div>
</div> </div>
<template is="dom-if" <template is="dom-if"
...@@ -129,8 +129,8 @@ ...@@ -129,8 +129,8 @@
</iron-icon> </iron-icon>
<div class="start settings-box-text"> <div class="start settings-box-text">
<div>$i18n{safeBrowsingSectionLabel}</div> <div>$i18n{safeBrowsingSectionLabel}</div>
<div class="secondary" no-search> <div class="secondary" no-search
[[getSafeBrowsingSubLabelText_(safeBrowsingStatus_)]] inner-h-t-m-l="[[getSafeBrowsingSubLabelText_(safeBrowsingStatus_)]]">
</div> </div>
</div> </div>
<template is="dom-if" <template is="dom-if"
...@@ -155,8 +155,8 @@ ...@@ -155,8 +155,8 @@
</iron-icon> </iron-icon>
<div class="start settings-box-text"> <div class="start settings-box-text">
<div>$i18n{safetyCheckExtensionsPrimaryLabel}</div> <div>$i18n{safetyCheckExtensionsPrimaryLabel}</div>
<div class="secondary" no-search> <div class="secondary" no-search
[[getExtensionsSubLabelText_(extensionsStatus_)]] inner-h-t-m-l="[[getExtensionsSubLabelText_(extensionsStatus_)]]">
</div> </div>
</div> </div>
<template is="dom-if" <template is="dom-if"
......
chrome/browser/resources/settings/safety_check_page/safety_check_page.js
View file @ 638640a4
...@@ -271,7 +271,7 @@ Polymer({ ...@@ -271,7 +271,7 @@ Polymer({
case ParentStatus.BEFORE: case ParentStatus.BEFORE:
return this.i18n('safetyCheckParentPrimaryLabelBefore'); return this.i18n('safetyCheckParentPrimaryLabelBefore');
case ParentStatus.CHECKING: case ParentStatus.CHECKING:
return this.i18n('safetyCheckParentPrimaryLabelChecking'); return this.i18n('safetyCheckRunning');
case ParentStatus.AFTER: case ParentStatus.AFTER:
return this.i18n('safetyCheckParentPrimaryLabelAfter'); return this.i18n('safetyCheckParentPrimaryLabelAfter');
default: default:
...@@ -369,7 +369,7 @@ Polymer({ ...@@ -369,7 +369,7 @@ Polymer({
getUpdatesSubLabelText_: function() { getUpdatesSubLabelText_: function() {
switch (this.updatesStatus_) { switch (this.updatesStatus_) {
case settings.SafetyCheckUpdatesStatus.CHECKING: case settings.SafetyCheckUpdatesStatus.CHECKING:
return ''; return this.i18n('safetyCheckRunning');
case settings.SafetyCheckUpdatesStatus.UPDATED: case settings.SafetyCheckUpdatesStatus.UPDATED:
return this.i18n('aboutUpgradeUpToDate'); return this.i18n('aboutUpgradeUpToDate');
case settings.SafetyCheckUpdatesStatus.UPDATING: case settings.SafetyCheckUpdatesStatus.UPDATING:
...@@ -377,11 +377,11 @@ Polymer({ ...@@ -377,11 +377,11 @@ Polymer({
case settings.SafetyCheckUpdatesStatus.RELAUNCH: case settings.SafetyCheckUpdatesStatus.RELAUNCH:
return this.i18n('aboutUpgradeRelaunch'); return this.i18n('aboutUpgradeRelaunch');
case settings.SafetyCheckUpdatesStatus.DISABLED_BY_ADMIN: case settings.SafetyCheckUpdatesStatus.DISABLED_BY_ADMIN:
return this.i18n('safetyCheckUpdatesSubLabelDisabledByAdmin'); return this.i18nAdvanced('safetyCheckUpdatesSubLabelDisabledByAdmin');
case settings.SafetyCheckUpdatesStatus.FAILED_OFFLINE: case settings.SafetyCheckUpdatesStatus.FAILED_OFFLINE:
return this.i18n('safetyCheckUpdatesSubLabelFailedOffline'); return this.i18n('safetyCheckUpdatesSubLabelFailedOffline');
case settings.SafetyCheckUpdatesStatus.FAILED: case settings.SafetyCheckUpdatesStatus.FAILED:
return this.i18n('safetyCheckUpdatesSubLabelFailed'); return this.i18nAdvanced('safetyCheckUpdatesSubLabelFailed');
default: default:
assertNotReached(); assertNotReached();
} }
...@@ -408,7 +408,7 @@ Polymer({ ...@@ -408,7 +408,7 @@ Polymer({
getPasswordsSubLabelText_: function() { getPasswordsSubLabelText_: function() {
switch (this.passwordsStatus_) { switch (this.passwordsStatus_) {
case settings.SafetyCheckPasswordsStatus.CHECKING: case settings.SafetyCheckPasswordsStatus.CHECKING:
return ''; return this.i18n('safetyCheckRunning');
case settings.SafetyCheckPasswordsStatus.SAFE: case settings.SafetyCheckPasswordsStatus.SAFE:
return this.i18n('safetyCheckPasswordsSubLabelSafe'); return this.i18n('safetyCheckPasswordsSubLabelSafe');
case settings.SafetyCheckPasswordsStatus.COMPROMISED: case settings.SafetyCheckPasswordsStatus.COMPROMISED:
...@@ -570,7 +570,8 @@ Polymer({ ...@@ -570,7 +570,8 @@ Polymer({
case settings.SafetyCheckSafeBrowsingStatus.DISABLED: case settings.SafetyCheckSafeBrowsingStatus.DISABLED:
return this.i18n('safetyCheckSafeBrowsingSubLabelDisabled'); return this.i18n('safetyCheckSafeBrowsingSubLabelDisabled');
case settings.SafetyCheckSafeBrowsingStatus.DISABLED_BY_ADMIN: case settings.SafetyCheckSafeBrowsingStatus.DISABLED_BY_ADMIN:
return this.i18n('safetyCheckSafeBrowsingSubLabelDisabledByAdmin'); return this.i18nAdvanced(
'safetyCheckSafeBrowsingSubLabelDisabledByAdmin');
case settings.SafetyCheckSafeBrowsingStatus.DISABLED_BY_EXTENSION: case settings.SafetyCheckSafeBrowsingStatus.DISABLED_BY_EXTENSION:
return this.i18n('safetyCheckSafeBrowsingSubLabelDisabledByExtension'); return this.i18n('safetyCheckSafeBrowsingSubLabelDisabledByExtension');
default: default:
...@@ -715,7 +716,7 @@ Polymer({ ...@@ -715,7 +716,7 @@ Polymer({
getExtensionsSubLabelText_: function() { getExtensionsSubLabelText_: function() {
switch (this.extensionsStatus_) { switch (this.extensionsStatus_) {
case settings.SafetyCheckExtensionsStatus.CHECKING: case settings.SafetyCheckExtensionsStatus.CHECKING:
return ''; return this.i18n('safetyCheckRunning');
case settings.SafetyCheckExtensionsStatus.ERROR: case settings.SafetyCheckExtensionsStatus.ERROR:
return this.i18n('safetyCheckExtensionsSubLabelError'); return this.i18n('safetyCheckExtensionsSubLabelError');
case settings.SafetyCheckExtensionsStatus.SAFE: case settings.SafetyCheckExtensionsStatus.SAFE:
......
chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
View file @ 638640a4
...@@ -1115,19 +1115,14 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, ...@@ -1115,19 +1115,14 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
{"safetyCheckSectionTitle", IDS_SETTINGS_SAFETY_CHECK_SECTION_TITLE}, {"safetyCheckSectionTitle", IDS_SETTINGS_SAFETY_CHECK_SECTION_TITLE},
{"safetyCheckParentPrimaryLabelBefore", {"safetyCheckParentPrimaryLabelBefore",
IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE}, IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE},
{"safetyCheckParentPrimaryLabelChecking", {"safetyCheckRunning", IDS_SETTINGS_SAFETY_CHECK_RUNNING},
IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_CHECKING},
{"safetyCheckParentPrimaryLabelAfter", {"safetyCheckParentPrimaryLabelAfter",
IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER}, IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER},
{"safetyCheckParentButton", IDS_SETTINGS_SAFETY_CHECK_PARENT_BUTTON}, {"safetyCheckParentButton", IDS_SETTINGS_SAFETY_CHECK_PARENT_BUTTON},
{"safetyCheckUpdatesPrimaryLabel", {"safetyCheckUpdatesPrimaryLabel",
IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL}, IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL},
{"safetyCheckUpdatesSubLabelDisabledByAdmin",
IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_DISABLED_BY_ADMIN},
{"safetyCheckUpdatesSubLabelFailedOffline", {"safetyCheckUpdatesSubLabelFailedOffline",
IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED_OFFLINE}, IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED_OFFLINE},
{"safetyCheckUpdatesSubLabelFailed",
IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED},
{"safetyCheckPasswordsSubLabelSafe", {"safetyCheckPasswordsSubLabelSafe",
IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SAFE}, IDS_SAFETY_CHECK_PASSWORDS_SUB_LABEL_SAFE},
{"safetyCheckPasswordsSubLabelCompromisedSingular", {"safetyCheckPasswordsSubLabelCompromisedSingular",
...@@ -1154,8 +1149,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, ...@@ -1154,8 +1149,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_ENABLED}, IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_ENABLED},
{"safetyCheckSafeBrowsingSubLabelDisabled", {"safetyCheckSafeBrowsingSubLabelDisabled",
IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_DISABLED}, IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_DISABLED},
{"safetyCheckSafeBrowsingSubLabelDisabledByAdmin",
IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_DISABLED_BY_ADMIN},
{"safetyCheckSafeBrowsingSubLabelDisabledByExtension", {"safetyCheckSafeBrowsingSubLabelDisabledByExtension",
IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_DISABLED_BY_EXTENSION}, IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_DISABLED_BY_EXTENSION},
{"safetyCheckSafeBrowsingButton", {"safetyCheckSafeBrowsingButton",
...@@ -1205,6 +1198,21 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, ...@@ -1205,6 +1198,21 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
base::FeatureList::IsEnabled(omnibox::kDocumentProvider)); base::FeatureList::IsEnabled(omnibox::kDocumentProvider));
html_source->AddBoolean("showSecureDnsSetting", html_source->AddBoolean("showSecureDnsSetting",
features::kDnsOverHttpsShowUiParam.Get()); features::kDnsOverHttpsShowUiParam.Get());
html_source->AddString(
"safetyCheckUpdatesSubLabelFailed",
l10n_util::GetStringFUTF16(
IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_FAILED,
base::ASCIIToUTF16(chrome::kChromeFixUpdateProblems)));
html_source->AddString(
"safetyCheckUpdatesSubLabelDisabledByAdmin",
l10n_util::GetStringFUTF16(
IDS_SETTINGS_SAFETY_CHECK_UPDATES_SUB_LABEL_DISABLED_BY_ADMIN,
base::ASCIIToUTF16(chrome::kWhoIsMyAdministratorHelpURL)));
html_source->AddString(
"safetyCheckSafeBrowsingSubLabelDisabledByAdmin",
l10n_util::GetStringFUTF16(
IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_SUB_LABEL_DISABLED_BY_ADMIN,
base::ASCIIToUTF16(chrome::kWhoIsMyAdministratorHelpURL)));
AddPersonalizationOptionsStrings(html_source); AddPersonalizationOptionsStrings(html_source);
} }
......
chrome/common/url_constants.cc
View file @ 638640a4
...@@ -35,6 +35,12 @@ const char kChooserUsbOverviewURL[] = ...@@ -35,6 +35,12 @@ const char kChooserUsbOverviewURL[] =
const char kChromeBetaForumURL[] = const char kChromeBetaForumURL[] =
"https://support.google.com/chrome/?p=beta_forum"; "https://support.google.com/chrome/?p=beta_forum";
// TODO(https://crbug.com/1015841): Replace answer number with p-link once the
// p-link has been created.
// https://bugs.chromium.org/p/chromium/issues/detail?id=679462
const char kChromeFixUpdateProblems[] =
"https://support.google.com/chrome/answer/111996";
// TODO: replace w/link after marketing provides it. // TODO: replace w/link after marketing provides it.
const char kChromeReleaseNotesURL[] = const char kChromeReleaseNotesURL[] =
"https://www.google.com/chromebook/whatsnew/embedded/"; "https://www.google.com/chromebook/whatsnew/embedded/";
...@@ -264,6 +270,12 @@ const char kUpgradeHelpCenterBaseURL[] = ...@@ -264,6 +270,12 @@ const char kUpgradeHelpCenterBaseURL[] =
"https://support.google.com/installer/?product=" "https://support.google.com/installer/?product="
"{8A69D345-D564-463c-AFF1-A69D9E530F96}&error="; "{8A69D345-D564-463c-AFF1-A69D9E530F96}&error=";
// TODO(https://crbug.com/1015841): Replace answer number with p-link once the
// p-link has been created.
// https://bugs.chromium.org/p/chromium/issues/detail?id=679462
const char kWhoIsMyAdministratorHelpURL[] =
"https://support.google.com/accounts/answer/6208960";
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
const char kAndroidAppScheme[] = "android-app"; const char kAndroidAppScheme[] = "android-app";
#endif #endif
......
chrome/common/url_constants.h
View file @ 638640a4
...@@ -56,6 +56,9 @@ extern const char kChooserUsbOverviewURL[]; ...@@ -56,6 +56,9 @@ extern const char kChooserUsbOverviewURL[];
// Link to the forum for Chrome Beta. // Link to the forum for Chrome Beta.
extern const char kChromeBetaForumURL[]; extern const char kChromeBetaForumURL[];
// The URL for the help center article to fix Chrome update problems.
extern const char kChromeFixUpdateProblems[];
// Link to the release notes page managed by marketing. // Link to the release notes page managed by marketing.
extern const char kChromeReleaseNotesURL[]; extern const char kChromeReleaseNotesURL[];
...@@ -219,6 +222,9 @@ extern const char kSyncLearnMoreURL[]; ...@@ -219,6 +222,9 @@ extern const char kSyncLearnMoreURL[];
extern const char kUpgradeHelpCenterBaseURL[]; extern const char kUpgradeHelpCenterBaseURL[];
// Help center URL for who the account administrator is.
extern const char kWhoIsMyAdministratorHelpURL[];
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
extern const char kAndroidAppScheme[]; extern const char kAndroidAppScheme[];
#endif #endif
...@@ -275,7 +281,6 @@ extern const char kEolNotificationURL[]; ...@@ -275,7 +281,6 @@ extern const char kEolNotificationURL[];
// The URL for providing more information about Google nameservers. // The URL for providing more information about Google nameservers.
extern const char kGoogleNameserversLearnMoreURL[]; extern const char kGoogleNameserversLearnMoreURL[];
// The URL for the "learn more" link for Instant Tethering. // The URL for the "learn more" link for Instant Tethering.
extern const char kInstantTetheringLearnMoreURL[]; extern const char kInstantTetheringLearnMoreURL[];
......
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