diff options
| -rw-r--r-- | requirements-dev.txt | 4 | ||||
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | searx/engines/duckduckgo.py | 6 | ||||
| -rw-r--r-- | searx/translations/el_GR/LC_MESSAGES/messages.mo | bin | 25189 -> 25279 bytes | |||
| -rw-r--r-- | searx/translations/el_GR/LC_MESSAGES/messages.po | 17 | ||||
| -rw-r--r-- | searx/translations/pl/LC_MESSAGES/messages.mo | bin | 18876 -> 18845 bytes | |||
| -rw-r--r-- | searx/translations/pl/LC_MESSAGES/messages.po | 26 | ||||
| -rw-r--r-- | searx/translations/pt/LC_MESSAGES/messages.mo | bin | 17049 -> 17438 bytes | |||
| -rw-r--r-- | searx/translations/pt/LC_MESSAGES/messages.po | 19 | ||||
| -rw-r--r-- | searx/version.py | 5 |
10 files changed, 44 insertions, 37 deletions
diff --git a/requirements-dev.txt b/requirements-dev.txt index 5bc333983..c9311784c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,9 +2,9 @@ mock==5.0.2 nose2[coverage_plugin]==0.13.0 cov-core==1.15.0 black==22.12.0 -pylint==2.17.3 +pylint==2.17.4 splinter==0.19.0 -selenium==4.9.0 +selenium==4.9.1 twine==4.0.2 Pallets-Sphinx-Themes==2.1.0 Sphinx==6.2.1 diff --git a/requirements.txt b/requirements.txt index 6c718c1a3..4c4a1356e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -certifi==2022.12.7 +certifi==2023.5.7 babel==2.12.1 flask-babel==3.1.0 flask==2.3.2 @@ -12,7 +12,7 @@ Brotli==1.0.9 uvloop==0.17.0 httpx-socks[asyncio]==0.7.2 setproctitle==1.3.2 -redis==4.5.4 +redis==4.5.5 markdown-it-py==2.2.0 typing_extensions==4.5.0 fasttext-predict==0.9.2.1 diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py index 4dd23c759..d37e28c2d 100644 --- a/searx/engines/duckduckgo.py +++ b/searx/engines/duckduckgo.py @@ -94,12 +94,12 @@ def get_vqd(query, headers): logger.debug("re-use cached vqd value: %s", value) return value - query_url = 'https://duckduckgo.com/?{query}&iar=images'.format(query=urlencode({'q': query})) + query_url = 'https://duckduckgo.com/?q={query}&atb=v290-5'.format(query=urlencode({'q': query})) res = network.get(query_url, headers=headers) content = res.text - if content.find('vqd=\'') == -1: + if content.find('vqd=\"') == -1: raise SearxEngineAPIException('Request failed') - value = content[content.find('vqd=\'') + 5 :] + value = content[content.find('vqd=\"') + 5 :] value = value[: value.find('\'')] logger.debug("new vqd value: %s", value) cache_vqd(query, value) diff --git a/searx/translations/el_GR/LC_MESSAGES/messages.mo b/searx/translations/el_GR/LC_MESSAGES/messages.mo Binary files differindex 94f65aa2f..3fd7a086d 100644 --- a/searx/translations/el_GR/LC_MESSAGES/messages.mo +++ b/searx/translations/el_GR/LC_MESSAGES/messages.mo diff --git a/searx/translations/el_GR/LC_MESSAGES/messages.po b/searx/translations/el_GR/LC_MESSAGES/messages.po index f09744635..0f20614d2 100644 --- a/searx/translations/el_GR/LC_MESSAGES/messages.po +++ b/searx/translations/el_GR/LC_MESSAGES/messages.po @@ -9,26 +9,28 @@ # Constantine Giannopoulos <K.Giannopoulos@acg.edu>, 2022. # Alexandre Flament <alex@al-f.net>, 2022. # return42 <markus.heiser@darmarit.de>, 2023. +# KDesp73 <kdesp2003@gmail.com>, 2023. msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2023-04-08 09:24+0000\n" -"PO-Revision-Date: 2023-03-24 07:07+0000\n" -"Last-Translator: return42 <markus.heiser@darmarit.de>\n" +"PO-Revision-Date: 2023-05-09 05:37+0000\n" +"Last-Translator: KDesp73 <kdesp2003@gmail.com>\n" +"Language-Team: Greek <https://translate.codeberg.org/projects/searxng/" +"searxng/el/>\n" "Language: el_GR\n" -"Language-Team: Greek " -"<https://translate.codeberg.org/projects/searxng/searxng/el/>\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" "Generated-By: Babel 2.12.1\n" #. CONSTANT_NAMES['NO_SUBGROUPING'] #: searx/searxng.msg msgid "without further subgrouping" -msgstr "" +msgstr "χωρίς περαιτέρω ομαδοποίηση" #. CONSTANT_NAMES['DEFAULT_CATEGORY'] #: searx/searxng.msg @@ -1588,4 +1590,3 @@ msgstr "απόκρυψη βίντεο" #~ msgid "!bang" #~ msgstr "" - diff --git a/searx/translations/pl/LC_MESSAGES/messages.mo b/searx/translations/pl/LC_MESSAGES/messages.mo Binary files differindex 638efbaf2..a3a2df5e1 100644 --- a/searx/translations/pl/LC_MESSAGES/messages.mo +++ b/searx/translations/pl/LC_MESSAGES/messages.mo diff --git a/searx/translations/pl/LC_MESSAGES/messages.po b/searx/translations/pl/LC_MESSAGES/messages.po index 32489a975..19663fda4 100644 --- a/searx/translations/pl/LC_MESSAGES/messages.po +++ b/searx/translations/pl/LC_MESSAGES/messages.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2023-04-08 09:24+0000\n" -"PO-Revision-Date: 2023-04-11 16:37+0000\n" -"Last-Translator: Eryk Michalak <gnu.ewm@protonmail.com>\n" +"PO-Revision-Date: 2023-05-09 05:37+0000\n" +"Last-Translator: return42 <markus.heiser@darmarit.de>\n" "Language-Team: Polish <https://translate.codeberg.org/projects/searxng/" "searxng/pl/>\n" "Language: pl\n" @@ -25,7 +25,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (" "n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && " "n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -"X-Generator: Weblate 4.16.4\n" +"X-Generator: Weblate 4.17\n" "Generated-By: Babel 2.12.1\n" #. CONSTANT_NAMES['NO_SUBGROUPING'] @@ -66,12 +66,12 @@ msgstr "zdjęcia" #. CATEGORY_NAMES['VIDEOS'] #: searx/searxng.msg msgid "videos" -msgstr "wideo" +msgstr "filmy" #. CATEGORY_NAMES['IT'] #: searx/searxng.msg msgid "it" -msgstr "informatyka" +msgstr "it" #. CATEGORY_NAMES['NEWS'] #: searx/searxng.msg @@ -126,7 +126,7 @@ msgstr "repozytoria" #. CATEGORY_GROUPS['SOFTWARE_WIKIS'] #: searx/searxng.msg msgid "software wikis" -msgstr "dokumentacja aplikacji" +msgstr "dokumentacje aplikacji" #. CATEGORY_GROUPS['WEB'] #: searx/searxng.msg @@ -155,7 +155,7 @@ msgstr "ciemny" #: searx/webapp.py:165 msgid "timeout" -msgstr "przekroczenie maksymalnego dozwolonego czasu" +msgstr "przekroczenie dozwolonego czasu" #: searx/webapp.py:166 msgid "parsing error" @@ -220,7 +220,7 @@ msgstr "Błąd wczytywania następnej strony" #: searx/webapp.py:527 searx/webapp.py:965 msgid "Invalid settings, please edit your preferences" -msgstr "Nieprawidłowe ustawienia, proszę zmienić swoje preferencje" +msgstr "Nieprawidłowe ustawienia, zmień swoje preferencje" #: searx/webapp.py:543 msgid "Invalid settings" @@ -306,7 +306,7 @@ msgstr "Nie można pobrać obrazu." #: searx/engines/wttr.py:101 msgid "Morning" -msgstr "Poranek" +msgstr "Rano" #: searx/engines/wttr.py:101 msgid "Noon" @@ -314,7 +314,7 @@ msgstr "Południe" #: searx/engines/wttr.py:101 msgid "Evening" -msgstr "Wieczór" +msgstr "Wieczorem" #: searx/engines/wttr.py:101 msgid "Night" @@ -403,11 +403,11 @@ msgstr "" #: searx/plugins/tor_check.py:86 msgid "You are not using Tor and you have this external IP address: {ip_address}" -msgstr "Nie używasz Tora i masz ten zewnętrzny adres IP: {ip_address}" +msgstr "Nie używasz Tora. Posiadasz ten zewnętrzny adres IP: {ip_address}" #: searx/plugins/tracker_url_remover.py:29 msgid "Tracker URL remover" -msgstr "Usuwanie elementów śledzących z URL-ów" +msgstr "Usuwanie elementów śledzących z linków" #: searx/plugins/tracker_url_remover.py:30 msgid "Remove trackers arguments from the returned URL" @@ -802,7 +802,7 @@ msgstr "Nazwa wyszukiwarki" #: searx/templates/simple/preferences.html:313 msgid "Bang" -msgstr "Bang" +msgstr "!bang" #: searx/templates/simple/preferences.html:314 msgid "Supports selected language" diff --git a/searx/translations/pt/LC_MESSAGES/messages.mo b/searx/translations/pt/LC_MESSAGES/messages.mo Binary files differindex 11f2a0681..bb3f3e277 100644 --- a/searx/translations/pt/LC_MESSAGES/messages.mo +++ b/searx/translations/pt/LC_MESSAGES/messages.mo diff --git a/searx/translations/pt/LC_MESSAGES/messages.po b/searx/translations/pt/LC_MESSAGES/messages.po index 90c8b1c60..ec736e94e 100644 --- a/searx/translations/pt/LC_MESSAGES/messages.po +++ b/searx/translations/pt/LC_MESSAGES/messages.po @@ -10,26 +10,28 @@ # Ricardo Simões <xmcorporation@gmail.com>, 2022. # zaioti <zaioti@tuta.io>, 2022. # Alexandre Flament <alex@al-f.net>, 2022. +# return42 <markus.heiser@darmarit.de>, 2023. msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2023-04-08 09:24+0000\n" -"PO-Revision-Date: 2023-01-13 07:14+0000\n" -"Last-Translator: Markus Heiser <markus.heiser@darmarit.de>\n" +"PO-Revision-Date: 2023-05-11 17:37+0000\n" +"Last-Translator: return42 <markus.heiser@darmarit.de>\n" +"Language-Team: Portuguese <https://translate.codeberg.org/projects/searxng/" +"searxng/pt/>\n" "Language: pt\n" -"Language-Team: Portuguese " -"<https://weblate.bubu1.eu/projects/searxng/searxng/pt/>\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Weblate 4.17\n" "Generated-By: Babel 2.12.1\n" #. CONSTANT_NAMES['NO_SUBGROUPING'] #: searx/searxng.msg msgid "without further subgrouping" -msgstr "" +msgstr "sem subagrupamento adicional" #. CONSTANT_NAMES['DEFAULT_CATEGORY'] #: searx/searxng.msg @@ -382,6 +384,8 @@ msgid "" "This plugin checks if the address of the request is a Tor exit-node, and " "informs the user if it is; like check.torproject.org, but from SearXNG." msgstr "" +"Este plug-in verifica se o endereço da solicitação é um nó de saída do Tor e " +"informa ao usuário se for; como check.torproject.org, mas de SearXNG." #: searx/plugins/tor_check.py:62 msgid "" @@ -1579,4 +1583,3 @@ msgstr "esconder vídeo" #~ msgid "!bang" #~ msgstr "" - diff --git a/searx/version.py b/searx/version.py index 9f3de38e9..7a368e366 100644 --- a/searx/version.py +++ b/searx/version.py @@ -59,7 +59,10 @@ def get_git_url_and_branch(): def get_git_version(): - git_commit_date_hash = subprocess_run(r"git show -s --date='format:%-Y.%-m.%-d' --format='%cd+%h'") + git_commit_date_hash = subprocess_run(r"git show -s --date='format:%Y.%m.%d' --format='%cd+%h'") + # Remove leading zero from minor and patch level / replacement of PR-2122 + # which depended on the git version: '2023.05.06+..' --> '2023.5.6+..' + git_commit_date_hash = git_commit_date_hash.replace('.0', '.') tag_version = git_version = git_commit_date_hash # add "+dirty" suffix if there are uncommited changes except searx/settings.yml |