[Sugar-devel] [PATCH Browse] Use user's LANG for search results SL #3445

Manuel Kaufmann humitos at gmail.com
Thu May 3 21:36:17 EDT 2012


When the user types a string that is not like an url, we use Google to
search that string with the results in the language defined by LANG
environment variable.

Signed-off-by: Manuel Kaufmann <humitos at gmail.com>
---
 browser.py |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/browser.py b/browser.py
index c0bb7bc..0af4eb6 100644
--- a/browser.py
+++ b/browser.py
@@ -134,12 +134,16 @@ class TabbedView(BrowserNotebook):
                 pass
 
         if soup_uri is None and not _NON_SEARCH_REGEX.match(url):
+            # Get the user's LANG to use as default language of
+            # the results
+            lang = os.environ.get('LANG', 'en')[:2]
             # If the string doesn't look like an URI, let's search it:
-            url_search = \
-                _('http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8')
+            url_search = 'http://www.google.com/search?' \
+                'q=%(query)s&ie=UTF-8&oe=UTF-8&hl=%(lang)s'
             query_param = Soup.form_encode_hash({'q': url})
             # [2:] here is getting rid of 'q=':
-            effective_url = url_search % query_param[2:]
+            effective_url = url_search % {'query': query_param[2:],
+                                          'lang': lang}
         else:
             if has_web_scheme(url):
                 effective_url = url
-- 
1.7.7.6



More information about the Sugar-devel mailing list