Commit fa82fcd1 authored by Jana Grill's avatar Jana Grill Committed by Chromium LUCI CQ

Adjust ADB sideloading notification messages for FlexOrgs

Adjust ADB sideloading notification messages to support FlexOrgs by
adjusting the domain placeholder names and descriptions to make it
easier for the translators to understand the usage of the texts.

Additionally replace a call to
BrowserPolicyConnectorChromeOS::GetEnterpriseDisplayDomain with a call
to BrowserPolicyConnectorChromeOS::GetEnterpriseDomainManager.

Bug: b:172685929
Test: None
Change-Id: I1cdeff3e45730d2fed41997046734f3a98bf1ee3
Skip-Translation-Screenshots-Check: True
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2584775Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarBrian Malcolm <bmalcolm@chromium.org>
Commit-Queue: Jana Grill <janagrill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836193}
parent 74fb07b8
......@@ -5843,20 +5843,20 @@ You can manage this account’s settings by installing the Family Link app on yo
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_TITLE" desc="Title for the notification informing the user that ADB sideloading has been disabled.">
ADB debugging disabled
</message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that ADB sideloading has been disabled, but that the administrator is not forcing a powerwash.">
<ph name="DOMAIN">$1<ex>google.com</ex></ph> has disabled ADB debugging. Once you restart your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph>, you won't be able to sideload apps.
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that ADB sideloading has been disabled, but that the manager is not forcing a powerwash. MANAGER can be a domain or an email address.">
<ph name="MANAGER">$1<ex>google.com</ex></ph> has disabled ADB debugging. Once you restart your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph>, you won't be able to sideload apps.
</message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_PLANNED_NOTIFICATION_TITLE" desc="Title for the notification informing the user that local data will be deleted.">
<ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> data will be deleted in 24 hours
</message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_PLANNED_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that ADB sideloading has been disabled by the administrator which will result in local data being deleted after 24 hours.">
<ph name="DOMAIN">$1<ex>google.com</ex></ph> has disabled ADB debugging. This will reset your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph> in 24 hours. Back up any files you'd like to keep.
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_PLANNED_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that ADB sideloading has been disabled by the manager which will result in local data being deleted after 24 hours. MANAGER can be a domain or an email address.">
<ph name="MANAGER">$1<ex>google.com</ex></ph> has disabled ADB debugging. This will reset your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph> in 24 hours. Back up any files you'd like to keep.
</message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_ON_REBOOT_NOTIFICATION_TITLE" desc="Title for the notification informing the user that local data will be deleted after reboot.">
<ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> data will be deleted
</message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_ON_REBOOT_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that ADB sideloading has been disabled by the administrator which will result in local data being deleted after reboot.">
<ph name="DOMAIN">$1<ex>google.com</ex></ph> has disabled ADB debugging, which will reset your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph>. Back up your files before restarting.
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_ON_REBOOT_NOTIFICATION_MESSAGE" desc="Text for the notification informing the user that ADB sideloading has been disabled by the manager which will result in local data being deleted after reboot. MANAGER can be a domain or an email address.">
<ph name="MANAGER">$1<ex>google.com</ex></ph> has disabled ADB debugging, which will reset your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph>. Back up your files before restarting.
</message>
<message name="IDS_ADB_SIDELOADING_POLICY_CHANGE_RESTART_TO_POWERWASH" meaning="button label" desc="Button label to restart the device which will result in local data being deleted.">
Restart to powerwash
......
......@@ -42,10 +42,10 @@ void AdbSideloadingPolicyChangeNotification::Show(Type type) {
bool pinned = false;
std::vector<message_center::ButtonInfo> notification_actions;
auto enterprise_display_domain =
auto enterprise_manager =
base::UTF8ToUTF16(g_browser_process->platform_part()
->browser_policy_connector_chromeos()
->GetEnterpriseDisplayDomain());
->GetEnterpriseDomainManager());
base::string16 device_type = ui::GetChromeOSDeviceName();
switch (type) {
......@@ -57,7 +57,7 @@ void AdbSideloadingPolicyChangeNotification::Show(Type type) {
IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_TITLE);
text = l10n_util::GetStringFUTF16(
IDS_ADB_SIDELOADING_POLICY_CHANGE_SIDELOADING_DISALLOWED_NOTIFICATION_MESSAGE,
enterprise_display_domain, device_type);
enterprise_manager, device_type);
notification_id = kAdbSideloadingDisallowedNotificationId;
break;
case Type::kPowerwashPlanned:
......@@ -66,7 +66,7 @@ void AdbSideloadingPolicyChangeNotification::Show(Type type) {
device_type);
text = l10n_util::GetStringFUTF16(
IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_PLANNED_NOTIFICATION_MESSAGE,
enterprise_display_domain, device_type);
enterprise_manager, device_type);
notification_id = kAdbSideloadingPowerwashPlannedNotificationId;
break;
case Type::kPowerwashOnNextReboot:
......@@ -75,7 +75,7 @@ void AdbSideloadingPolicyChangeNotification::Show(Type type) {
device_type);
text = l10n_util::GetStringFUTF16(
IDS_ADB_SIDELOADING_POLICY_CHANGE_POWERWASH_ON_REBOOT_NOTIFICATION_MESSAGE,
enterprise_display_domain, device_type);
enterprise_manager, device_type);
notification_id = kAdbSideloadingPowerwashOnRebootNotificationId;
pinned = true;
notification_actions.push_back(
......
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