From cd26f3ea2f99b1f7243acfd6c6f76312973b3064 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 4 Apr 2023 05:02:01 +0200
Subject: [PATCH] [fix] ./manage: replace data.languages by data.traits

Follow up of https://github.com/searxng/searxng/pull/2269

Related:

- https://github.com/searxng/searxng/issues/2314

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 Makefile |  2 +-
 manage   | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 31b3787a8..005a4a057 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ test.shell:
 
 MANAGE += buildenv
 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 += docker.build docker.push docker.buildx
 MANAGE += gecko.driver
diff --git a/manage b/manage
index 8d61e1328..52c038a0c 100755
--- a/manage
+++ b/manage
@@ -77,9 +77,9 @@ weblate.:
   push.translations: push translation changes from SearXNG to Weblate's counterpart
   to.translations: Update 'translations' branch with last additions from Weblate.
 data.:
-  all       : update searx/languages.py and ./data/*
-  languages : update searx/data/engines_languages.json & searx/languages.py
-  useragents: update searx/data/useragents.json with the most recent versions of Firefox.
+  all       : update searx/sxng_locales.py and searx/data/*
+  traits    : update searx/data/engine_traits.json & searx/sxng_locales.py
+  useragents: update searx/data/useragents.json with the most recent versions of Firefox
 docs.:
   html      : build HTML documentation
   live      : autobuild HTML documentation while editing
@@ -386,27 +386,33 @@ weblate.push.translations() {
 
 data.all() {
     (   set -e
+
         pyenv.activate
-        data.languages
+        data.traits
         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"
         python searxng_extra/update/update_ahmia_blacklist.py
         build_msg DATA "update searx/data/wikidata_units.json"
         python searxng_extra/update/update_wikidata_units.py
         build_msg DATA "update searx/data/currencies.json"
         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
         pyenv.activate
-        build_msg ENGINES "fetch languages .."
-        python searxng_extra/update/update_languages.py
-        build_msg ENGINES "update update searx/languages.py"
-        build_msg DATA "update searx/data/engines_languages.json"
+        build_msg DATA "update searx/data/engine_traits.json"
+        python searxng_extra/update/update_engine_traits.py
+        build_msg ENGINES "update searx/sxng_locales.py"
     )
     dump_return $?
 }
@@ -417,12 +423,6 @@ data.useragents() {
     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() {
     build_msg DOCS "build ${DOCS_BUILD}/includes"
     (