Bug 1642245 - Give a non-localised version of DDG to all locales. r=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 31 May 2020 16:38:25 +0100
changeset 29834 5578dcf8959f6f130c3d95a266a63f8e8d313d9f
parent 29833 0d37700f47f44ac8bf35883c93dc1adc882ad2f8
child 29835 14429220b816fc1c8f54262ba9506865c75311d8
push id17555
push userfrgrahl@gmx.net
push dateWed, 10 Jun 2020 21:49:01 +0000
treeherdercomm-central@15f57f36a8dc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg
bugs1642245
Bug 1642245 - Give a non-localised version of DDG to all locales. r=frg
suite/locales/search/list.json
suite/locales/searchplugins/duckduckgo-en-US.xml
suite/locales/searchplugins/duckduckgo.xml
--- a/suite/locales/search/list.json
+++ b/suite/locales/search/list.json
@@ -6,204 +6,204 @@
       "duckduckgo", "google", "wikipedia", "yahoo"
     ]
   },
   "regionOverrides": {},
   "locales": {
     "en-US": {
       "default": {
         "visibleDefaultEngines": [
-          "duckduckgo", "google", "wikipedia", "yahoo", "amazon", "ebay"
+          "duckduckgo-en-US", "google", "wikipedia", "yahoo", "amazon", "ebay", "duckduckgo"
         ]
       }
     },
     "cs": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Seznam", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "google", "seznam-cz", "duckduckgo-cs-CZ", "heureka-cz", "mapy-cz", "wikipedia-cz"
+          "google", "seznam-cz", "duckduckgo-cs-CZ", "heureka-cz", "mapy-cz", "wikipedia-cz", "duckduckgo"
         ]
       }
     },
     "de": {
       "default": {
         "visibleDefaultEngines": [
-          "duckduckgo-de-DE", "google", "amazon-de", "wikipedia-de", "yahoo-de", "ebay-de"
+          "duckduckgo-de-DE", "google", "amazon-de", "wikipedia-de", "yahoo-de", "ebay-de", "duckduckgo"
         ]
       }
     },
     "en-GB": {
       "default": {
         "searchOrder": ["DuckDuckGo", "Google", "Yahoo.co.uk"],
         "visibleDefaultEngines": [
-          "duckduckgo-en-GB", "google", "yahoo-en-GB", "amazon-en-GB", "chambers-en-GB", "wikipedia", "ebay-en-GB"
+          "duckduckgo-en-GB", "google", "yahoo-en-GB", "amazon-en-GB", "chambers-en-GB", "wikipedia", "ebay-en-GB", "duckduckgo"
         ]
       }
     },
     "es-AR": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Yahoo Argentina", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "duckduckgo-es-AR", "google", "yahoo-ar", "wikipedia-es"
+          "duckduckgo-es-AR", "google", "yahoo-ar", "wikipedia-es", "duckduckgo"
         ]
       }
     },
     "es-ES": {
       "default": {
         "visibleDefaultEngines": [
-          "drae", "duckduckgo-es-ES", "google", "amazon-es", "wikipedia-es", "yahoo-es", "ebay-es"
+          "drae", "duckduckgo-es-ES", "google", "amazon-es", "wikipedia-es", "yahoo-es", "ebay-es", "duckduckgo"
         ]
       }
     },
     "fi": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Yahoo", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "duckduckgo-fi-FI", "huuto-fi", "google", "wikipedia-fi", "yahoo-fi"
+          "duckduckgo-fi-FI", "huuto-fi", "google", "wikipedia-fi", "yahoo-fi", "duckduckgo"
         ]
       }
     },
     "fr": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Yahoo", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "cnrtl-tlfi-fr", "duckduckgo-fr-FR", "google", "amazon-fr", "wikipedia-fr", "yahoo-fr", "ebay-fr"
+          "cnrtl-tlfi-fr", "duckduckgo-fr-FR", "google", "amazon-fr", "wikipedia-fr", "yahoo-fr", "ebay-fr", "duckduckgo"
         ]
       }
     },
     "hu": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "duckduckgo-hu-HU", "google", "vatera", "wikipedia-hu"
+          "duckduckgo-hu-HU", "google", "vatera", "wikipedia-hu", "duckduckgo"
         ]
       }
     },
     "it": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Yahoo", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "bing", "google", "hoepli", "duckduckgo-it-IT", "amazon-it", "wikipedia-it", "yahoo-it", "ebay-it"
+          "bing", "google", "hoepli", "duckduckgo-it-IT", "amazon-it", "wikipedia-it", "yahoo-it", "ebay-it", "duckduckgo"
         ]
       }
     },
     "ja-JP-mac": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Yahoo! JAPAN", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "google-jp", "yahoo-jp", "amazon-jp", "wikipedia-ja", "duckduckgo-ja-JP"
+          "google-jp", "yahoo-jp", "amazon-jp", "wikipedia-ja", "duckduckgo-ja-JP", "duckduckgo"
         ]
       }
     },
     "ja": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Yahoo! JAPAN", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "google-jp", "yahoo-jp", "amazon-jp", "wikipedia-ja", "duckduckgo-ja-JP"
+          "google-jp", "yahoo-jp", "amazon-jp", "wikipedia-ja", "duckduckgo-ja-JP", "duckduckgo"
         ]
       }
     },
     "ka": {
       "default": {
         "searchDefault": "Google",
-        "searchOrder": ["Google", "DuckDuckGo"],
+        "searchOrder": ["Google", "DuckDuckGo (Global)"],
         "visibleDefaultEngines": [
           "google", "duckduckgo", "wikipedia-ka"
         ]
       }
     },
     "nb-NO": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Yahoo", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "duckduckgo-nb-NO", "google", "wikipedia-NO", "yahoo-NO"
