Adjust IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY for FlexOrgs

Add the device type placeholders to IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY
and IDS_ASH_ENTERPRISE_DEVICE_MANAGED, replacing them with the actual
device type in code. Additioanlly adjust the domain placeholder name and
description and add screenshots to make it easier for the translators to
understand the usage of the texts.

Bug: b:172676875
Test: Manual
Change-Id: Ia2b0f20e10c2e5ecb6f3908e50588ac7f5c8532e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2538839Reviewed-by: Brian Malcolm <bmalcolm@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Tim Song <tengs@chromium.org>
Commit-Queue: Jana Grill <janagrill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830928}

ash/system/unified/managed_device_tray_item_view.cc

@@ -16,6 +16,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/strings/grit/chromeos_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/chromeos/devicetype_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/image_view.h"
 
@@ -63,7 +64,7 @@ void ManagedDeviceTrayItemView::Update() {
     SetVisible(true);
     if (!enterprise_domain_manager.empty()) {
       image_view()->SetTooltipText(l10n_util::GetStringFUTF16(
-          IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY,
+          IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY, ui::GetChromeOSDeviceName(),
           base::UTF8ToUTF16(enterprise_domain_manager)));
     } else {
       image_view()->SetTooltipText(base::string16());

ash/system/unified/unified_managed_device_view.cc

@@ -19,6 +19,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/strings/grit/chromeos_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/chromeos/devicetype_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
@@ -96,9 +97,11 @@ void UnifiedManagedDeviceView::Update() {
 
     base::string16 managed_string =
         enterprise_domain_manager.empty()
-            ? l10n_util::GetStringUTF16(IDS_ASH_ENTERPRISE_DEVICE_MANAGED)
+            ? l10n_util::GetStringFUTF16(IDS_ASH_ENTERPRISE_DEVICE_MANAGED,
+                                         ui::GetChromeOSDeviceName())
             : l10n_util::GetStringFUTF16(
                   IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY,
+                  ui::GetChromeOSDeviceName(),
                   base::UTF8ToUTF16(enterprise_domain_manager));
     label_->SetText(managed_string);
     SetAccessibleName(managed_string);

ash/system/unified/unified_system_info_view.cc

@@ -27,6 +27,7 @@
 #include "chromeos/strings/grit/chromeos_strings.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/chromeos/devicetype_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/animation/ink_drop_highlight.h"
@@ -350,11 +351,11 @@ void EnterpriseManagedView::Update() {
              !model->enterprise_domain_manager().empty());
 
   if (model->active_directory_managed()) {
-    SetTooltipText(
-        l10n_util::GetStringUTF16(IDS_ASH_ENTERPRISE_DEVICE_MANAGED));
+    SetTooltipText(l10n_util::GetStringFUTF16(IDS_ASH_ENTERPRISE_DEVICE_MANAGED,
+                                              ui::GetChromeOSDeviceName()));
   } else if (!model->enterprise_domain_manager().empty()) {
     SetTooltipText(l10n_util::GetStringFUTF16(
-        IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY,
+        IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY, ui::GetChromeOSDeviceName(),
         base::UTF8ToUTF16(model->enterprise_domain_manager())));
   }
 }

chrome/browser/chromeos/login/login_screen_policy_browsertest.cc

@@ -41,6 +41,7 @@
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/chromeos/devicetype_utils.h"
 
 namespace em = enterprise_management;
 
@@ -239,7 +240,8 @@ IN_PROC_BROWSER_TEST_F(LoginScreenButtonsLocalePolicy, UnifiedTrayLabelsText) {
 
   // Text on EnterpriseManagedView tooltip in current locale.
   base::string16 expected_text = l10n_util::GetStringFUTF16(
-      IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY, base::UTF8ToUTF16(kDomain));
+      IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY, ui::GetChromeOSDeviceName(),
+      base::UTF8ToUTF16(kDomain));
 
   EXPECT_EQ(expected_text, actual_text);
 }

chrome/browser/chromeos/login/version_info_updater.cc

@@ -30,6 +30,7 @@
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/chromeos/devicetype_utils.h"
 
 namespace chromeos {
 
@@ -154,9 +155,9 @@ void VersionInfoUpdater::SetEnterpriseInfo(
   // Update the notification about device status reporting.
   if (delegate_ && !enterprise_display_domain.empty()) {
     std::string enterprise_info;
-    enterprise_info =
-        l10n_util::GetStringFUTF8(IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY,
-                                  base::UTF8ToUTF16(enterprise_display_domain));
+    enterprise_info = l10n_util::GetStringFUTF8(
+        IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY, ui::GetChromeOSDeviceName(),
+        base::UTF8ToUTF16(enterprise_display_domain));
     delegate_->OnEnterpriseInfoUpdated(enterprise_info, asset_id);
   }
 }

chrome/browser/ui/ash/system_tray_client_browsertest.cc

@@ -34,6 +34,7 @@
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/chromeos/devicetype_utils.h"
 #include "url/gurl.h"
 
 using chromeos::ProfileHelper;
@@ -51,11 +52,13 @@ IN_PROC_BROWSER_TEST_F(SystemTrayClientEnterpriseTest, TrayEnterprise) {
   if (ash::features::IsManagedDeviceUIRedesignEnabled()) {
     // The text shows the domain.
     EXPECT_EQ(l10n_util::GetStringFUTF16(IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY,
+                                         ui::GetChromeOSDeviceName(),
                                          base::UTF8ToUTF16("example.com")),
               test_api->GetBubbleViewText(ash::VIEW_ID_TRAY_ENTERPRISE_LABEL));
   } else {
     // The tooltip shows the domain.
     EXPECT_EQ(l10n_util::GetStringFUTF16(IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY,
+                                         ui::GetChromeOSDeviceName(),
                                          base::UTF8ToUTF16("example.com")),
               test_api->GetBubbleViewTooltip(ash::VIEW_ID_TRAY_ENTERPRISE));
   }

chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

@@ -59,6 +59,7 @@
 #include "ui/base/theme_provider.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
+#include "ui/chromeos/devicetype_utils.h"
 #include "ui/gfx/animation/animation.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme.h"
@@ -428,11 +429,11 @@ scoped_refptr<base::RefCountedString> NTPResourceCache::CreateNewTabGuestHTML(
       const std::string enterprise_domain_manager =
           connector->GetEnterpriseDomainManager();
       enterprise_info = l10n_util::GetStringFUTF16(
-          IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY,
+          IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY, ui::GetChromeOSDeviceName(),
           base::UTF8ToUTF16(enterprise_domain_manager));
     } else if (connector->IsActiveDirectoryManaged()) {
-      enterprise_info =
-          l10n_util::GetStringUTF16(IDS_ASH_ENTERPRISE_DEVICE_MANAGED);
+      enterprise_info = l10n_util::GetStringFUTF16(
+          IDS_ASH_ENTERPRISE_DEVICE_MANAGED, ui::GetChromeOSDeviceName());
     } else {
       NOTREACHED() << "Unknown management type";
     }

chromeos/chromeos_strings.grd

@@ -182,11 +182,11 @@ Try tapping the mic to ask me anything.
       </message>
 
       <!-- Status tray enterprise management. -->
-      <message name="IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY" desc="Text for notifications showing that this device is enterpise managed. Used when the organization's domain name is available.">
-        This device is managed by <ph name="DOMAIN">$1<ex>acmecorp.com</ex></ph>.
+      <message name="IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY" desc="Text for notifications showing that this device is enterprise managed. Used when the manager is available. MANAGER can be a domain or an email address.">
+        This <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> is managed by <ph name="MANAGER">$2<ex>acmecorp.com</ex></ph>.
       </message>
-      <message name="IDS_ASH_ENTERPRISE_DEVICE_MANAGED" desc="Text for notifications showing that this device is enterprise managed. Used when the organization's domain name is not available (e.g. Active Directory).">
-        This device is enterprise managed
+      <message name="IDS_ASH_ENTERPRISE_DEVICE_MANAGED" desc="Text for notifications showing that this device is enterprise managed. Used when the manager is not available (e.g. Active Directory).">
+        This <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> is enterprise managed
       </message>
       <message name="IDS_ASH_ENTERPRISE_DEVICE_MANAGED_SHORT" desc="Short text showing that the device is enterprise managed.">
         Managed

chromeos/chromeos_strings_grd/IDS_ASH_ENTERPRISE_DEVICE_MANAGED.png.sha1

+1a81d2e43bb8fb22e6c061917fea0bb76c089e51
\ No newline at end of file

chromeos/chromeos_strings_grd/IDS_ASH_ENTERPRISE_DEVICE_MANAGED_BY.png.sha1

+de650a83c22f3ace1b727c015a93d2f95b5731b2
\ No newline at end of file