Merge branch 'master' into setup-no-tests

5 files changed, 16 insertions, 12 deletions

diff --git a/searx/templates/courgette/preferences.html b/searx/templates/courgette/preferences.html
index 61f521477..56a6e0202 100644
--- a/searx/templates/courgette/preferences.html
+++ b/searx/templates/courgette/preferences.html
@@ -13,6 +13,7 @@
         <legend>{{ _('Search language') }}</legend>
         <p>
             <select name='language'>
+                <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 %}
diff --git a/searx/templates/legacy/preferences.html b/searx/templates/legacy/preferences.html
index fb70832e3..f418dcd5b 100644
--- a/searx/templates/legacy/preferences.html
+++ b/searx/templates/legacy/preferences.html
@@ -14,6 +14,7 @@
         <legend>{{ _('Search language') }}</legend>
         <p>
         <select name='language'>
+            <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 %}
diff --git a/searx/templates/oscar/languages.html b/searx/templates/oscar/languages.html
index 369abca83..53ade43b2 100644
--- a/searx/templates/oscar/languages.html
+++ b/searx/templates/oscar/languages.html
@@ -3,9 +3,10 @@
 {% else %}
 <select class="time_range custom-select form-control" id='language' name='language'>
 {% endif %}
-	{% 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 %}
+	<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 %}
 </select>
diff --git a/searx/templates/pix-art/preferences.html b/searx/templates/pix-art/preferences.html
index 0b2bb6709..05876dedf 100644
--- a/searx/templates/pix-art/preferences.html
+++ b/searx/templates/pix-art/preferences.html
@@ -9,6 +9,7 @@
         <legend>{{ _('Search language') }}</legend>
         <p>
         <select name='language'>
+            <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 %}
diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html
index 049af5e33..7437ed422 100644
--- a/searx/templates/simple/preferences.html
+++ b/searx/templates/simple/preferences.html
@@ -68,7 +68,7 @@
         <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
       </select>
     </p>
-    <div class="description">{{ _('Filter content') }}</p>
+    <p class="description">{{ _('Filter content') }}</p>
   </fieldset>
   {{ plugin_preferences('general') }}
   <fieldset>
@@ -122,7 +122,7 @@
       {% endif %}
       {% endfor %}
     </table>
-    <div>
+    </div>
     {{ tab_footer() }}
     {% endfor %}
     {{ tabs_close() }}
@@ -171,7 +171,7 @@
         {{ _('With that list, you can assess searx transparency.') }}<br />
      </p>
 
-     {% if cookies %}     
+     {% if cookies %}
      <table class="cookies">
        <tr>
           <th>{{ _('Cookie name') }}</th>
@@ -186,14 +186,14 @@
      </table>
      {% else %}
         {% include 'oscar/messages/no_cookies.html' %}
-     {% endif %}     
+     {% endif %}
 
      <h4>{{ _('Search URL of the currently saved preferences') }} :</h4>
      <div class="selectable_url">
        <pre>{{ url_for('index', _external=True) }}?preferences={{ preferences_url_params|e }}{% raw %}&amp;q=%s{% endraw %}</pre>
      </div>
      <p class="small_font">{{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }}</p>
-     
+
   {{ tab_footer() }}
 
   {{ tab_header('maintab', 'privacy', _('Privacy')) }}
@@ -218,7 +218,7 @@
     <div class="description">{{ _('Proxying image results through searx') }}</div>
   </fieldset>
   {{ plugin_preferences('privacy') }}
-  
+
   {{ tab_footer() }}
 
   {{ tabs_close() }}
@@ -226,7 +226,7 @@
   <p class="small_font">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }}
     <br />
     {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
-  </p>  
+  </p>
 
   <input type="submit" value="{{ _('save') }}" />
   <div class="{% if rtl %}left{% else %}right{% endif %} preferences_back"><a href="{{ url_for('clear_cookies') }}">{{ _('Reset defaults') }}</a></div>