From 8fc4b8156affc9e7f00db0988ccd627b3eaae8a7 Mon Sep 17 00:00:00 2001
From: a01200356 <a01200356@itesm.mx>
Date: Fri, 3 Jun 2016 00:14:23 -0500
Subject: [fix] multilingual duckduckgo

only works if both country and language are set
---
 searx/engines/duckduckgo.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'searx')

diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py
index 373ce1b2d..714c27228 100644
--- a/searx/engines/duckduckgo.py
+++ b/searx/engines/duckduckgo.py
@@ -11,8 +11,6 @@
  @parse       url, title, content
 
  @todo        rewrite to api
- @todo        language support
-              (the current used site does not support language-change)
 """
 
 from urllib import urlencode
@@ -39,13 +37,22 @@ def request(query, params):
     offset = (params['pageno'] - 1) * 30
 
     if params['language'] == 'all':
-        locale = 'en-us'
+        locale = None
     else:
-        locale = params['language'].replace('_', '-').lower()
-
-    params['url'] = url.format(
-        query=urlencode({'q': query, 'kl': locale}),
-        offset=offset)
+        locale = params['language'].split('_')
+        if len(locale) == 2:
+            # country code goes first
+            locale = locale[1].lower() + '-' + locale[0].lower()
+        else:
+            # doesn't actually do anything because ddg requires both country and language
+            locale = locale[0].lower()
+
+    if locale:
+        params['url'] = url.format(
+            query=urlencode({'q': query, 'kl': locale}), offset=offset)
+    else:
+        params['url'] = url.format(
+            query=urlencode({'q': query}), offset=offset)
 
     return params
 
-- 
cgit v1.2.3


From aac4ed6971c875077014d13ab85a1259a14b223b Mon Sep 17 00:00:00 2001
From: marc <a01200356@itesm.mx>
Date: Thu, 14 Jul 2016 16:36:52 -0500
Subject: [fix] guess country code if not specified in duckduckgo engine

---
 searx/engines/duckduckgo.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'searx')

diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py
index 714c27228..d29e4416a 100644
--- a/searx/engines/duckduckgo.py
+++ b/searx/engines/duckduckgo.py
@@ -16,6 +16,7 @@
 from urllib import urlencode
 from lxml.html import fromstring
 from searx.engines.xpath import extract_text
+from searx.languages import language_codes
 
 # engine dependent config
 categories = ['general']
@@ -44,8 +45,14 @@ def request(query, params):
             # country code goes first
             locale = locale[1].lower() + '-' + locale[0].lower()
         else:
-            # doesn't actually do anything because ddg requires both country and language
+            # tries to get a country code from language
             locale = locale[0].lower()
+            lang_codes = [x[0] for x in language_codes]
+            for lc in lang_codes:
+                lc = lc.split('_')
+                if locale == lc[0]:
+                    locale = lc[1].lower() + '-' + lc[0].lower()
+                    break
 
     if locale:
         params['url'] = url.format(
-- 
cgit v1.2.3