diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2017-12-06 14:34:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-06 14:34:26 +0100 |
| commit | 49b845051f027cf9d29a20821968103a0f55c9d9 (patch) | |
| tree | 249693fb31423283ee21c5ded4bed844d7250f2e /searx/templates/oscar | |
| parent | df0b8ee5270a37642ccf5f42e95b0656aefc7fda (diff) | |
| parent | 4d1770398a6af8902e75c0bd885781584d39e796 (diff) | |
| download | searxng-49b845051f027cf9d29a20821968103a0f55c9d9.tar.gz searxng-49b845051f027cf9d29a20821968103a0f55c9d9.zip | |
Merge pull request #973 from MarcAbonce/languages
Remove 'all' option from search languages
Diffstat (limited to 'searx/templates/oscar')
| -rw-r--r-- | searx/templates/oscar/languages.html | 11 | ||||
| -rw-r--r-- | searx/templates/oscar/preferences.html | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/searx/templates/oscar/languages.html b/searx/templates/oscar/languages.html index 96c1c3a9c..996c427bd 100644 --- a/searx/templates/oscar/languages.html +++ b/searx/templates/oscar/languages.html @@ -3,10 +3,9 @@ {% else %} <select class="time_range custom-select form-control" id='language' name='language'> {% endif %} - <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option> - {% for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) %} - <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}> - {{ lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id }} - </option> - {% endfor %} + {% for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) %} + <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}> + {{ lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id }} + </option> + {% endfor %} </select> diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index f2e5cc539..f23cae3e5 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -187,7 +187,7 @@ </td> <th>{{ search_engine.name }}</th> <td class="name">{{ shortcuts[search_engine.name] }}</td> - <td>{{ support_toggle(current_language == 'all' or current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages) }}</td> + <td>{{ support_toggle(current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages) }}</td> <td>{{ support_toggle(search_engine.safesearch==True) }}</td> <td>{{ support_toggle(search_engine.time_range_support==True) }}</td> <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td> @@ -197,7 +197,7 @@ <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td> <td>{{ support_toggle(search_engine.time_range_support==True) }}</td> <td>{{ support_toggle(search_engine.safesearch==True) }}</td> - <td>{{ support_toggle(current_language == 'all' or current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages) }}</td> + <td>{{ support_toggle(current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages) }}</td> <td>{{ shortcuts[search_engine.name] }}</td> <th>{{ search_engine.name }}</th> <td class="onoff-checkbox"> |