Merge branch 'master' of https://github.com/asciimoo/searx

9 files changed, 43 insertions, 38 deletions

diff --git a/searx/templates/about.html b/searx/templates/about.html
index 4e3f4bf4e..bb0a3e882 100644
--- a/searx/templates/about.html
+++ b/searx/templates/about.html
@@ -8,25 +8,25 @@
     </p>
     <h2>Why use Searx?</h2>
     <ul>
-        <li>Maybe Searx won’t offer you as personalised results as Google, but it doesn't make a profile about you</li>
-        <li>Searx doesn't care about what you search, never shares anything with a third party, and it can't be used to compromise you</li>
-        <li>Searx is a free software, the code is 100% open and you can help to make it better. See more on <a href="https://gmail.com/asciimoo/searx">github</a></li>
+        <li>Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
+        <li>Searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you</li>
+        <li>Searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
     </ul>
-    <p>If you do care about privacy, want to be a conscious user, moreover believe
+    <p>If you do care about privacy, want to be a conscious user, or otherwise believe
     in digital freedom, make Searx your default search engine or run it on your own server</p>
 
 <h2>Technical details - How does it work?</h2>
 
 <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
 inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br />
-It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they don't show up in our logs, neither in your url history. In case of Chrome* users there is an exception, Searx uses the search bar to perform GET requests.<br />
-Searx can be added to your browser's search bar, moreover it can be set as the default search engine.
+It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, Searx uses the search bar to perform GET requests.<br />
+Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
 </p>
 
-<h2>How can I have my own?</h2>
+<h2>How can I make it my own?</h2>
 
-<p>Searx appreciates your suspicion regarding logs, so take the <a href="https://github.com/asciimoo/searx">code</a> and run it yourself! <br />Add your Searx to this <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">list</a> to help other people to have privacy and make the Internet freer!
-<br />The more decentralized the Internet is the more freedom we have!</p>
+<p>Searx appreciates your concern regarding logs, so take the <a href="https://github.com/asciimoo/searx">code</a> and run it yourself! <br />Add your Searx to this <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">list</a> to help other people reclaim their privacy and make the Internet freer!
+<br />The more decentralized the Internet, is the more freedom we have!</p>
 
 <hr />
 
@@ -39,7 +39,7 @@ Searx can be added to your browser's search bar, moreover it can be set as the d
 
 <h3>New engines?</h3>
 <ul>
-    <li>Edit your engines.cfg, see <a href="https://raw.github.com/asciimoo/searx/master/engines.cfg_sample">sample config</a></li>
+    <li>Edit your <a href="https://raw.github.com/asciimoo/searx/master/searx/settings.yml">settings.yml</a></li>
     <li>Create your custom engine module, check the <a href="https://github.com/asciimoo/searx/blob/master/examples/basic_engine.py">example engine</a></li>
 </ul>
 <p>Don't forget to restart searx after config edit!</p>
@@ -48,7 +48,7 @@ Searx can be added to your browser's search bar, moreover it can be set as the d
 <p>See the <a href="https://github.com/asciimoo/searx/wiki/Installation">installation and setup</a> wiki page</p>
 
 <h3>How to debug engines?</h3>
-<p><a href="/stats">Stats page</a> contains some useful data about the used engines.</p>
+<p><a href="/stats">Stats page</a> contains some useful data about the engines used.</p>
 
 </div>
 {% endblock %}
diff --git a/searx/templates/categories.html b/searx/templates/categories.html
index b1fd3d1fc..57e63c85d 100644
--- a/searx/templates/categories.html
+++ b/searx/templates/categories.html
@@ -1,7 +1,7 @@
 <div id="categories">
 {% for category in categories %}
     <div class="checkbox_container">
-        <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /><label for="checkbox_{{ category|replace(' ', '_') }}">{{ category }}</label>
+        <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /><label for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
     </div>
 {% endfor %}
 </div>
diff --git a/searx/templates/engines.html b/searx/templates/engines.html
index 1f52dc09f..008e860f1 100644
--- a/searx/templates/engines.html
+++ b/searx/templates/engines.html
@@ -1,12 +1,12 @@
 {% extends 'base.html' %}
 {% block content %}
 <div class="row">
-<h2>Currently used search engines</h2>
+    <h2>{{ _('Currently used search engines') }}</h2>
 
     <table style="width: 80%;">
         <tr>
-            <th>Engine name</th>
-            <th>Category</th>
+            <th>{{ _('Engine name') }}</th>
+            <th>{{ _('Category') }}</th>
         </tr>
     {% for (categ,search_engines) in categs %}
         {% for search_engine in search_engines %}
@@ -20,7 +20,6 @@
         {% endfor %}
     {% endfor %}
     </table>
-<p>Please add more engines to this list, pull requests are welcome!</p>
-<p class="right"><a href="/">back</a></p>
+<p class="right"><a href="/">{{ _('back') }}</a></p>
 </div>
 {% endblock %}
diff --git a/searx/templates/index.html b/searx/templates/index.html
index d9fa3b502..18320ae09 100644
--- a/searx/templates/index.html
+++ b/searx/templates/index.html
@@ -4,8 +4,8 @@
     <div class="title"><h1>searx</h1></div>
     {% include 'search.html' %}
     <p class="top_margin">