+          "duckduckgo-nb-NO", "google", "wikipedia-NO", "yahoo-NO", "duckduckgo"
         ]
       }
     },
     "nl": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Yahoo", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "google", "duckduckgo-nl-NL", "bolcom-nl", "wikipedia-nl", "marktplaats-nl", "yahoo-nl", "ebay-nl"
+          "google", "duckduckgo-nl-NL", "bolcom-nl", "wikipedia-nl", "marktplaats-nl", "yahoo-nl", "ebay-nl", "duckduckgo"
         ]
       }
     },
     "pl": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Startpage", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "allegro-pl", "duckduckgo-pl-PL", "google", "pwn-pl", "startpage-pl", "wikipedia-pl", "wolnelektury-pl"
+          "allegro-pl", "duckduckgo-pl-PL", "google", "pwn-pl", "startpage-pl", "wikipedia-pl", "wolnelektury-pl", "duckduckgo"
         ]
       }
     },
     "pt-BR": {
       "default": {
         "searchDefault": "Google",
         "visibleDefaultEngines": [
-          "google", "duckduckgo-pt-BR", "yahoo-br", "amazon-br", "bing", "wikipedia-pt"
+          "google", "duckduckgo-pt-BR", "yahoo-br", "amazon-br", "bing", "wikipedia-pt", "duckduckgo"
         ]
       }
     },
     "pt-PT": {
       "default": {
         "searchOrder": ["DuckDuckGo", "Google", "SAPO", "Priberam", "Wikipedia (pt)"],
         "visibleDefaultEngines": [
-          "duckduckgo-pt-PT", "google", "sapo", "priberam", "wikipedia-pt"
+          "duckduckgo-pt-PT", "google", "sapo", "priberam", "wikipedia-pt", "duckduckgo"
         ]
       }
     },
     "ru": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "duckduckgo-ru-RU", "google", "wikipedia-ru"
+          "duckduckgo-ru-RU", "google", "wikipedia-ru", "duckduckgo"
         ]
       }
     },
     "sk": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Azet", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "google", "azet-sk", "atlas-sk", "zoznam-sk", "wikipedia-sk", "duckduckgo-sk-SK"
+          "google", "azet-sk", "atlas-sk", "zoznam-sk", "wikipedia-sk", "duckduckgo-sk-SK", "duckduckgo"
         ]
       }
     },
     "sv-SE": {
       "default": {
         "searchOrder": ["DuckDuckGo", "Google", "Bing"],
         "visibleDefaultEngines": [
-          "duckduckgo-sv-SE", "bing", "google", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE", "yahoo-sv-SE"
+          "duckduckgo-sv-SE", "bing", "google", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE", "yahoo-sv-SE", "duckduckgo"
         ]
       }
     },
     "zh-CN": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Yahoo!", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "google", "duckduckgo-zh-CN", "amazon-zh-CN", "wikipedia-zh-CN", "yahoo-zh-CN"
+          "google", "duckduckgo-zh-CN", "amazon-zh-CN", "wikipedia-zh-CN", "yahoo-zh-CN", "duckduckgo"
         ]
       }
     },
     "zh-TW": {
       "default": {
         "searchDefault": "Google",
         "searchOrder": ["Google", "Yahoo!", "DuckDuckGo"],
         "visibleDefaultEngines": [
-          "yahoo-zh-TW", "google", "duckduckgo-zh-TW", "yahoo-bid-zh-TW", "wikipedia-zh-TW"
+          "yahoo-zh-TW", "google", "duckduckgo-zh-TW", "yahoo-bid-zh-TW", "wikipedia-zh-TW", "duckduckgo"
         ]
       }
     }
   }
 }
copy from suite/locales/searchplugins/duckduckgo.xml
copy to suite/locales/searchplugins/duckduckgo-en-US.xml
--- a/suite/locales/searchplugins/duckduckgo.xml
+++ b/suite/locales/searchplugins/duckduckgo-en-US.xml
@@ -5,19 +5,21 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>DuckDuckGo</ShortName>
 <Description>DuckDuckGo provides a privacy-aware search engine for the web</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">resource://search-plugins/images/duckduckgo.ico</Image>
 <Url type="application/x-suggestions+json"
      method="GET"
      template="https://ac.duckduckgo.com/ac/">
+  <Param name="kl" value="us-en"/>
   <Param name="q" value="{searchTerms}"/>
   <Param name="type" value="list"/>
 </Url>
 <Url type="text/html"
      method="GET"
      template="https://duckduckgo.com/"
      rel="searchform">
+  <Param name="kl" value="us-en"/>
   <Param name="q" value="{searchTerms}"/>
   <Param name="t" value="seamonkey"/>
 </Url>
 </SearchPlugin>
--- a/suite/locales/searchplugins/duckduckgo.xml
+++ b/suite/locales/searchplugins/duckduckgo.xml
@@ -1,14 +1,14 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>DuckDuckGo</ShortName>
+<ShortName>DuckDuckGo (Global)</ShortName>
 <Description>DuckDuckGo provides a privacy-aware search engine for the web</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">resource://search-plugins/images/duckduckgo.ico</Image>
 <Url type="application/x-suggestions+json"
      method="GET"
      template="https://ac.duckduckgo.com/ac/">
   <Param name="q" value="{searchTerms}"/>
   <Param name="type" value="list"/>