Merge 766823a64b into dfaf5868e2

2024-11-12 07:36:38 +01:00
10 changed files with 68 additions and 79 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,7 +1,7 @@
 certifi==2024.8.30
 babel==2.16.0
 flask-babel==4.0.0
-flask==3.1.0
+flask==3.0.3
 jinja2==3.1.4
 lxml==5.3.0
 pygments==2.18.0
--- a/searx/engines/duckduckgo.py
+++ b/searx/engines/duckduckgo.py
@ -245,12 +245,10 @@ def request(query, params):
    # Advanced search syntax ends in CAPTCHA
    # https://duckduckgo.com/duckduckgo-help-pages/results/syntax/
-    query = " ".join(
+    query = [
-        [
+        x.removeprefix("site:").removeprefix("intitle:").removeprefix("inurl:").removeprefix("filetype:")
-            x.removeprefix("site:").removeprefix("intitle:").removeprefix("inurl:").removeprefix("filetype:")
+        for x in query.split()
-            for x in query.split()
+    ]
        ]
    )
    eng_region = traits.get_region(params['searxng_locale'], traits.all_locale)
    if eng_region == "wt-wt":
        # https://html.duckduckgo.com/html sets an empty value for "all".
@ -381,11 +379,7 @@ def response(resp):
    zero_click_info_xpath = '//div[@id="zero_click_abstract"]'
    zero_click = extract_text(eval_xpath(doc, zero_click_info_xpath)).strip()
