[tor-commits] [torbutton/master] Bug 14490: Make disconnect search the default search engine.

[mikeperry at torproject.org]

commit 699f82654904841df2691fe020928933afe312ff
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Feb 11 16:57:08 2015 -0800

    Bug 14490: Make disconnect search the default search engine.
---
 src/chrome/content/aboutTor/aboutTor.xhtml |    8 ++++----
 src/chrome/locale/en/aboutTor.dtd          |    1 +
 src/chrome/locale/en/aboutTor.properties   |    6 ++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml
index 9b77af2..95807fd 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -112,9 +112,9 @@ function insertPropertyStrings()
 
     Components.utils.import("resource://gre/modules/Services.jsm");
     var gStringBundle = Services.strings.createBundle(kPropertiesURL);
-    var s1 = gStringBundle.GetStringFromName("aboutTor.searchSP.privacy.link");
-    var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link");
-    var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy",
+    var s1 = gStringBundle.GetStringFromName("aboutTor.searchDC.privacy.link");
+    var s2 = gStringBundle.GetStringFromName("aboutTor.searchDC.search.link");
+    var result = gStringBundle.formatStringFromName("aboutTor.searchDC.privacy",
                   [s1, s2], 2);
     if (result) {
       var elem = document.getElementById("searchProviderInfo");
@@ -165,7 +165,7 @@ window.addEventListener("pageshow", function() {
 </div>
 
 <div class="searchbox hideIfTorOff"> <!-- begin form based search -->
-  <form action="&aboutTor.searchSPPost.link;" method="post">
+  <form action="&aboutTor.searchDCPost.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 6f63ff7..771f8ae 100644
--- a/src/chrome/locale/en/aboutTor.dtd
+++ b/src/chrome/locale/en/aboutTor.dtd
@@ -25,6 +25,7 @@
 
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_option=US">
 
 <!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 02088f0..d607324 100644
--- a/src/chrome/locale/en/aboutTor.properties
+++ b/src/chrome/locale/en/aboutTor.properties
@@ -13,3 +13,9 @@ 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/