[tbb-commits] [tor-browser/tor-browser-52.7.2esr-8.0-1] set default browser to DuckDuckGo modify DDG URL to the non-javascript site

[gk at torproject.org]

commit 750e3372e1a4887337ab6460ef3bb950c72b36f3
Author: n8fr8 <nathan at freitas.net>
Date:   Mon Jul 17 00:08:50 2017 -0400

    set default browser to DuckDuckGo modify DDG URL to the non-javascript site
    
    Signed-off-by: Amogh Pradeep <amoghbl1 at gmail.com>
---
 mobile/locales/en-US/chrome/region.properties     | 10 +++++-----
 mobile/locales/en-US/searchplugins/duckduckgo.xml |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties
index 201152118819..d194cdac4131 100644
--- a/mobile/locales/en-US/chrome/region.properties
+++ b/mobile/locales/en-US/chrome/region.properties
@@ -3,17 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=DuckDuckGo
 
 # Search engine order (order displayed in the search bar dropdown).
-browser.search.order.1=Google
-browser.search.order.2=Yahoo
+browser.search.order.1=DuckDuckGo
+browser.search.order.2=Google
 browser.search.order.3=Bing
 
 # These override the equivalents above when the client detects that it is in
 # US market only.
-browser.search.defaultenginename.US=Yahoo
-browser.search.order.US.1=Yahoo
+browser.search.defaultenginename.US=DuckDuckGo
+browser.search.order.US.1=DuckDuckGo
 browser.search.order.US.2=Google
 browser.search.order.US.3=Bing
 
diff --git a/mobile/locales/en-US/searchplugins/duckduckgo.xml b/mobile/locales/en-US/searchplugins/duckduckgo.xml
index 9e96ae21a005..824b42a05c9d 100644
--- a/mobile/locales/en-US/searchplugins/duckduckgo.xml
+++ b/mobile/locales/en-US/searchplugins/duckduckgo.xml
@@ -11,13 +11,13 @@
   <Param name="type" value="list"/>
 </Url>
 <!-- this is effectively x-moz-phonesearch, but search service expects a text/html entry -->
-<Url type="text/html" method="GET" template="https://duckduckgo.com/">
+<Url type="text/html" method="GET" template="https://duckduckgo.com/html/">
   <Param name="q" value="{searchTerms}" />
   <Param name="t" value="fpas" />
 </Url>
-<Url type="application/x-moz-tabletsearch" method="GET" template="https://duckduckgo.com/">
+<Url type="application/x-moz-tabletsearch" method="GET" template="https://duckduckgo.com/html/">
   <Param name="q" value="{searchTerms}" />
   <Param name="t" value="ftas" />
 </Url>
-<SearchForm>https://duckduckgo.com</SearchForm>
+<SearchForm>https://duckduckgo.com/html/</SearchForm>
 </SearchPlugin>