Commit d594b84c authored by Scott Chen's avatar Scott Chen Committed by Commit Bot

settings[DICE]: change sign-out dialog text

Bug: 810515
Change-Id: I18891fc67b1ff12017d6a56ac1e0acf8092bdfa5
Reviewed-on: https://chromium-review.googlesource.com/912549
Commit-Queue: Scott Chen <scottchen@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537904}
parent 39e4de25
......@@ -3093,11 +3093,11 @@
<message name="IDS_SETTINGS_PEOPLE_SYNC_ANOTHER_ACCOUNT" desc="The label for the button that lets the user choose another account to sync with.">
Use another account
</message>
<message name="IDS_SETTINGS_PEOPLE_SYNC_AS_NAME" desc="The label for the button that lets the user lock-in the account to sync with.">
<message name="IDS_SETTINGS_PEOPLE_SYNC_AS_NAME" desc="The label for the button that lets the user start syncing with the selected account.">
Sync as <ph name="FULL_NAME">$1<ex>Bob Smith</ex></ph>
</message>
<message name="IDS_SETTINGS_PEOPLE_SYNCED_TO_NAME" desc="The text displayed to the user that the profile is currently synced to a specific account.">
Synced to <ph name="FULL_NAME">$1<ex>Bob Smith</ex></ph>
<message name="IDS_SETTINGS_PEOPLE_SYNCED_AS_NAME" desc="The text displayed to the user that the profile is currently synced to a specific account.">
Synced as <ph name="FULL_NAME">$1<ex>Bob Smith</ex></ph>
</message>
<message name="IDS_SETTINGS_PEOPLE_SYNC_TURN_OFF" desc="The label for the button that lets the user turn off profile syncing with their gaia account.">
Turn off
......@@ -3111,6 +3111,18 @@
<message name="IDS_SETTINGS_PROFILE_SHORTCUT_TOGGLE_LABEL" desc="Label of the toggle that creates or removes a desktop shortcut for the profile.">
Show desktop shortcut
</message>
<message name="IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_TITLE" desc="The text to display on the title of the dialog to turn off sync.">
Turn off sync
</message>
<message name="IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_CONFIRM" desc="The text to display on the confirm button of the dialog to turn off sync.">
Continue
</message>
<message name="IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_MANAGED_CONFIRM" desc="The text to display on the confirm button of the dialog to turn off sync, when the profile is managed by admin.">
Clear and continue
</message>
<message name="IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_CHECKBOX" desc="The text to display next to the checkbox of the dialog to turn off sync, asking users if they want to clear these data from the device.">
Clear bookmarks, history, passwords, and more from this device
</message>
</if>
<message name="IDS_SETTINGS_SYNC_OVERVIEW" desc="The message that appears in the options dialog when sync has not been set up by the user.">
......
......@@ -58,6 +58,7 @@
#include "ui/display/manager/chromeos/touch_device_manager.h"
#else
#include "chrome/browser/ui/webui/settings/system_handler.h"
#include "components/signin/core/browser/profile_management_switches.h"
#endif
#if defined(OS_WIN)
......@@ -1352,7 +1353,7 @@ void AddPasswordsAndFormsStrings(content::WebUIDataSource* html_source) {
arraysize(localized_strings));
}
void AddPeopleStrings(content::WebUIDataSource* html_source) {
void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) {
LocalizedString localized_strings[] = {
{"peoplePageTitle", IDS_SETTINGS_PEOPLE},
{"manageOtherPeople", IDS_SETTINGS_PEOPLE_MANAGE_OTHER_PEOPLE},
......@@ -1462,7 +1463,7 @@ void AddPeopleStrings(content::WebUIDataSource* html_source) {
IDS_SETTINGS_PEOPLE_SIGN_IN_PROMPT_SECONDARY},
{"useAnotherAccount", IDS_SETTINGS_PEOPLE_SYNC_ANOTHER_ACCOUNT},
{"syncAsName", IDS_SETTINGS_PEOPLE_SYNC_AS_NAME},
{"syncedToName", IDS_SETTINGS_PEOPLE_SYNCED_TO_NAME},
{"syncedToName", IDS_SETTINGS_PEOPLE_SYNCED_AS_NAME},
{"turnOffSync", IDS_SETTINGS_PEOPLE_SYNC_TURN_OFF},
#endif
{"syncOverview", IDS_SETTINGS_SYNC_OVERVIEW},
......@@ -1578,6 +1579,20 @@ void AddPeopleStrings(content::WebUIDataSource* html_source) {
IDS_SETTINGS_SYNC_DISCONNECT_MANAGED_PROFILE_EXPLANATION,
base::ASCIIToUTF16("$1"),
base::ASCIIToUTF16(sync_dashboard_url)));
// The syncDisconnect text differs depending on Dice-enabledness.
if (signin::IsDiceEnabledForProfile(profile->GetPrefs())) {
LocalizedString sync_disconnect_strings[] = {
{"syncDisconnect", IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_CONFIRM},
{"syncDisconnectTitle", IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_TITLE},
{"syncDisconnectDeleteProfile",
IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_CHECKBOX},
{"syncDisconnectConfirm",
IDS_SETTINGS_TURN_OFF_SYNC_DIALOG_MANAGED_CONFIRM},
};
AddLocalizedStringsBulk(html_source, sync_disconnect_strings,
arraysize(sync_disconnect_strings));
}
#endif
html_source->AddString("syncErrorHelpUrl", chrome::kSyncErrorsHelpURL);
......@@ -2275,7 +2290,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
AddLanguagesStrings(html_source);
AddOnStartupStrings(html_source);
AddPasswordsAndFormsStrings(html_source);
AddPeopleStrings(html_source);
AddPeopleStrings(html_source, profile);
AddPrintingStrings(html_source);
AddPrivacyStrings(html_source, profile);
AddResetStrings(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