Unverified Commit 5f705e4d authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #240789 from rnhmjoj/pr-searx

searx: fix for flask-babel 3.0
parents dfd81cd4 2151defe
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ toPythonModule (buildPythonApplication rec {
    sha256 = "sha256-+Wsg1k/h41luk5aVfSn11/lGv8hZYVvpHLbbYHfsExw=";
  };

  patches = [
   ./fix-flask-babel-3.0.patch
  ];

  postPatch = ''
    sed -i 's/==.*$//' requirements.txt
  '';
+27 −0
Original line number Diff line number Diff line
commit 38b3a4f70e3226a091c53300659752c595b120f9
Author: rnhmjoj <rnhmjoj@inventati.org>
Date:   Fri Jun 30 21:48:35 2023 +0200

    Fix for flask-babel 3.0

diff --git a/searx/webapp.py b/searx/webapp.py
index 2027e72d..f3174a45 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -167,7 +167,7 @@ _flask_babel_get_translations = flask_babel.get_translations
 def _get_translations():
     if has_request_context() and request.form.get('use-translation') == 'oc':
         babel_ext = flask_babel.current_app.extensions['babel']
-        return Translations.load(next(babel_ext.translation_directories), 'oc')
+        return Translations.load(babel_ext.translation_directories[0], 'oc')
 
     return _flask_babel_get_translations()
 
@@ -188,7 +188,6 @@ def _get_browser_or_settings_language(request, lang_list):
     return settings['search']['default_lang'] or 'en'
 
 
-@babel.localeselector
 def get_locale():
     if 'locale' in request.form\
        and request.form['locale'] in settings['locales']: