Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
e
infra
spot
Commits
97351a2c
Commit
97351a2c
authored
Jan 07, 2019
by
Noémi Ványi
Browse files
fix after rebase
parent
b63d645a
Changes
2
Hide whitespace changes
Inline
Side-by-side
searx/engines/wikipedia.py
View file @
97351a2c
...
@@ -32,7 +32,7 @@ supported_languages_url = 'https://meta.wikimedia.org/wiki/List_of_Wikipedias'
...
@@ -32,7 +32,7 @@ supported_languages_url = 'https://meta.wikimedia.org/wiki/List_of_Wikipedias'
# set language in base_url
# set language in base_url
def
url_lang
(
lang
):
def
url_lang
(
lang
):
lang_pre
=
lang
.
split
(
'-'
)[
0
]
lang_pre
=
lang
.
split
(
'-'
)[
0
]
if
lang_pre
==
'all'
or
lang_pre
not
in
supported_languages
:
if
lang_pre
==
'all'
or
lang_pre
not
in
supported_languages
and
lang_pre
not
in
language_aliases
:
return
'en'
return
'en'
return
match_language
(
lang
,
supported_languages
,
language_aliases
).
split
(
'-'
)[
0
]
return
match_language
(
lang
,
supported_languages
,
language_aliases
).
split
(
'-'
)[
0
]
...
...
tests/unit/engines/test_wikipedia.py
View file @
97351a2c
...
@@ -26,15 +26,12 @@ class TestWikipediaEngine(SearxTestCase):
...
@@ -26,15 +26,12 @@ class TestWikipediaEngine(SearxTestCase):
self
.
assertIn
(
'Test_Query'
,
params
[
'url'
])
self
.
assertIn
(
'Test_Query'
,
params
[
'url'
])
self
.
assertNotIn
(
'test_query'
,
params
[
'url'
])
self
.
assertNotIn
(
'test_query'
,
params
[
'url'
])
<<<<<<<
HEAD
dicto
[
'language'
]
=
'nb'
dicto
[
'language'
]
=
'nb'
params
=
wikipedia
.
request
(
query
,
dicto
)
params
=
wikipedia
.
request
(
query
,
dicto
)
self
.
assertIn
(
'no.wikipedia.org'
,
params
[
'url'
])
self
.
assertIn
(
'no.wikipedia.org'
,
params
[
'url'
])
=======
dicto
[
'language'
]
=
'all'
dicto
[
'language'
]
=
'all'
params
=
wikipedia
.
request
(
query
,
dicto
)
params
=
wikipedia
.
request
(
query
,
dicto
)
self
.
assertIn
(
'en'
,
params
[
'url'
])
self
.
assertIn
(
'en'
,
params
[
'url'
])
>>>>>>>
Revert
"remove 'all' option from search languages"
dicto
[
'language'
]
=
'xx'
dicto
[
'language'
]
=
'xx'
params
=
wikipedia
.
request
(
query
,
dicto
)
params
=
wikipedia
.
request
(
query
,
dicto
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment