Merge pull request #2069 from llmII/feat-pagination-numbered

Feature: Support numbered pagination.

.gitignore

@@ -21,3 +21,5 @@ gh-pages/
 /node_modules/
 
 .idea/
+
+searx/version_frozen.py

.weblate

@@ -1,3 +1,3 @@
 [weblate]
-url = https://weblate.bubu1.eu/api/
+url = https://translate.codeberg.org/api/
 translation = searxng/searxng

AUTHORS.rst

@@ -166,4 +166,5 @@ features or generally made searx better:
 - Sam A. `<https://samsapti.dev>`_
 - @XavierHorwood
 - Ahmad Alkadri `<https://github.com/ahmad-alkadri>`_
-- Milad Laly @Milad-Laly
+- Milad Laly @Milad-Laly
+- @llmII

Dockerfile

@@ -65,6 +65,7 @@ RUN su searxng -c "/usr/bin/python3 -m compileall -q searx" \
 ARG LABEL_DATE=
 ARG GIT_URL=unknown
 ARG SEARXNG_GIT_VERSION=unknown
+ARG SEARXNG_DOCKER_TAG=unknown
 ARG LABEL_VCS_REF=
 ARG LABEL_VCS_URL=
 LABEL maintainer="searxng <${GIT_URL}>" \
@@ -79,7 +80,7 @@ LABEL maintainer="searxng <${GIT_URL}>" \
       org.label-schema.build-date="${LABEL_DATE}" \
       org.label-schema.usage="https://github.com/searxng/searxng-docker" \
       org.opencontainers.image.title="searxng" \
-      org.opencontainers.image.version="${SEARXNG_GIT_VERSION}" \
+      org.opencontainers.image.version="${SEARXNG_DOCKER_TAG}" \
       org.opencontainers.image.url="${LABEL_VCS_URL}" \
       org.opencontainers.image.revision=${LABEL_VCS_REF} \
       org.opencontainers.image.source=${LABEL_VCS_URL} \

README.rst

@@ -59,8 +59,8 @@ our homepage_.
 .. |commits| image:: https://img.shields.io/github/commit-activity/y/searxng/searxng?color=yellow&label=commits
    :target: https://github.com/searxng/searxng/commits/master
 
-.. |weblate| image:: https://weblate.bubu1.eu/widgets/searxng/-/searxng/svg-badge.svg
-   :target: https://weblate.bubu1.eu/projects/searxng/
+.. |weblate| image:: https://translate.codeberg.org/widgets/searxng/-/searxng/svg-badge.svg
+   :target: https://translate.codeberg.org/projects/searxng/
 
 
 Contact
@@ -134,7 +134,7 @@ Contributing is easier
 .. _Morty: https://github.com/asciimoo/morty
 .. _Filtron: https://github.com/searxng/filtron
 .. _limiter: https://docs.searxng.org/src/searx.plugins.limiter.html
-.. _Weblate: https://weblate.bubu1.eu/projects/searxng/searxng/
+.. _Weblate: https://translate.codeberg.org/projects/searxng/searxng/
 .. _Development Quickstart: https://docs.searxng.org/dev/quickstart.html
 
 
@@ -142,10 +142,10 @@ Translations
 ============
 
 We need translators, suggestions are welcome at
-https://weblate.bubu1.eu/projects/searxng/searxng/
+https://translate.codeberg.org/projects/searxng/searxng/
 
-.. figure:: https://weblate.bubu1.eu/widgets/searxng/-/multi-auto.svg
-   :target: https://weblate.bubu1.eu/projects/searxng/
+.. figure:: https://translate.codeberg.org/widgets/searxng/-/multi-auto.svg
+   :target: https://translate.codeberg.org/projects/searxng/
 
 
 Make a donation

docs/dev/translation.rst

@@ -4,15 +4,15 @@
 Translation
 ===========
 
-.. _weblate.bubu1.eu: https://weblate.bubu1.eu/projects/searxng/
+.. _translate.codeberg.org: https://translate.codeberg.org/projects/searxng/
 .. _Weblate: https://docs.weblate.org
 .. _translations branch: https://github.com/searxng/searxng/tree/translations
 .. _orphan branch: https://git-scm.com/docs/git-checkout#Documentation/git-checkout.txt---orphanltnewbranchgt
-.. _Weblate repository: https://weblate.bubu1.eu/projects/searxng/searxng/#repository
+.. _Weblate repository: https://translate.codeberg.org/projects/searxng/searxng/#repository
 .. _wlc: https://docs.weblate.org/en/latest/wlc.html
 
-.. |translated| image:: https://weblate.bubu1.eu/widgets/searxng/-/searxng/svg-badge.svg
-   :target: https://weblate.bubu1.eu/projects/searxng/
+.. |translated| image:: https://translate.codeberg.org/widgets/searxng/-/searxng/svg-badge.svg
+   :target: https://translate.codeberg.org/projects/searxng/
 
 .. sidebar:: |translated|
 
@@ -24,11 +24,11 @@ Translation
    - Babel Command-Line: `pybabel <http://babel.pocoo.org/en/latest/cmdline.html>`_
    - `weblate workflow <https://docs.weblate.org/en/latest/workflows.html>`_
 
-Translation takes place on weblate.bubu1.eu_.
+Translation takes place on translate.codeberg.org_.
 
-Translations which has been added by translators on the weblate.bubu1.eu_ UI are
+Translations which has been added by translators on the translate.codeberg.org_ UI are
 committed to Weblate's counterpart of the SearXNG *origin* repository which is
-located at ``https://weblate.bubu1.eu/git/searxng/searxng``.
+located at ``https://translate.codeberg.org/git/searxng/searxng``.
 
 There is no need to clone this repository, :ref:`SearXNG Weblate workflow` take
 care of the synchronization with the *origin*.  To avoid merging commits from
@@ -68,7 +68,7 @@ wlc
 ===
 
 .. _wlc configuration: https://docs.weblate.org/en/latest/wlc.html#wlc-config
-.. _API key: https://weblate.bubu1.eu/accounts/profile/#api
+.. _API key: https://translate.codeberg.org/accounts/profile/#api
 
 All weblate integration is done by GitHub workflows, but if you want to use wlc_,
 copy this content into `wlc configuration`_ in your HOME ``~/.config/weblate``
@@ -76,6 +76,6 @@ copy this content into `wlc configuration`_ in your HOME ``~/.config/weblate``
 .. code-block:: ini
 
   [keys]
-  https://weblate.bubu1.eu/api/ = APIKEY
+  https://translate.codeberg.org/api/ = APIKEY
 
 Replace ``APIKEY`` by your `API key`_.

manage

@@ -190,11 +190,11 @@ weblate.translations.worktree() {
     # 'translations' from Weblate's counterpart (weblate) of the SearXNG
     # (origin).
     #
-    #     remote weblate https://weblate.bubu1.eu/git/searxng/searxng/
+    #     remote weblate https://translate.codeberg.org/git/searxng/searxng/
 
     (   set -e
         if ! git remote get-url weblate 2> /dev/null; then
-            git remote add weblate https://weblate.bubu1.eu/git/searxng/searxng/
+            git remote add weblate https://translate.codeberg.org/git/searxng/searxng/
         fi
         if [ -d "${TRANSLATIONS_WORKTREE}" ]; then
             pushd .
@@ -478,7 +478,7 @@ docker.build() {
         eval "$(python -m searx.version)"
 
         # Get the last git commit id
-        VERSION_GITCOMMIT=$(echo "$VERSION_STRING" | cut -d- -f3)
+        VERSION_GITCOMMIT=$(echo "$VERSION_TAG" | cut -d+ -f2)
         build_msg DOCKER "Last commit : $VERSION_GITCOMMIT"
 
         # define the docker image name
@@ -500,6 +500,7 @@ docker.build() {
         docker $BUILD \
          --build-arg BASE_IMAGE="${DEPENDENCIES_IMAGE_NAME}" \
          --build-arg GIT_URL="${GIT_URL}" \
+         --build-arg SEARXNG_DOCKER_TAG="${DOCKER_TAG}" \
          --build-arg SEARXNG_GIT_VERSION="${VERSION_STRING}" \
          --build-arg VERSION_GITCOMMIT="${VERSION_GITCOMMIT}" \
          --build-arg LABEL_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
@@ -507,11 +508,11 @@ docker.build() {
          --build-arg LABEL_VCS_URL="${GIT_URL}" \
          --build-arg TIMESTAMP_SETTINGS="$(git log -1 --format="%cd" --date=unix -- searx/settings.yml)" \
          --build-arg TIMESTAMP_UWSGI="$(git log -1 --format="%cd" --date=unix -- dockerfiles/uwsgi.ini)" \
-         -t "${SEARXNG_IMAGE_NAME}:latest" -t "${SEARXNG_IMAGE_NAME}:${VERSION_STRING}" .
+         -t "${SEARXNG_IMAGE_NAME}:latest" -t "${SEARXNG_IMAGE_NAME}:${DOCKER_TAG}" .
 
         if [ "$1" = "push" ]; then
 	        docker push "${SEARXNG_IMAGE_NAME}:latest"
-	        docker push "${SEARXNG_IMAGE_NAME}:${SEARXNG_GIT_VERSION}"
+	        docker push "${SEARXNG_IMAGE_NAME}:${DOCKER_TAG}"
 	    fi
     )
     dump_return $?

searx/infopage/de/about.md

@@ -79,7 +79,7 @@ machen.  Je dezentraler das Internet ist, desto mehr Freiheit haben wir!
 [SearXNG Dokumentation]: {{get_setting('brand.docs_url')}}
 [searx]: https://github.com/searx/searx
 [Metasuchmaschine]: https://de.wikipedia.org/wiki/Metasuchmaschine
-[Weblate]: https://weblate.bubu1.eu/projects/searxng/
+[Weblate]: https://translate.codeberg.org/projects/searxng/
 [Seeks-Projekt]: https://beniz.github.io/seeks/
 [OpenSearch]: https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md
 [Firefox]: https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox

searx/infopage/en/about.md

@@ -71,7 +71,7 @@ internet is, the more freedom we have!
 [SearXNG docs]: {{get_setting('brand.docs_url')}}
 [searx]: https://github.com/searx/searx
 [metasearch engine]: https://en.wikipedia.org/wiki/Metasearch_engine
-[Weblate]: https://weblate.bubu1.eu/projects/searxng/
+[Weblate]: https://translate.codeberg.org/projects/searxng/
 [Seeks project]: https://beniz.github.io/seeks/
 [OpenSearch]: https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md
 [Firefox]: https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox

searx/infopage/id/about.md

@@ -74,7 +74,7 @@ terdesentralisasinya internet, lebih banyak kebebasan yang kita punya!
 [dokumentasi SearXNG]: {{get_setting('brand.docs_url')}}
 [searx]: https://github.com/searx/searx
 [mesin pencari meta]: https://id.wikipedia.org/wiki/Mesin_pencari_web#Mesin_Pencari_dan_Mesin_Pencari-meta
-[Weblate]: https://weblate.bubu1.eu/projects/searxng/
+[Weblate]: https://translate.codeberg.org/projects/searxng/
 [proyek Seeks]: https://beniz.github.io/seeks/
 [OpenSearch]: https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md
 [Firefox]: https://support.mozilla.org/id/kb/add-or-remove-search-engine-firefox

searx/static/themes/simple/css/leaflet.css

@@ -423,11 +423,8 @@ svg.leaflet-image-layer.leaflet-interactive path {
 .leaflet-control-attribution a:focus {
 	text-decoration: underline;
 	}
-.leaflet-attribution-flag {
+.leaflet-control-attribution svg {
 	display: inline !important;
-	vertical-align: baseline !important;
-	width: 1em;
-	height: 0.6669em;
 	}
 .leaflet-left .leaflet-control-scale {
 	margin-left: 5px;
@@ -441,10 +438,12 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	line-height: 1.1;
 	padding: 2px 5px 1px;
 	white-space: nowrap;
+	overflow: hidden;
 	-moz-box-sizing: border-box;
 	     box-sizing: border-box;
-	background: rgba(255, 255, 255, 0.8);
-	text-shadow: 1px 1px #fff;
+
+	background: #fff;
+	background: rgba(255, 255, 255, 0.5);
 	}
 .leaflet-control-scale-line:not(:first-child) {
 	border-top: 2px solid #777;
@@ -538,6 +537,8 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	}
 .leaflet-popup-scrolled {
 	overflow: auto;
+	border-bottom: 1px solid #ddd;
+	border-top: 1px solid #ddd;
 	}
 
 .leaflet-oldie .leaflet-popup-content-wrapper {
@@ -651,6 +652,6 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	/* Prevent printers from removing background-images of controls. */
 	.leaflet-control {
 		-webkit-print-color-adjust: exact;
-		print-color-adjust: exact;
+		color-adjust: exact;
 		}
 	}

searx/static/themes/simple/js/searxng.head.min.js.map

@@ -1 +1 @@
-{"version":3,"file":"searxng.head.min.js","sources":["../src/js/head/00_init.js"],"sourcesContent":["/* SPDX-License-Identifier: AGPL-3.0-or-later */\n(function (w, d) {\n  'use strict';\n\n  // add data- properties\n  var script = d.currentScript  || (function () {\n    var scripts = d.getElementsByTagName('script');\n    return scripts[scripts.length - 1];\n  })();\n\n  w.searxng = {\n    settings: JSON.parse(atob(script.getAttribute('client_settings')))\n  };\n\n  // update the css\n  var hmtlElement = d.getElementsByTagName(\"html\")[0];\n  hmtlElement.classList.remove('no-js');\n  hmtlElement.classList.add('js');\n\n})(window, document);\n"],"names":["w","d","script","currentScript","scripts","getElementsByTagName","length","searxng","settings","JSON","parse","atob","getAttribute","hmtlElement","classList","remove","add","window","document"],"mappings":"CACA,SAAWA,EAAGC,GACZ,aAGA,IAAIC,EAASD,EAAEE,eAAkB,WAC/B,IAAIC,EAAUH,EAAEI,qBAAqB,QAAQ,EAC7C,OAAOD,EAAQA,EAAQE,OAAS,EACjC,EAAE,EAEHN,EAAEO,QAAU,CACVC,SAAUC,KAAKC,MAAMC,KAAKT,EAAOU,aAAa,iBAAiB,CAAC,CAAC,CACnE,EAGA,IAAIC,EAAcZ,EAAEI,qBAAqB,MAAM,EAAE,GACjDQ,EAAYC,UAAUC,OAAO,OAAO,EACpCF,EAAYC,UAAUE,IAAI,IAAI,CAE/B,GAAEC,OAAQC,QAAQ"}
+{"version":3,"file":"searxng.head.min.js","sources":["../src/js/head/00_init.js"],"sourcesContent":["/* SPDX-License-Identifier: AGPL-3.0-or-later */\n(function (w, d) {\n  'use strict';\n\n  // add data- properties\n  var script = d.currentScript  || (function () {\n    var scripts = d.getElementsByTagName('script');\n    return scripts[scripts.length - 1];\n  })();\n\n  w.searxng = {\n    settings: JSON.parse(atob(script.getAttribute('client_settings')))\n  };\n\n  // update the css\n  var hmtlElement = d.getElementsByTagName(\"html\")[0];\n  hmtlElement.classList.remove('no-js');\n  hmtlElement.classList.add('js');\n\n})(window, document);\n"],"names":["w","d","script","currentScript","scripts","getElementsByTagName","length","searxng","settings","JSON","parse","atob","getAttribute","hmtlElement","classList","remove","add","window","document"],"mappings":"CACA,SAAWA,EAAGC,gBAIZ,IAAIC,EAASD,EAAEE,eAAkB,WAC/B,IAAIC,EAAUH,EAAEI,qBAAqB,UACrC,OAAOD,EAAQA,EAAQE,OAAS,GAFD,GAKjCN,EAAEO,QAAU,CACVC,SAAUC,KAAKC,MAAMC,KAAKT,EAAOU,aAAa,sBAIhD,IAAIC,EAAcZ,EAAEI,qBAAqB,QAAQ,GACjDQ,EAAYC,UAAUC,OAAO,SAC7BF,EAAYC,UAAUE,IAAI,OAhB5B,CAkBGC,OAAQC"}

searx/static/themes/simple/src/less/style.less

@@ -362,7 +362,7 @@ article[data-vim-selected].category-social {
 .category-files,
 .category-social {
   border: 1px solid var(--color-result-border);
-  margin: 1rem @results-tablet-offset 0 @results-tablet-offset !important;
+  margin: 0 @results-tablet-offset 1rem @results-tablet-offset !important;
   .rounded-corners;
 }
 
@@ -734,6 +734,26 @@ article[data-vim-selected].category-social {
   }
 }
 
+.numbered_pagination {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+}
+
+.page_number {
+  background: transparent !important;
+  color: var(--color-result-link-font) !important;
+  text-decoration: underline;
+}
+
+.page_number_current {
+  background: transparent;
+  color: var(--color-result-link-visited-font);
+  border: none;
+}
+
 #apis {
   margin-top: 8px;
   clear: both;
@@ -1009,6 +1029,10 @@ article[data-vim-selected].category-social {
     background-color: var(--color-sidebar-background);
   }
 
+  .numbered_pagination {
+    display: none;
+  }
+
   .result-paper {
     .attributes {
       display: block;

searx/templates/simple/results.html

@@ -187,6 +187,35 @@
               <button role="link"  type="submit">{{ _('Next page') }} {{ icon_small('chevron-right') }}</button>
             </div>
         </form>
+        {% set pstart = 1 %}
+        {% set pend = 11 %}
+        {% if pageno > 5 %}
+            {% set pstart = pageno - 4 %}
+            {% set pend = pageno + 6 %}
+        {% endif %}
+
+        <div class="numbered_pagination">
+        {% for x in range(pstart, pend) %}
+            <form method="{{ method or 'POST' }}" action="{{ url_for('search') }}" class="page_number">
+                <input type="hidden" name="q" value="{{ q|e }}" >
+                {% for category in selected_categories %}
+                <input type="hidden" name="category_{{ category }}" value="1" >
+                {% endfor %}
+                <input type="hidden" name="pageno" value="{{ x }}" >
+                <input type="hidden" name="language" value="{{ current_language }}" >
+                <input type="hidden" name="time_range" value="{{ time_range }}" >
+                <input type="hidden" name="safesearch" value="{{ safesearch }}" >
+                <input type="hidden" name="theme" value="{{ theme }}" >
+                {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %}
+                {{- engine_data_form(engine_data) -}}
+                {% if pageno == x %}
+                <input role="link" class="page_number_current" type="button" value="{{ x }}">
+                {% else %}
+                <input role="link" class="page_number" type="submit" value="{{ x }}">
+                {% endif %}
+            </form>
+        {% endfor %}
+        </div>
     </nav>
     {% endif %}
 </div>

searx/translations/he/LC_MESSAGES/messages.po

@@ -9,23 +9,24 @@
 # pointhi, 2014
 # rike, 2014
 # stf <stefan.marsiske@gmail.com>, 2014
-# Markus Heiser <markus.heiser@darmarit.de>, 2022.
+# Markus Heiser <markus.heiser@darmarit.de>, 2022, 2023.
 # Shopimisrel <shopisrael12@gmail.com>, 2022.
 msgid ""
 msgstr ""
-"Project-Id-Version:  searx\n"
+"Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-12-12 07:18+0000\n"
-"PO-Revision-Date: 2022-09-21 15:58+0000\n"
+"PO-Revision-Date: 2023-01-20 07:15+0000\n"
 "Last-Translator: Markus Heiser <markus.heiser@darmarit.de>\n"
+"Language-Team: Hebrew <https://weblate.bubu1.eu/projects/searxng/searxng/he/>"
+"\n"
 "Language: he\n"
-"Language-Team: Hebrew "
-"<https://weblate.bubu1.eu/projects/searxng/searxng/he/>\n"
-"Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 "
-"&& n % 10 == 0) ? 2 : 3));\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 && "
+"n % 10 == 0) ? 2 : 3));\n"
+"X-Generator: Weblate 4.14.1\n"
 "Generated-By: Babel 2.11.0\n"
 
 #. CONSTANT_NAMES['DEFAULT_GROUP_NAME']
@@ -136,7 +137,7 @@ msgstr "רשת"
 #. CATEGORY_GROUPS['SCIENTIFIC PUBLICATIONS']
 #: searx/searxng.msg
 msgid "scientific publications"
-msgstr ""
+msgstr "מחקרים מדעיים"
 
 #. STYLE_NAMES['AUTO']
 #: searx/searxng.msg
@@ -171,7 +172,7 @@ msgstr "שגיאת רשת תקשורת"
 
 #: searx/webapp.py:169
 msgid "SSL error: certificate validation has failed"
-msgstr ""
+msgstr "שגיאת SSL: אימות התעודה נכשל"
 
 #: searx/webapp.py:171
 msgid "unexpected crash"
@@ -304,27 +305,27 @@ msgstr "אי אפשר להוריד את תמונה זו."
 
 #: searx/engines/wttr.py:101
 msgid "Morning"
-msgstr ""
+msgstr "בוקר"
 
 #: searx/engines/wttr.py:101
 msgid "Noon"
-msgstr ""
+msgstr "צהריים"
 
 #: searx/engines/wttr.py:101
 msgid "Evening"
-msgstr ""
+msgstr "ערב"
 
 #: searx/engines/wttr.py:101
 msgid "Night"
-msgstr ""
+msgstr "לילה"
 
 #: searx/plugins/autodetect_search_language.py:79
 msgid "Autodetect search language"
-msgstr ""
+msgstr "זיהוי שפת חיפוש אוטומטי"
 
 #: searx/plugins/autodetect_search_language.py:80
 msgid "Automatically detect the query search language and switch to it."
-msgstr ""
+msgstr "זהה אוטומטית את שפת החיפוש והחלף אליה בהתאם."
 
 #: searx/plugins/hash_plugin.py:24
 msgid "Converts strings to different hash digests."
@@ -368,7 +369,7 @@ msgstr ""
 
 #: searx/plugins/self_info.py:20
 msgid "Self Information"
-msgstr ""
+msgstr "מידע עצמי"
 
 #: searx/plugins/self_info.py:21
 msgid ""
@@ -1120,7 +1121,7 @@ msgstr "הסתר מפה"
 
 #: searx/templates/simple/result_templates/paper.html:5
 msgid "Published date"
-msgstr ""
+msgstr "תאריך פרסום"
 
 #: searx/templates/simple/result_templates/paper.html:9
 msgid "Journal"
@@ -1128,7 +1129,7 @@ msgstr ""
 
 #: searx/templates/simple/result_templates/paper.html:22
 msgid "Editor"
-msgstr ""
+msgstr "עורך"
 
 #: searx/templates/simple/result_templates/paper.html:23
 msgid "Publisher"
@@ -1136,11 +1137,11 @@ msgstr ""
 
 #: searx/templates/simple/result_templates/paper.html:24
 msgid "Type"
-msgstr ""
+msgstr "סוג"
 
 #: searx/templates/simple/result_templates/paper.html:25
 msgid "Tags"
-msgstr ""
+msgstr "תגים"
 
 #: searx/templates/simple/result_templates/paper.html:26
 msgid "DOI"
@@ -1483,4 +1484,3 @@ msgstr "הסתר וידאו"
 #~ "href=\"https://he.wikipedia.org/wiki/Hypertext_Transfer_Protocol#.D7.A9.D7.99.D7.98.D7.95.D7.AA_.D7.91.D7.A7.D7.A9.D7.94\""
 #~ " rel=\"external\">למידע נוסף אודות שיטות "
 #~ "בקשה (request methods)</a>"
-

searx/translations/nl/LC_MESSAGES/messages.po

@@ -12,20 +12,22 @@
 # SecularSteve <fairfull.playing@gmail.com>, 2022.
 # Sweder doc <swederdvl@gmail.com>, 2022.
 # Peter Martin <weblate@pe7er.com>, 2022.
+# Max Westen <max@maxwesten.nl>, 2023.
 msgid ""
 msgstr ""
-"Project-Id-Version:  searx\n"
+"Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-12-12 07:18+0000\n"
-"PO-Revision-Date: 2022-11-19 16:21+0000\n"
-"Last-Translator: Markus Heiser <markus.heiser@darmarit.de>\n"
+"PO-Revision-Date: 2023-01-20 07:15+0000\n"
+"Last-Translator: Max Westen <max@maxwesten.nl>\n"
+"Language-Team: Dutch <https://weblate.bubu1.eu/projects/searxng/searxng/nl/>"
+"\n"
 "Language: nl\n"
-"Language-Team: Dutch "
-"<https://weblate.bubu1.eu/projects/searxng/searxng/nl/>\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.14.1\n"
 "Generated-By: Babel 2.11.0\n"
 
 #. CONSTANT_NAMES['DEFAULT_GROUP_NAME']
@@ -71,7 +73,7 @@ msgstr "video’s"
 #. CATEGORY_NAMES['IT']
 #: searx/searxng.msg
 msgid "it"
-msgstr "het"
+msgstr "IT"
 
 #. CATEGORY_NAMES['NEWS']
 #: searx/searxng.msg
@@ -384,7 +386,7 @@ msgstr ""
 
 #: searx/plugins/tor_check.py:25
 msgid "Tor check plugin"
-msgstr "Tor proef plug-in"
+msgstr "Tor controle plug-in"
 
 #: searx/plugins/tor_check.py:28
 msgid ""
@@ -1510,4 +1512,3 @@ msgstr "verberg video"
 #~ "href=\"http://nl.wikipedia.org/wiki/Hypertext_Transfer_Protocol"
 #~ "#HTTP-requests\" rel=\"external\">lees meer over"
 #~ " opvraagmethodes</a>"
-

searx/translations/pt_BR/LC_MESSAGES/messages.po

@@ -17,20 +17,22 @@
 # calb sepherus <calb.sepherus@protonmail.com>, 2022.
 # Yan Lyra <yanlyra3@gmail.com>, 2022.
 # zaioti <zaioti@tuta.io>, 2022.
+# Spectro <spectro@keemail.me>, 2023.
 msgid ""
 msgstr ""
-"Project-Id-Version:  searx\n"
+"Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-12-12 07:18+0000\n"
-"PO-Revision-Date: 2022-11-28 13:11+0000\n"
-"Last-Translator: Markus Heiser <markus.heiser@darmarit.de>\n"
+"PO-Revision-Date: 2023-01-20 07:15+0000\n"
+"Last-Translator: Spectro <spectro@keemail.me>\n"
+"Language-Team: Portuguese (Brazil) <https://weblate.bubu1.eu/projects/"
+"searxng/searxng/pt_BR/>\n"
 "Language: pt_BR\n"
-"Language-Team: Portuguese (Brazil) "
-"<https://weblate.bubu1.eu/projects/searxng/searxng/pt_BR/>\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.14.1\n"
 "Generated-By: Babel 2.11.0\n"
 
 #. CONSTANT_NAMES['DEFAULT_GROUP_NAME']
@@ -328,11 +330,12 @@ msgstr "Noite"
 
 #: searx/plugins/autodetect_search_language.py:79
 msgid "Autodetect search language"
-msgstr ""
+msgstr "Detecção automática de idioma de pesquisa"
 
 #: searx/plugins/autodetect_search_language.py:80
 msgid "Automatically detect the query search language and switch to it."
 msgstr ""
+"Detecte automaticamente o idioma de pesquisa da consulta e mude para ele."
 
 #: searx/plugins/hash_plugin.py:24
 msgid "Converts strings to different hash digests."
@@ -1518,4 +1521,3 @@ msgstr "ocultar vídeo"
 #~ "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\""
 #~ " rel=\"external\">saiba mais sobre os "
 #~ "métodos de solicitação</a>"
-

searx/version.py

@@ -59,10 +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'")
     tag_version = git_version = git_commit_date_hash
 
-    # add "-dirty" suffix if there are uncommited changes except searx/settings.yml
+    # add "+dirty" suffix if there are uncommited changes except searx/settings.yml
     try:
         subprocess_run("git diff --quiet -- . ':!searx/settings.yml' ':!utils/brand.env'")
     except subprocess.CalledProcessError as e:
@@ -70,16 +70,23 @@ def get_git_version():
             git_version += "+dirty"
         else:
             logger.warning('"%s" returns an unexpected return code %i', e.returncode, e.cmd)
-    return git_version, tag_version
+    docker_tag = git_version.replace("+", "-")
+    return git_version, tag_version, docker_tag
 
 
 try:
     vf = importlib.import_module('searx.version_frozen')
-    VERSION_STRING, VERSION_TAG, GIT_URL, GIT_BRANCH = vf.VERSION_STRING, vf.VERSION_TAG, vf.GIT_URL, vf.GIT_BRANCH
+    VERSION_STRING, VERSION_TAG, DOCKER_TAG, GIT_URL, GIT_BRANCH = (
+        vf.VERSION_STRING,
+        vf.VERSION_TAG,
+        vf.DOCKER_TAG,
+        vf.GIT_URL,
+        vf.GIT_BRANCH,
+    )
 except ImportError:
     try:
         try:
-            VERSION_STRING, VERSION_TAG = get_git_version()
+            VERSION_STRING, VERSION_TAG, DOCKER_TAG = get_git_version()
         except subprocess.CalledProcessError as ex:
             logger.error("Error while getting the version: %s", ex.stderr)
         try:
@@ -102,6 +109,7 @@ if __name__ == "__main__":
 
 VERSION_STRING = "{VERSION_STRING}"
 VERSION_TAG = "{VERSION_TAG}"
+DOCKER_TAG = "{DOCKER_TAG}"
 GIT_URL = "{GIT_URL}"
 GIT_BRANCH = "{GIT_BRANCH}"
 """
@@ -114,6 +122,7 @@ GIT_BRANCH = "{GIT_BRANCH}"
         shell_code = f"""
 VERSION_STRING="{VERSION_STRING}"
 VERSION_TAG="{VERSION_TAG}"
+DOCKER_TAG="{DOCKER_TAG}"
 GIT_URL="{GIT_URL}"
 GIT_BRANCH="{GIT_BRANCH}"
 """