-    if zero_click and (
+    if zero_click and "Your IP address is" not in zero_click and "Your user agent:" not in zero_click:
        "Your IP address is" not in zero_click
        and "Your user agent:" not in zero_click
        and "URL Decoded:" not in zero_click
    ):
        current_query = resp.search_params["data"].get("q")
        results.append(
--- a/searx/translations/es/LC_MESSAGES/messages.mo
+++ b/searx/translations/es/LC_MESSAGES/messages.mo
--- a/searx/translations/es/LC_MESSAGES/messages.po
+++ b/searx/translations/es/LC_MESSAGES/messages.po
@ -39,7 +39,7 @@ msgstr ""
 "Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-11-14 14:07+0000\n"
+"PO-Revision-Date: 2024-11-03 09:08+0000\n"
 "Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
 "Language-Team: Spanish <https://translate.codeberg.org/projects/searxng/"
 "searxng/es/>\n"
@ -1249,7 +1249,7 @@ msgstr "Buscador de favicon"
 #: searx/templates/simple/preferences/favicon.html:15
 msgid "Display favicons near search results"
-msgstr "Mostrar los favicons al lado de los resultados de búsqueda"
+msgstr ""
 #: searx/templates/simple/preferences/footer.html:2
 msgid ""
--- a/searx/translations/it/LC_MESSAGES/messages.mo
+++ b/searx/translations/it/LC_MESSAGES/messages.mo
--- a/searx/translations/it/LC_MESSAGES/messages.po
+++ b/searx/translations/it/LC_MESSAGES/messages.po
@ -28,14 +28,13 @@
 # unoyoa <unoyoa@users.noreply.translate.codeberg.org>, 2024.
 # tiziodcaio <tiziodcaio@users.noreply.translate.codeberg.org>, 2024.
 # Fabio_Perri <Fabio_Perri@users.noreply.translate.codeberg.org>, 2024.
 # lrnz2 <lrnz2@users.noreply.translate.codeberg.org>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-11-14 02:16+0000\n"
+"PO-Revision-Date: 2024-10-08 13:41+0000\n"
-"Last-Translator: lrnz2 <lrnz2@users.noreply.translate.codeberg.org>\n"
+"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
 "Language-Team: Italian <https://translate.codeberg.org/projects/searxng/"
 "searxng/it/>\n"
 "Language: it\n"
@ -43,13 +42,13 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8.1\n"
+"X-Generator: Weblate 5.7.2\n"
 "Generated-By: Babel 2.16.0\n"
 #. CONSTANT_NAMES['NO_SUBGROUPING']
 #: searx/searxng.msg
 msgid "without further subgrouping"
-msgstr "senza altri sottogruppamenti"
+msgstr "senza altri sottogruppi"
 #. CONSTANT_NAMES['DEFAULT_CATEGORY']
 #: searx/searxng.msg
@ -74,7 +73,7 @@ msgstr "musica"
 #. CATEGORY_NAMES['SOCIAL_MEDIA']
 #: searx/searxng.msg
 msgid "social media"
-msgstr "social media"
+msgstr "social"
 #. CATEGORY_NAMES['IMAGES']
 #: searx/searxng.msg
@ -114,7 +113,7 @@ msgstr "mappa"
 #. CATEGORY_NAMES['ONIONS']
 #: searx/searxng.msg
 msgid "onions"
-msgstr "cipolle"
+msgstr "onion"
 #. CATEGORY_NAMES['SCIENCE']
 #: searx/searxng.msg
@ -134,7 +133,7 @@ msgstr "dizionari"
 #. CATEGORY_GROUPS['LYRICS']
 #: searx/searxng.msg
 msgid "lyrics"
-msgstr "testo musicale"
+msgstr "testi musicali"
 #. CATEGORY_GROUPS['PACKAGES']
 #: searx/searxng.msg
@ -149,12 +148,12 @@ msgstr "d&r"
 #. CATEGORY_GROUPS['REPOS']
 #: searx/searxng.msg
 msgid "repos"
-msgstr "repos"
+msgstr "ripostigli"
 #. CATEGORY_GROUPS['SOFTWARE_WIKIS']
 #: searx/searxng.msg
 msgid "software wikis"
-msgstr "wiki del software"
+msgstr "wiki software"
 #. CATEGORY_GROUPS['WEB']
 #: searx/searxng.msg
@ -194,7 +193,7 @@ msgstr "Tempo di attività"
 #. BRAND_CUSTOM_LINKS['ABOUT']
 #: searx/searxng.msg searx/templates/simple/base.html:50
 msgid "About"
-msgstr "Al riguardo"
+msgstr "A proposito"
 #. WEATHER_TERMS['AVERAGE TEMP.']
 #: searx/engines/wttr.py:32 searx/searxng.msg
--- a/searx/translations/nb_NO/LC_MESSAGES/messages.mo
+++ b/searx/translations/nb_NO/LC_MESSAGES/messages.mo
--- a/searx/translations/nb_NO/LC_MESSAGES/messages.po
+++ b/searx/translations/nb_NO/LC_MESSAGES/messages.po
@ -11,14 +11,13 @@
 # omfj <omfj@users.noreply.translate.codeberg.org>, 2024.
 # combwizard <combwizard@users.noreply.translate.codeberg.org>, 2024.
 # laaknor <laaknor@users.noreply.translate.codeberg.org>, 2024.
 # Aadniz <Aadniz@users.noreply.translate.codeberg.org>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-11-09 12:07+0000\n"
+"PO-Revision-Date: 2024-11-03 09:08+0000\n"
-"Last-Translator: Aadniz <Aadniz@users.noreply.translate.codeberg.org>\n"
+"Last-Translator: laaknor <laaknor@users.noreply.translate.codeberg.org>\n"
 "Language-Team: Norwegian Bokmål <https://translate.codeberg.org/projects/"
 "searxng/searxng/nb_NO/>\n"
 "Language: nb_NO\n"
@ -193,13 +192,13 @@ msgstr "Skydekke"
 #: searx/engines/duckduckgo_weather.py:45 searx/engines/wttr.py:51
 #: searx/searxng.msg
 msgid "Condition"
-msgstr "Betingelse"
+msgstr ""
 #. WEATHER_TERMS['CURRENT CONDITION']
 #: searx/engines/duckduckgo_weather.py:118 searx/engines/wttr.py:104
 #: searx/searxng.msg
 msgid "Current condition"
-msgstr "Nåværende betingelse"
+msgstr ""
 #. WEATHER_TERMS['EVENING']
 #: searx/engines/wttr.py:100 searx/searxng.msg
@ -222,13 +221,13 @@ msgstr "Luftfuktighet"
 #: searx/engines/duckduckgo_weather.py:77 searx/engines/wttr.py:34
 #: searx/searxng.msg
 msgid "Max temp."
-msgstr "Maks temp."
+msgstr ""
 #. WEATHER_TERMS['MIN TEMP.']
 #: searx/engines/duckduckgo_weather.py:73 searx/engines/wttr.py:33
 #: searx/searxng.msg
 msgid "Min temp."
-msgstr "Min temp."
+msgstr ""
 #. WEATHER_TERMS['MORNING']
 #: searx/engines/wttr.py:100 searx/searxng.msg
@ -335,17 +334,17 @@ msgstr "opphavsmann"
 #. SOCIAL_MEDIA_TERMS['THREAD OPEN']
 #: searx/engines/discourse.py:149 searx/searxng.msg
 msgid "open"
-msgstr "åpen"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['THREAD CLOSED']
 #: searx/engines/discourse.py:149 searx/searxng.msg
 msgid "closed"
-msgstr "lukket"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['THREAD ANSWERED']
 #: searx/engines/discourse.py:160 searx/searxng.msg
 msgid "answered"
-msgstr "svart på"
+msgstr ""
 #: searx/webapp.py:332
 msgid "No item found"
@ -422,7 +421,7 @@ msgstr "tilgang nektet"
 #: searx/webutils.py:60
 msgid "server API error"
-msgstr "server API feil"
+msgstr "Tjener-API-feil"
 #: searx/webutils.py:79
 msgid "Suspended"
@ -454,7 +453,7 @@ msgstr "Regn ut {functions} av parameterne"
 #: searx/engines/mozhi.py:57
 msgid "Synonyms"
-msgstr "Synonymer"
+msgstr ""
 #: searx/engines/openstreetmap.py:159
 msgid "Get directions"
@ -529,7 +528,7 @@ msgstr "Filkvalitet"
 #: searx/plugins/calculator.py:14
 msgid "Calculate mathematical expressions via the search bar"
-msgstr "Kalkuler matematiske uttrykk via søkebaren"
+msgstr ""
 #: searx/plugins/hash_plugin.py:10
 msgid "Converts strings to different hash digests."
@ -573,7 +572,7 @@ msgstr ""
 #: searx/plugins/self_info.py:28
 msgid "Your IP is: "
-msgstr "Din IP er "
+msgstr ""
 #: searx/plugins/self_info.py:31
 msgid "Your user-agent is: "
@ -581,16 +580,16 @@ msgstr ""
 #: searx/plugins/tor_check.py:24
 msgid "Tor check plugin"
-msgstr "Tor sjekking plugin"
+msgstr "Tor sjekk pluggin"
 #: searx/plugins/tor_check.py:27
 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 ""
-"Denne plugin-en sjekker om adressen til forespørselen er en Tor utgangsnode, "
+"Denne plugin sjekker om adressen til forespørselen er en Tor utgangsnode,"
-"og informerer brukeren om den er det; slik som check.torproject.org gjør, "
+" og informerer brukeren om den er det; som check.torproject.org, men fra "
-"men fra SearXNG."
+"SearXNG."
 #: searx/plugins/tor_check.py:61
 msgid ""
@ -622,7 +621,7 @@ msgstr "Fjern sporer-argumenter fra returnert nettadresse"
 #: searx/plugins/unit_converter.py:29
 msgid "Convert between units"
-msgstr "Konverter mellom forskjellige enheter"
+msgstr ""
 #: searx/templates/simple/404.html:4
 msgid "Page not found"
@ -689,7 +688,7 @@ msgstr "Lengde"
 #: searx/templates/simple/macros.html:41
 msgid "Views"
-msgstr "Visninger"
+msgstr ""
 #: searx/templates/simple/macros.html:42
 #: searx/templates/simple/result_templates/files.html:34
@ -947,7 +946,7 @@ msgstr "Meldinger fra søkemotorene"
 #: searx/templates/simple/elements/engines_msg.html:7
 msgid "seconds"
-msgstr "sekunder"
+msgstr ""
 #: searx/templates/simple/elements/search_url.html:3
 msgid "Search URL"
@ -1069,7 +1068,7 @@ msgstr "Bytt til en annen instans:"
 #: searx/templates/simple/messages/no_results.html:24
 msgid "Search for another query or select another category."
-msgstr "Oppgi et annet søkeord eller velg en annen kategori."
+msgstr ""
 #: searx/templates/simple/messages/no_results.html:25
 msgid "Go back to the previous page using the previous page button."
@ -1195,11 +1194,11 @@ msgstr ""
 #: searx/templates/simple/preferences/engines.html:15
 msgid "Enable all"
-msgstr "Aktiver alle"
+msgstr ""
 #: searx/templates/simple/preferences/engines.html:16
 msgid "Disable all"
-msgstr "Deaktiver alle"
+msgstr ""
 #: searx/templates/simple/preferences/engines.html:25
 msgid "!bang"
--- a/searx/translations/vi/LC_MESSAGES/messages.mo
+++ b/searx/translations/vi/LC_MESSAGES/messages.mo
--- a/searx/translations/vi/LC_MESSAGES/messages.po
+++ b/searx/translations/vi/LC_MESSAGES/messages.po
@ -10,14 +10,13 @@
 # return42 <return42@users.noreply.translate.codeberg.org>, 2024.
 # vducong <vducong@users.noreply.translate.codeberg.org>, 2024.
 # tvminh19 <tvminh19@users.noreply.translate.codeberg.org>, 2024.
 # KhietVo <KhietVo@users.noreply.translate.codeberg.org>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-10-05 06:24+0000\n"
-"PO-Revision-Date: 2024-11-14 14:07+0000\n"
+"PO-Revision-Date: 2024-10-26 21:13+0000\n"
-"Last-Translator: KhietVo <KhietVo@users.noreply.translate.codeberg.org>\n"
+"Last-Translator: return42 <return42@users.noreply.translate.codeberg.org>\n"
 "Language-Team: Vietnamese <https://translate.codeberg.org/projects/searxng/"
 "searxng/vi/>\n"
 "Language: vi\n"
@ -167,7 +166,7 @@ msgstr "Tối"
 #. STYLE_NAMES['BLACK']
 #: searx/searxng.msg
 msgid "black"
-msgstr "màu đen"
+msgstr ""
 #. BRAND_CUSTOM_LINKS['UPTIME']
 #: searx/searxng.msg
@ -199,7 +198,7 @@ msgstr "Điều kiện"
 #: searx/engines/duckduckgo_weather.py:118 searx/engines/wttr.py:104
 #: searx/searxng.msg
 msgid "Current condition"
-msgstr "tình hình hiện tại"
+msgstr ""
 #. WEATHER_TERMS['EVENING']
 #: searx/engines/wttr.py:100 searx/searxng.msg
@ -210,25 +209,25 @@ msgstr "Buổi chiều"
 #: searx/engines/duckduckgo_weather.py:53 searx/engines/open_meteo.py:81
 #: searx/engines/wttr.py:59 searx/searxng.msg
 msgid "Feels like"
-msgstr "Cảm thấy"
+msgstr ""
 #. WEATHER_TERMS['HUMIDITY']
 #: searx/engines/duckduckgo_weather.py:64 searx/engines/open_meteo.py:93
 #: searx/engines/wttr.py:68 searx/searxng.msg
 msgid "Humidity"
-msgstr "Độ ẩm"
+msgstr ""
 #. WEATHER_TERMS['MAX TEMP.']
 #: searx/engines/duckduckgo_weather.py:77 searx/engines/wttr.py:34
 #: searx/searxng.msg
 msgid "Max temp."
-msgstr "Nhiệt độ tối đa"
+msgstr ""
 #. WEATHER_TERMS['MIN TEMP.']
 #: searx/engines/duckduckgo_weather.py:73 searx/engines/wttr.py:33
 #: searx/searxng.msg
 msgid "Min temp."
-msgstr "Nhiệt độ thấp nhất"
+msgstr ""
 #. WEATHER_TERMS['MORNING']
 #: searx/engines/wttr.py:100 searx/searxng.msg
@ -248,37 +247,37 @@ msgstr "Buổi trưa"
 #. WEATHER_TERMS['PRESSURE']
 #: searx/engines/open_meteo.py:95 searx/searxng.msg
 msgid "Pressure"
-msgstr "Áp suất"
+msgstr ""
 #. WEATHER_TERMS['SUNRISE']
 #: searx/engines/duckduckgo_weather.py:81 searx/engines/wttr.py:36
 #: searx/searxng.msg
 msgid "Sunrise"
-msgstr "Mặt trời mọc"
+msgstr ""
 #. WEATHER_TERMS['SUNSET']
 #: searx/engines/duckduckgo_weather.py:82 searx/engines/wttr.py:37
 #: searx/searxng.msg
 msgid "Sunset"
-msgstr "mặt trời lặn"
+msgstr ""
 #. WEATHER_TERMS['TEMPERATURE']
 #: searx/engines/duckduckgo_weather.py:48 searx/engines/open_meteo.py:76
 #: searx/engines/wttr.py:55 searx/searxng.msg
 msgid "Temperature"
-msgstr "Nhiệt độ"
+msgstr ""
 #. WEATHER_TERMS['UV INDEX']
 #: searx/engines/duckduckgo_weather.py:80 searx/engines/wttr.py:35
 #: searx/searxng.msg
 msgid "UV index"
-msgstr "Chỉ số UV"
+msgstr ""
 #. WEATHER_TERMS['VISIBILITY']
 #: searx/engines/duckduckgo_weather.py:62 searx/engines/wttr.py:66
 #: searx/searxng.msg
 msgid "Visibility"
-msgstr "Tầm nhìn"
+msgstr ""
 #. WEATHER_TERMS['WIND']
 #: searx/engines/duckduckgo_weather.py:58 searx/engines/open_meteo.py:86
@ -289,12 +288,12 @@ msgstr "Gió"
 #. SOCIAL_MEDIA_TERMS['SUBSCRIBERS']
 #: searx/engines/lemmy.py:85 searx/searxng.msg
 msgid "subscribers"
-msgstr "người đăng ký"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['POSTS']
 #: searx/engines/lemmy.py:86 searx/searxng.msg
 msgid "posts"
-msgstr "những bài đăng"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['ACTIVE USERS']
 #: searx/engines/lemmy.py:87 searx/searxng.msg
@ -310,42 +309,42 @@ msgstr ""
 #. SOCIAL_MEDIA_TERMS['USER']
 #: searx/engines/lemmy.py:129 searx/engines/lemmy.py:164 searx/searxng.msg
 msgid "user"
-msgstr "người dùng"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['COMMUNITY']
 #: searx/engines/lemmy.py:131 searx/engines/lemmy.py:165 searx/searxng.msg
 msgid "community"
-msgstr "cộng đồng"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['POINTS']
 #: searx/engines/hackernews.py:78 searx/searxng.msg
 msgid "points"
-msgstr "điểm"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['TITLE']
 #: searx/searxng.msg
 msgid "title"
-msgstr "tiêu đề"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['AUTHOR']
 #: searx/engines/hackernews.py:81 searx/searxng.msg
 msgid "author"
-msgstr "tác giả"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['THREAD OPEN']
 #: searx/engines/discourse.py:149 searx/searxng.msg
 msgid "open"
-msgstr "mở"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['THREAD CLOSED']
 #: searx/engines/discourse.py:149 searx/searxng.msg
 msgid "closed"
-msgstr "đóng"
+msgstr ""
 #. SOCIAL_MEDIA_TERMS['THREAD ANSWERED']
 #: searx/engines/discourse.py:160 searx/searxng.msg
 msgid "answered"
-msgstr "đã trả lời"
+msgstr ""
 #: searx/webapp.py:332
 msgid "No item found"
@ -530,7 +529,7 @@ msgstr "Chất lượng tệp"
 #: searx/plugins/calculator.py:14
 msgid "Calculate mathematical expressions via the search bar"
-msgstr "Tính toán bằng thanh tìm kiếm"
+msgstr ""
 #: searx/plugins/hash_plugin.py:10
 msgid "Converts strings to different hash digests."
@ -541,14 +540,12 @@ msgid "hash digest"
 msgstr "hash băm"
 #: searx/plugins/hostnames.py:103
 #, fuzzy
 msgid "Hostnames plugin"
-msgstr "Mấy chủ bổ trợ"
+msgstr ""
 #: searx/plugins/hostnames.py:104
 msgid "Rewrite hostnames, remove results or prioritize them based on the hostname"
 msgstr ""
 "Viết lại máy chủ, xoá các kểt quả tìm kiếm hoặc sắp xếp dựa trên máy chủ"
 #: searx/plugins/oa_doi_rewrite.py:12
 msgid "Open Access DOI rewrite"
@ -574,7 +571,7 @@ msgstr "Hiện IP của bạn khi gõ \"ip\" và hiện user agent khi gõ \"use
 #: searx/plugins/self_info.py:28
 msgid "Your IP is: "
-msgstr "Địa chỉ IP của bạn: "
+msgstr ""
 #: searx/plugins/self_info.py:31
 msgid "Your user-agent is: "