-        <a href="/about" class="hmarg">about</a>
-        <a href="/preferences" class="hmarg">preferences</a>
+        <a href="/about" class="hmarg">{{ _('about') }}</a>
+        <a href="/preferences" class="hmarg">{{ _('preferences') }}</a>
     </p>
 </div>
 {% endblock %}
diff --git a/searx/templates/preferences.html b/searx/templates/preferences.html
index 705139e58..3c2afef21 100644
--- a/searx/templates/preferences.html
+++ b/searx/templates/preferences.html
@@ -2,18 +2,28 @@
 {% block head %} {% endblock %}
 {% block content %}
 <div class="row">
-    <h2>Preferences</h2>
+    <h2>{{ _('Preferences') }}</h2>
 
 
+    <form method="post" action="/preferences" id="search_form">
     <fieldset>
-        <legend>Default categories</legend>
-        <form method="post" action="/preferences" id="search_form">
+        <legend>{{ _('Default categories') }}</legend>
         <p>
         {% include 'categories.html' %}
         </p>
-        <input type="submit" value="save" />
-        </form>
     </fieldset>
-    <div class="right"><a href="/">back</a></div>
+    <fieldset>
+        <legend>{{ _('Interface language') }}</legend>
+        <p>
+        <select name='locale'>
+            {% for locale_id,locale_name in locales.items() %}
+            <option value={{ locale_id }} {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name}}</option>
+            {% endfor %}
+        </select>
+        </p>
+    </fieldset>
+    <input type="submit" value="{{ _('save') }}" />
+    </form>
+    <div class="right"><a href="/">{{ _('back') }}</a></div>
 </div>
 {% endblock %}
diff --git a/searx/templates/result_templates/default.html b/searx/templates/result_templates/default.html
index ab6d469b4..d06a4598a 100644
--- a/searx/templates/result_templates/default.html
+++ b/searx/templates/result_templates/default.html
@@ -1,13 +1,11 @@
 <div class="result {{ result.class }}">
 
   {% if result['favicon'] %}
-  <div style="float:left; margin:2px;">
-    <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}.ico" title="{{result['favicon']}}.ico" />
-  </div>
+    <img width="14" height="14" class="favicon" src="static/img/icon_{{result['favicon']}}.ico" />
   {% endif %}
 
   <div>
-    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3></br>
+    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
     <p class="url">{{ result.pretty_url }}</p>
   </div>
diff --git a/searx/templates/result_templates/videos.html b/searx/templates/result_templates/videos.html
index ae6d8f16c..d3391f0d3 100644
--- a/searx/templates/result_templates/videos.html
+++ b/searx/templates/result_templates/videos.html
@@ -1,13 +1,11 @@
 <div class="result">
   {% if result['favicon'] %}
-  <div style="float:left; margin:2px;">
-    <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}.ico" title="{{result['favicon']}}.ico" />
-  </div>
+    <img width="14" height="14" class="favicon" src="static/img/icon_{{result['favicon']}}.ico" />
   {% endif %}
 
     <p>
       <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
-      <a href="{{ result.url }}"><img width="300" height="170"  src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
+      <a href="{{ result.url }}"><img width="400px" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
       <p class="url">{{ result.url }}</p>
     </p>
 </div>
diff --git a/searx/templates/results.html b/searx/templates/results.html
index be40900c3..238671878 100644
--- a/searx/templates/results.html
+++ b/searx/templates/results.html
@@ -7,12 +7,12 @@
 </div>
 <div id="results">
     {% if suggestions %}
-    <div id="suggestions"><span>Suggestions: </span>{% for suggestion in suggestions %}<form method="post" action="/"><input type="hidden" name="q" value="{{suggestion}}"><input type="submit" value="{{ suggestion }}" /></form>{% endfor %}</div>
+    <div id="suggestions"><span>{{ _('Suggestions') }}:</span>{% for suggestion in suggestions %}<form method="post" action="/"><input type="hidden" name="q" value="{{suggestion}}"><input type="submit" value="{{ suggestion }}" /></form>{% endfor %}</div>
     {% endif %}
-    
+
 
     <div id ="result_count">
-        Number of results: {{ number_of_results }}
+        {{ _('Number of results') }}: {{ number_of_results }}
     </div>
 
     {% for result in results %}
@@ -23,7 +23,7 @@
         {% endif %}
     {% endfor %}
     <div id="apis">
-      Download results
+      {{ _('Download results') }}
       <form method="post" action="/">
         <div class="left">
           <input type="hidden" name="q" value="{{ q }}" />
diff --git a/searx/templates/stats.html b/searx/templates/stats.html
index 933616e32..cb5757b31 100644
--- a/searx/templates/stats.html
+++ b/searx/templates/stats.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block head %} {% endblock %}
 {% block content %}
-<h2>Engine stats</h2>
+<h2>{{ _('Engine stats') }}</h2>
 
 {% for stat_name,stat_category in stats %}
 <div class="left">