Merge pull request #2315 from return42/fix-2314

Browse Source 
[fix] ./manage: replace data.languages by data.traits
This commit is contained in:
Markus Heiser 2023-04-05 07:53:41 +02:00 committed by GitHub
commit 934249dd05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -76,7 +76,7 @@ test.shell:
MANAGE += buildenv MANAGE += buildenv
MANAGE += weblate.translations.commit weblate.push.translations MANAGE += weblate.translations.commit weblate.push.translations
MANAGE += data.all data.languages data.useragents data.osm_keys_tags MANAGE += data.all data.traits data.useragents
MANAGE += docs.html docs.live docs.gh-pages docs.prebuild docs.clean MANAGE += docs.html docs.live docs.gh-pages docs.prebuild docs.clean
MANAGE += docker.build docker.push docker.buildx MANAGE += docker.build docker.push docker.buildx
MANAGE += gecko.driver MANAGE += gecko.driver

32
manage
View File

@ -77,9 +77,9 @@ weblate.:
push.translations: push translation changes from SearXNG to Weblate's counterpart push.translations: push translation changes from SearXNG to Weblate's counterpart
to.translations: Update 'translations' branch with last additions from Weblate. to.translations: Update 'translations' branch with last additions from Weblate.
data.: data.:
all : update searx/languages.py and ./data/* all : update searx/sxng_locales.py and searx/data/*
languages : update searx/data/engines_languages.json & searx/languages.py traits : update searx/data/engine_traits.json & searx/sxng_locales.py
useragents: update searx/data/useragents.json with the most recent versions of Firefox. useragents: update searx/data/useragents.json with the most recent versions of Firefox
docs.: docs.:
html : build HTML documentation html : build HTML documentation
live : autobuild HTML documentation while editing live : autobuild HTML documentation while editing
@ -386,27 +386,33 @@ weblate.push.translations() {
data.all() { data.all() {
( set -e ( set -e
pyenv.activate pyenv.activate
data.languages data.traits
data.useragents data.useragents
data.osm_keys_tags
build_msg DATA "update searx/data/osm_keys_tags.json"
pyenv.cmd python searxng_extra/update/update_osm_keys_tags.py
build_msg DATA "update searx/data/ahmia_blacklist.txt" build_msg DATA "update searx/data/ahmia_blacklist.txt"
python searxng_extra/update/update_ahmia_blacklist.py python searxng_extra/update/update_ahmia_blacklist.py
build_msg DATA "update searx/data/wikidata_units.json" build_msg DATA "update searx/data/wikidata_units.json"
python searxng_extra/update/update_wikidata_units.py python searxng_extra/update/update_wikidata_units.py
build_msg DATA "update searx/data/currencies.json" build_msg DATA "update searx/data/currencies.json"
python searxng_extra/update/update_currencies.py python searxng_extra/update/update_currencies.py
build_msg DATA "update searx/data/external_bangs.json"
python searxng_extra/update/update_external_bangs.py
build_msg DATA "update searx/data/engine_descriptions.json"
python searxng_extra/update/update_engine_descriptions.py
) )
} }
data.languages() { data.traits() {
( set -e ( set -e
pyenv.activate pyenv.activate
build_msg ENGINES "fetch languages .." build_msg DATA "update searx/data/engine_traits.json"
python searxng_extra/update/update_languages.py python searxng_extra/update/update_engine_traits.py
build_msg ENGINES "update update searx/languages.py" build_msg ENGINES "update searx/sxng_locales.py"
build_msg DATA "update searx/data/engines_languages.json"
) )
dump_return $? dump_return $?
} }
@ -417,12 +423,6 @@ data.useragents() {
dump_return $? dump_return $?
} }
data.osm_keys_tags() {
build_msg DATA "update searx/data/osm_keys_tags.json"
pyenv.cmd python searxng_extra/update/update_osm_keys_tags.py
dump_return $?
}
docs.prebuild() { docs.prebuild() {
build_msg DOCS "build ${DOCS_BUILD}/includes" build_msg DOCS "build ${DOCS_BUILD}/includes"
( (