Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1718158 - Change "Google suggestions" to "Google Suggestions" for Firefox Suggest. r=harry

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D118776
This commit is contained in:
Drew Willcoxon 2021-07-07 00:44:03 +00:00
parent 856ee10cba
commit 7315b8f72e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/urlbar/UrlbarView.jsm
View File

@ -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;
}

13
browser/components/urlbar/tests/browser/browser_firefoxSuggestLabels.js
View File

@ -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.