diff options
| -rw-r--r-- | searx/enginelib/traits.py | 13 | ||||
| -rw-r--r-- | searx/templates/simple/preferences/engines.html | 4 | ||||
| -rwxr-xr-x | searx/webapp.py | 13 |
3 files changed, 2 insertions, 28 deletions
diff --git a/searx/enginelib/traits.py b/searx/enginelib/traits.py index 257734dd9..4a051ac05 100644 --- a/searx/enginelib/traits.py +++ b/searx/enginelib/traits.py @@ -116,19 +116,6 @@ class EngineTraits: return self.all_locale return locales.get_engine_locale(searxng_locale, self.regions, default=default) - def is_locale_supported(self, searxng_locale: str) -> bool: - """A *locale* (SearXNG's internal representation) is considered to be - supported by the engine if the *region* or the *language* is supported - by the engine. - - For verification the functions :py:func:`EngineTraits.get_region` and - :py:func:`EngineTraits.get_language` are used. - """ - if self.data_type == "traits_v1": - return bool(self.get_region(searxng_locale) or self.get_language(searxng_locale)) - - raise TypeError("engine traits of type %s is unknown" % self.data_type) - def copy(self): """Create a copy of the dataclass object.""" return EngineTraits(**dataclasses.asdict(self)) diff --git a/searx/templates/simple/preferences/engines.html b/searx/templates/simple/preferences/engines.html index 09d2aed77..977fe9669 100644 --- a/searx/templates/simple/preferences/engines.html +++ b/searx/templates/simple/preferences/engines.html @@ -23,7 +23,6 @@ <th class="checkbox-col">{{- _("Allow") -}}</th>{{- '' -}} <th class="name">{{- _("Engine name") -}}</th>{{- '' -}} <th class="shortcut">{{ _("!bang") -}}</th>{{- '' -}} - <th>{{- _("Supports selected language") -}}</th>{{- '' -}} <th>{{- _("SafeSearch") -}}</th>{{- '' -}} <th>{{- _("Time range") -}}</th>{{- '' -}} <th>{{- _("Weight") }}</th> @@ -71,9 +70,6 @@ <span class="bang">{{ '!' + shortcuts[search_engine.name] }}</span>{{- '' -}} </td>{{- '' -}} <td> - {{- checkbox(None, supports[search_engine.name]['supports_selected_language'], true) -}} - </td>{{- '' -}} - <td> {{- checkbox(None, supports[search_engine.name]['safesearch'], true) -}} </td>{{- '' -}} <td> diff --git a/searx/webapp.py b/searx/webapp.py index b0820c753..f5e8e5cf3 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -918,9 +918,6 @@ def preferences(): 'rate80': rate80, 'rate95': rate95, 'warn_timeout': e.timeout > settings['outgoing']['request_timeout'], - 'supports_selected_language': e.traits.is_locale_supported( - str(sxng_request.preferences.get_value('language') or 'all') - ), 'result_count': result_count, } # end of stats @@ -956,15 +953,9 @@ def preferences(): # supports supports = {} for _, e in filtered_engines.items(): - supports_selected_language = e.traits.is_locale_supported( - str(sxng_request.preferences.get_value('language') or 'all') - ) - safesearch = e.safesearch - time_range_support = e.time_range_support supports[e.name] = { - 'supports_selected_language': supports_selected_language, - 'safesearch': safesearch, - 'time_range_support': time_range_support, + 'safesearch': e.safesearch, + 'time_range_support': e.time_range_support, } return render( |