commit 4c35e375ff74614b84ff722e9214d757fed07b01 Author: Georg Koppen gk@torproject.org Date: Fri Jan 23 12:09:45 2015 +0000
Bug 11236: Don't set search engines in extension
We risk search engine names getting translated which results in broken search boxes if we expose them in locale files. As we only use en-US search engines (i.e. no localized ones) we can avoid that risk by removing these language strings and adding the search engines names directly into a central preference file shared by all localized bundles. --- src/chrome/locale/en/browser.properties | 8 -------- src/defaults/preferences/preferences.js | 6 +----- 2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/src/chrome/locale/en/browser.properties b/src/chrome/locale/en/browser.properties index 295a03a..8849b67 100644 --- a/src/chrome/locale/en/browser.properties +++ b/src/chrome/locale/en/browser.properties @@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
# Spell checker dictionary spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 3e02b77..c6fb8e4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -225,10 +225,6 @@ pref("extensions.torbutton.cookie_js_allow", true); pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true);
-// Browser home page, spell checker dictionary, and search engine overrides: +// Browser home page, and spell checker dictionary: pref("browser.startup.homepage", "chrome://torbutton/locale/browser.properties"); pref("spellchecker.dictionary", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.defaultenginename", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.1", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.2", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.3", "chrome://torbutton/locale/browser.properties");