From 7315b8f72e32830ba2fee26b7c14a78467a108c1 Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Wed, 7 Jul 2021 00:44:03 +0000
Subject: [PATCH] Bug 1718158 - Change "Google suggestions" to "Google
 Suggestions" for Firefox Suggest. r=harry

Differential Revision: https://phabricator.services.mozilla.com/D118776
---
 browser/components/urlbar/UrlbarView.jsm            |  4 ++--
 .../tests/browser/browser_firefoxSuggestLabels.js   | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/browser/components/urlbar/UrlbarView.jsm b/browser/components/urlbar/UrlbarView.jsm
index 6955afc945c1..428c9e370a98 100644
--- a/browser/components/urlbar/UrlbarView.jsm
+++ b/browser/components/urlbar/UrlbarView.jsm
@@ -1713,12 +1713,12 @@ class UrlbarView {
         case UrlbarUtils.RESULT_TYPE.URL:
           return UrlbarProviderQuickSuggest.featureName;
         case UrlbarUtils.RESULT_TYPE.SEARCH:
-          // We only show the "<engine> suggestions" label if it's not the first
+          // We only show the "<engine> Suggestions" label if it's not the first
           // label. This string is hardcoded en-US for now.
           if (currentLabel && row.result.payload.suggestion) {
             let engineName =
               row.result.payload.engine || Services.search.defaultEngine.name;
-            return engineName + " suggestions";
+            return engineName + " Suggestions";
           }
           break;
       }
diff --git a/browser/components/urlbar/tests/browser/browser_firefoxSuggestLabels.js b/browser/components/urlbar/tests/browser/browser_firefoxSuggestLabels.js
index 25f63ab8de1e..f35d1b118954 100644
--- a/browser/components/urlbar/tests/browser/browser_firefoxSuggestLabels.js
+++ b/browser/components/urlbar/tests/browser/browser_firefoxSuggestLabels.js
@@ -19,6 +19,9 @@ const TOP_SITES = [
 
 const FIREFOX_SUGGEST_LABEL = "Firefox Suggest";
 
+// %s is replaced with the engine name.
+const ENGINE_SUGGESTIONS_LABEL = "%s Suggestions";
+
 add_task(async function init() {
   Assert.ok(
     UrlbarPrefs.get("showSearchSuggestionsFirst"),
@@ -114,7 +117,7 @@ add_task(async function generalBeforeSuggestions() {
       });
       await checkLabels(MAX_RESULTS, {
         1: FIREFOX_SUGGEST_LABEL,
-        [MAX_RESULTS - 2]: `${engine.name} suggestions`,
+        [MAX_RESULTS - 2]: engineSuggestionsLabel(engine.name),
       });
       await UrlbarTestUtils.promisePopupClose(window);
     });
@@ -282,9 +285,9 @@ add_task(async function repeatLabels() {
     });
     await checkLabels(results.length, {
       0: FIREFOX_SUGGEST_LABEL,
-      1: `${engineName} suggestions`,
+      1: engineSuggestionsLabel(engineName),
       2: FIREFOX_SUGGEST_LABEL,
-      3: `${engineName} suggestions`,
+      3: engineSuggestionsLabel(engineName),
     });
     await UrlbarTestUtils.promisePopupClose(window);
   });
@@ -464,6 +467,10 @@ async function checkLabels(resultCount, labelsByIndex) {
   }
 }
 
+function engineSuggestionsLabel(engineName) {
+  return ENGINE_SUGGESTIONS_LABEL.replace("%s", engineName);
+}
+
 /**
  * Calls a callback while enrolled in a mock experiment that enables bucket
  * titles.