From 0a2141585318292c4a949a9fe6bd6dd27d601868 Mon Sep 17 00:00:00 2001
From: John Bieling <john@thunderbird.net>
Date: Mon, 3 May 2021 14:35:54 +0000
Subject: [PATCH] Bug 1708793 - Use brandShortName in Devtools when inspecting
 an add-on. r=jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D114010
---
 devtools/client/framework/components/DebugTargetInfo.js  | 6 +++++-
 .../__snapshots__/debug-target-info.test.js.snap         | 4 ++--
 devtools/client/locales/en-US/toolbox.properties         | 7 ++++---
 .../client/shared/test-helpers/jest-fixtures/Services.js | 9 +++++++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/devtools/client/framework/components/DebugTargetInfo.js b/devtools/client/framework/components/DebugTargetInfo.js
index 781ae30cf639..e7cd9dfb3fd1 100644
--- a/devtools/client/framework/components/DebugTargetInfo.js
+++ b/devtools/client/framework/components/DebugTargetInfo.js
@@ -81,10 +81,14 @@ class DebugTargetInfo extends PureComponent {
     const { debugTargetData, L10N } = this.props;
     const { name, version } = debugTargetData.runtimeInfo;
     const { connectionType } = debugTargetData;
+    const brandShorterName = Services.strings
+      .createBundle("chrome://branding/locale/brand.properties")
+      .GetStringFromName("brandShorterName");
 
     return connectionType === CONNECTION_TYPES.THIS_FIREFOX
       ? L10N.getFormatStr(
-          "toolbox.debugTargetInfo.runtimeLabel.thisFirefox",
+          "toolbox.debugTargetInfo.runtimeLabel.thisRuntime",
+          brandShorterName,
           version
         )
       : L10N.getFormatStr(
diff --git a/devtools/client/framework/test/node/components/__snapshots__/debug-target-info.test.js.snap b/devtools/client/framework/test/node/components/__snapshots__/debug-target-info.test.js.snap
index db3d103e9455..4a912983b034 100644
--- a/devtools/client/framework/test/node/components/__snapshots__/debug-target-info.test.js.snap
+++ b/devtools/client/framework/test/node/components/__snapshots__/debug-target-info.test.js.snap
@@ -374,7 +374,7 @@ exports[`DebugTargetInfo component Target title renders the expected snapshot fo
     <b
       className="devtools-ellipsis-text"
     >
-      toolbox.debugTargetInfo.runtimeLabel.thisFirefox-1.0.0
+      toolbox.debugTargetInfo.runtimeLabel.thisRuntime-NodeTest-1.0.0
     </b>
     <span
       className="devtools-ellipsis-text"
@@ -459,7 +459,7 @@ exports[`DebugTargetInfo component Target title renders the expected snapshot fo
     <b
       className="devtools-ellipsis-text"
     >
-      toolbox.debugTargetInfo.runtimeLabel.thisFirefox-1.0.0
+      toolbox.debugTargetInfo.runtimeLabel.thisRuntime-NodeTest-1.0.0
     </b>
     <span
       className="devtools-ellipsis-text"
diff --git a/devtools/client/locales/en-US/toolbox.properties b/devtools/client/locales/en-US/toolbox.properties
index c4449fc34c2c..5ed572562438 100644
--- a/devtools/client/locales/en-US/toolbox.properties
+++ b/devtools/client/locales/en-US/toolbox.properties
@@ -209,12 +209,13 @@ toolbox.sourceMapSourceFailure=Error while fetching an original source: %1$S\nSo
 # The version of runtime: %2$S
 toolbox.debugTargetInfo.runtimeLabel=%1$S (%2$S)
 
-# LOCALIZATION NOTE (toolbox.debugTargetInfo.runtimeLabel.thisFirefox): this is displayed
+# LOCALIZATION NOTE (toolbox.debugTargetInfo.runtimeLabel.thisRuntime): this is displayed
 # as a toolbox header in about:devtools-toolbox, when inspecting the current Firefox runtime
 # (for instance, when inspecting one of its tabs in about:debugging)
 # e.g. This Firefox (65.0a1)
-# The version of runtime: %S
-toolbox.debugTargetInfo.runtimeLabel.thisFirefox=This Firefox (%S)
+# The name of the current runtime/application (brandShorterName): %1$S
+# The version of runtime: %2$S
+toolbox.debugTargetInfo.runtimeLabel.thisRuntime=This %1$S (%2$S)
 
 # LOCALIZATION NOTE (toolbox.debugTargetInfo.tabTitleRemote):
 # Used as the tab title for about:devtools-toolbox when connected to a remote target.
diff --git a/devtools/client/shared/test-helpers/jest-fixtures/Services.js b/devtools/client/shared/test-helpers/jest-fixtures/Services.js
index 3238f5b62cf1..c8c2ae650c9d 100644
--- a/devtools/client/shared/test-helpers/jest-fixtures/Services.js
+++ b/devtools/client/shared/test-helpers/jest-fixtures/Services.js
@@ -538,6 +538,15 @@ const Services = {
 
   appinfo: "",
   obs: { addObserver: () => {} },
+  strings: {
+    createBundle: function(bundle) {
+      return {
+        GetStringFromName: function(str) {
+          return "NodeTest";
+        },
+      };
+    },
+  },
 };
 
 function pref(name, value) {