Commit 31a99865 authored by James Cook's avatar James Cook Committed by Commit Bot

cros sync: Update feature description label in OS settings

* Add real localized text.
* Make text grey via "secondary" text styling.
* Retitle "Turn on" and "Turn off" buttons per latest UX spec.

https://screenshot.googleplex.com/RzQAQfbvwqC

Bug: 1013466
Change-Id: Ibae11cf543479c2038252525282bf6c4511a11f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2108098
Commit-Queue: James Cook <jamescook@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751788}
parent fbae3b69
...@@ -155,11 +155,14 @@ ...@@ -155,11 +155,14 @@
<message name="IDS_OS_SETTINGS_SYNC_PAGE_TITLE" desc="Settings sub-page title for sync."> <message name="IDS_OS_SETTINGS_SYNC_PAGE_TITLE" desc="Settings sub-page title for sync.">
Sync your settings Sync your settings
</message> </message>
<message name="IDS_OS_SETTINGS_SYNC_TURN_ON" desc="Button label for turning on sync. Sync is capitalized because it is the proper name of a feature."> <message name="IDS_OS_SETTINGS_SYNC_TURN_ON" desc="Button label for turning on synchronization of settings across Chrome OS devices.">
Turn on Sync Turn on
</message>
<message name="IDS_OS_SETTINGS_SYNC_TURN_OFF" desc="Button label for turning off synchronization of settings across Chrome OS devices.">
Turn off
</message> </message>
<message name="IDS_OS_SETTINGS_SYNC_TURN_OFF" desc="Button label for turning off sync. Sync is capitalized because it is the proper name of a feature."> <message name="IDS_OS_SETTINGS_SYNC_FEATURE_LABEL" desc="Label describing the OS sync feature.">
Turn off Sync Your apps and settings will sync across all Chrome OS devices where you are signed in with your Google account. For browser sync options, go to<ph name="LINK_BEGIN">&lt;a&gt;</ph>Chrome settings<ph name="LINK_END">&lt;/a&gt;</ph>.
</message> </message>
<message name="IDS_OS_SETTINGS_SYNC_APPS_CHECKBOX_LABEL" desc="Label for the checkbox which enables syncing of apps across devices."> <message name="IDS_OS_SETTINGS_SYNC_APPS_CHECKBOX_LABEL" desc="Label for the checkbox which enables syncing of apps across devices.">
Apps Apps
......
b408bd6da5e3360cd76f954d1ad558549358da4b
\ No newline at end of file
63f8ef2875ef3f7525c1eb2512c24e64ce2676c2 b408bd6da5e3360cd76f954d1ad558549358da4b
\ No newline at end of file \ No newline at end of file
e5cee8ca272e5b43525bfdcbf3b465e04e70b2b6 680fcf18dcf05ea6ce6ae1c9f835d734e7fc1e60
\ No newline at end of file \ No newline at end of file
...@@ -160,6 +160,7 @@ js_library("os_sync_controls") { ...@@ -160,6 +160,7 @@ js_library("os_sync_controls") {
":os_sync_browser_proxy", ":os_sync_browser_proxy",
"..:metrics_recorder", "..:metrics_recorder",
"../../:router", "../../:router",
"../localized_link",
"//ui/webui/resources/cr_elements/cr_toggle:cr_toggle", "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle",
"//ui/webui/resources/js:assert", "//ui/webui/resources/js:assert",
"//ui/webui/resources/js:web_ui_listener_behavior", "//ui/webui/resources/js:web_ui_listener_behavior",
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="../../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="../localized_link/localized_link.html">
<link rel="import" href="../metrics_recorder.html"> <link rel="import" href="../metrics_recorder.html">
<link rel="import" href="../os_route.html"> <link rel="import" href="../os_route.html">
<link rel="import" href="os_sync_browser_proxy.html"> <link rel="import" href="os_sync_browser_proxy.html">
...@@ -86,8 +87,11 @@ ...@@ -86,8 +87,11 @@
</cr-button> </cr-button>
</div> </div>
<div id="featureLabel" class="settings-box" aria-hidden="true"> <div id="featureLabel" class="settings-box">
Chrome OS sync feature description PLACEHOLDER <settings-localized-link class="secondary"
localized-string="$i18n{osSyncFeatureLabel}"
link-url="$i18n{browserSettingsSyncSetupUrl}">
</settings-localized-link>
</div> </div>
<div class="settings-box"> <div class="settings-box">
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/feature_list.h" #include "base/feature_list.h"
#include "base/i18n/number_formatting.h" #include "base/i18n/number_formatting.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
...@@ -591,8 +592,13 @@ void AddSyncControlsStrings(content::WebUIDataSource* html_source) { ...@@ -591,8 +592,13 @@ void AddSyncControlsStrings(content::WebUIDataSource* html_source) {
IDS_SETTINGS_WIFI_CONFIGURATIONS_CHECKBOX_LABEL}, IDS_SETTINGS_WIFI_CONFIGURATIONS_CHECKBOX_LABEL},
{"osSyncAppsCheckboxLabel", IDS_OS_SETTINGS_SYNC_APPS_CHECKBOX_LABEL}, {"osSyncAppsCheckboxLabel", IDS_OS_SETTINGS_SYNC_APPS_CHECKBOX_LABEL},
{"osSyncTurnOn", IDS_OS_SETTINGS_SYNC_TURN_ON}, {"osSyncTurnOn", IDS_OS_SETTINGS_SYNC_TURN_ON},
{"osSyncFeatureLabel", IDS_OS_SETTINGS_SYNC_FEATURE_LABEL},
}; };
AddLocalizedStringsBulk(html_source, kLocalizedStrings); AddLocalizedStringsBulk(html_source, kLocalizedStrings);
html_source->AddString(
"browserSettingsSyncSetupUrl",
base::StrCat({chrome::kChromeUISettingsURL, chrome::kSyncSetupSubPage}));
} }
void AddCrostiniStrings(content::WebUIDataSource* html_source, void AddCrostiniStrings(content::WebUIDataSource* html_source,
......
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