Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5568f24d authored by Marc Abonce Seguin's avatar Marc Abonce Seguin
Browse files

[fix] check language aliases when setting search language

parent 3c95d64f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ def request(query, params):
        query=urlencode({'q': query}),
        offset=offset)

    language = match_language(params['language'], supported_languages).lower()
    language = match_language(params['language'], supported_languages, language_aliases).lower()

    params['cookies']['SRCHHPGUSR'] = \
        'ADLT=' + safesearch_types.get(params['safesearch'], 'DEMOTE')
+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ def request(query, params):
        'ADLT=' + safesearch_types.get(params['safesearch'], 'DEMOTE')

    # language cookie
    language = match_language(params['language'], supported_languages).lower()
    language = match_language(params['language'], supported_languages, language_aliases).lower()
    params['cookies']['_EDGE_S'] = 'mkt=' + language + '&F=1'

    # query and paging
+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ def extract_text_from_dom(result, xpath):
def request(query, params):
    offset = (params['pageno'] - 1) * 10

    language = match_language(params['language'], supported_languages)
    language = match_language(params['language'], supported_languages, language_aliases)
    language_array = language.split('-')
    if params['language'].find('-') > 0:
        country = params['language'].split('-')[1]
+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ def request(query, params):
    params['url'] = search_url.format(query=urlencode({'q': query}),
                                      search_options=urlencode(search_options))

    language = match_language(params['language'], supported_languages).split('-')[0]
    language = match_language(params['language'], supported_languages, language_aliases).split('-')[0]
    if language:
        params['url'] += '&lr=lang_' + language

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ def request(query, params):
                                   offset=offset)

    # add language tag
    language = match_language(params['language'], supported_languages)
    language = match_language(params['language'], supported_languages, language_aliases)
    params['url'] += '&locale=' + language.replace('-', '_').lower()

    return params
Loading