diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2022-10-10 19:31:22 +0200 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2023-03-24 10:37:42 +0100 |
| commit | c9cd376186d12d2d281e655d0b5539d1359fe148 (patch) | |
| tree | 9ed993146863379a9b3889d68c6b99fa4f9ad61e /searx/templates/simple | |
| parent | 7daf4f95efb2c8b37f682d42e470bb78ce464f19 (diff) | |
[mod] replace searx.languages by searx.sxng_locales
With the language and region tags from the EngineTraitsMap the handling of
SearXNG's tags of languages and regions has been normalized and is no longer
a *mystery*. The "languages" became "locales" that are supported by babel and
by this, the update_engine_traits.py can be simplified a lot.
Other code places can be simplified as well, but these simplifications
should (respectively can) only be done when none of the engines work with the
deprecated EngineTraits.supported_languages interface anymore.
This commit replaces searx.languages by searx.sxng_locales and fix the naming of
some names from "language" to "locale" (e.g. language_codes --> sxng_locales).
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'searx/templates/simple')
| -rw-r--r-- | searx/templates/simple/filters/languages.html | 8 | ||||
| -rw-r--r-- | searx/templates/simple/preferences.html | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/searx/templates/simple/filters/languages.html b/searx/templates/simple/filters/languages.html index 54e07e20..a42a304a 100644 --- a/searx/templates/simple/filters/languages.html +++ b/searx/templates/simple/filters/languages.html @@ -1,12 +1,12 @@ <select class="language" id="language" name="language" aria-label="{{ _('Search language') }}">{{- '' -}} - <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option> + <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }} [all]</option> <option value="auto" {% if current_language == 'auto' %}selected="selected"{% endif %}> {{- _('Auto-detect') -}} {%- if current_language == 'auto' %} ({{ search_language }}){%- endif -%} </option> - {%- for lang_id,lang_name,country_name,english_name,flag in language_codes | sort(attribute=1) -%} - <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}> - {% if flag %}{{ flag }} {% endif%} {{- lang_name }} {% if country_name %}({{ country_name }}) {% endif %} + {%- for sxng_tag,lang_name,country_name,english_name,flag in sxng_locales | sort(attribute=1) -%} + <option value="{{ sxng_tag }}" {% if sxng_tag == current_language %}selected="selected"{% endif %}> + {% if flag %}{{ flag }} {% endif%} {{- lang_name }} {% if country_name %} - {{ country_name }} {% endif %} [{{sxng_tag}}] </option> {%- endfor -%} </select> diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 9626b04d..a0cc8efc 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -115,10 +115,10 @@ <legend id="pref_language">{{ _('Search language') }}</legend> <p class="value">{{- '' -}} <select name='language' aria-labelledby="pref_language" aria-describedby="desc_language">{{- '' -}} - <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option> - <option value="auto" {% if current_language == 'auto' %}selected="selected"{% endif %}>{{ _('Auto-detect') }}</option> - {%- for lang_id,lang_name,country_name,english_name,flag in language_codes | sort(attribute=1) -%} - <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{% if flag %}{{ flag }} {% endif%} {{- lang_name }} {% if country_name %}({{ country_name }}) {% endif %}</option> + <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }} [all]</option> + <option value="auto" {% if current_language == 'auto' %}selected="selected"{% endif %}>{{ _('Auto-detect') }} [auto]</option> + {%- for sxng_tag,lang_name,country_name,english_name,flag in sxng_locales | sort(attribute=1) -%} + <option value="{{ sxng_tag }}" {% if sxng_tag == current_language %}selected="selected"{% endif %}>{% if flag %}{{ flag }} {% endif%} {{- lang_name }} {% if country_name %} - {{ country_name }} {% endif %} [{{sxng_tag}}]</option> {%- endfor -%} </select>{{- '' -}} </p> |