[tbb-commits] [torbutton/master] Bug 19898: Use DuckDuckGo on about:tor

[gk at torproject.org]

commit 5047691041679494ff17a2258e2721e7200a91a2
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Nov 29 10:12:01 2016 +0000

    Bug 19898: Use DuckDuckGo on about:tor
    
    We switched to DuckDuckGo as our default search engine recently and this
    patch makes sure this is reflected on our about:tor page as well.
    
    While we are at it we are removing the respective Disconnect.me language
    strings.
---
 src/chrome/content/aboutTor/aboutTor.xhtml | 8 ++++----
 src/chrome/locale/en/aboutTor.dtd          | 4 +---
 src/chrome/locale/en/aboutTor.properties   | 6 ------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml
index 24efd1d..de07204 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -143,9 +143,9 @@ function insertPropertyStrings()
 
     Components.utils.import("resource://gre/modules/Services.jsm");
     let gStringBundle = Services.strings.createBundle(kPropertiesURL);
-    let s1 = gStringBundle.GetStringFromName("aboutTor.searchDC.privacy.link");
-    let s2 = gStringBundle.GetStringFromName("aboutTor.searchDC.search.link");
-    let result = gStringBundle.formatStringFromName("aboutTor.searchDC.privacy",
+    let s1 = gStringBundle.GetStringFromName("aboutTor.searchDDG.privacy.link");
+    let s2 = gStringBundle.GetStringFromName("aboutTor.searchDDG.search.link");
+    let result = gStringBundle.formatStringFromName("aboutTor.searchDDG.privacy",
                   [s1, s2], 2);
     if (result) {
       let elem = document.getElementById("searchProviderInfo");
@@ -196,7 +196,7 @@ window.addEventListener("pageshow", function() {
 </div>
 
 <div class="searchbox hideIfTorOff"> <!-- begin form based search -->
-  <form action="&aboutTor.searchDCPost.link;" method="post">
+  <form action="&aboutTor.searchDDGPost.link;" method="post">
   <div id="sxw">
     <div id="sbutton">
       <input name="b" id="sb" value="" title="&aboutTor.search.label;"
diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd
index 7f89286..4385ca8 100644
--- a/src/chrome/locale/en/aboutTor.dtd
+++ b/src/chrome/locale/en/aboutTor.dtd
@@ -19,9 +19,7 @@
 <!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
 
 <!ENTITY aboutTor.search.label "Search">
-
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_option=US&source=tor">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com">
 
 <!ENTITY aboutTor.torInfo1.label "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">
diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties
index 000c5c2..f9723bf 100644
--- a/src/chrome/locale/en/aboutTor.properties
+++ b/src/chrome/locale/en/aboutTor.properties
@@ -7,9 +7,3 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
-
-aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
-# The following string is a link which replaces %2$S above.
-aboutTor.searchDC.search.link=https://search.disconnect.me/