2b1d2db · searx · git.iko.soy

searx/engines/__init__.py+15−5

compare with master

unifiedsplit

@@ -26,6 +26,7 @@ from searx import settings

26from searx.utils import gen_useragent

27import sys

28from datetime import datetime

29+from flask.ext.babel import gettext

29

30

30engine_dir = dirname(realpath(__file__))

31engine_dir = dirname(realpath(__file__))

31

32

@@ -269,15 +270,24 @@ def get_engines_stats():

269 engine['percentage'] = 0

270 engine['percentage'] = 0

270

271

271 return [

272 return [

272− ('Page loads (sec)', sorted(pageloads, key=itemgetter('avg'))),

273 (

274+ gettext('Page loads (sec)'),

275+ sorted(pageloads, key=itemgetter('avg'))

276+ ),

277+ (

274− 'Number of results',

278+ gettext('Number of results'),

275 sorted(results, key=itemgetter('avg'), reverse=True)

279 sorted(results, key=itemgetter('avg'), reverse=True)

276 ),

280 ),

277− ('Scores', sorted(scores, key=itemgetter('avg'), reverse=True)),

278 (

281 (

282+ gettext('Scores'),

283+ sorted(scores, key=itemgetter('avg'), reverse=True)

284+ ),

285+ (

279− 'Scores per result',

286+ gettext('Scores per result'),

280 sorted(scores_per_result, key=itemgetter('avg'), reverse=True)

287 sorted(scores_per_result, key=itemgetter('avg'), reverse=True)

281 ),

288 ),

289+ (

290+ gettext('Errors'),

282− ('Errors', sorted(errors, key=itemgetter('avg'), reverse=True)),

291+ sorted(errors, key=itemgetter('avg'), reverse=True)

292+ ),

283 ]

293 ]

searx/templates/engines.html+4−5

@@ -1,12 +1,12 @@

1{% extends 'base.html' %}

2{% block content %}

3<div class="row">

4−<h2>Currently used search engines</h2>

4+ <h2>{{ _('Currently used search engines') }}</h2>

5

6 <table style="width: 80%;">

7 <tr>

8− <th>Engine name</th>

8+ <th>{{ _('Engine name') }}</th>

9− <th>Category</th>

9+ <th>{{ _('Category') }}</th>

10 </tr>

11 {% for (categ,search_engines) in categs %}

12 {% for search_engine in search_engines %}

@@ -20,7 +20,6 @@

20 {% endfor %}

21 {% endfor %}

22 </table>

23−<p>Please add more engines to this list, pull requests are welcome!</p>

24−<p class="right"><a href="/">back</a></p>

23+<p class="right"><a href="/">{{ _('back') }}</a></p>

25</div>

24</div>

26{% endblock %}

25{% endblock %}

searx/templates/index.html+2−2

@@ -4,8 +4,8 @@

4 <div class="title"><h1>searx</h1></div>

5 {% include 'search.html' %}

6 <p class="top_margin">

7− <a href="/about" class="hmarg">about</a>

7+ <a href="/about" class="hmarg">{{ _('about') }}</a>

8− <a href="/preferences" class="hmarg">preferences</a>

8+ <a href="/preferences" class="hmarg">{{ _('preferences') }}</a>

9 </p>

10</div>

11{% endblock %}

searx/templates/preferences.html+4−4

@@ -2,18 +2,18 @@

2{% block head %} {% endblock %}

3{% block content %}

4<div class="row">

5− <h2>Preferences</h2>

5+ <h2>{{ _('Preferences') }}</h2>

6

7

8 <fieldset>

9− <legend>Default categories</legend>

9+ <legend>{{ _('Default categories') }}</legend>

10 <form method="post" action="/preferences" id="search_form">

11 <p>

12 {% include 'categories.html' %}

13 </p>

14− <input type="submit" value="save" />

14+ <input type="submit" value="{{ _('save') }}" />

15 </form>

16 </fieldset>

17− <div class="right"><a href="/">back</a></div>

17+ <div class="right"><a href="/">{{ _('back') }}</a></div>

18</div>

19{% endblock %}

searx/templates/results.html+3−3

@@ -7,12 +7,12 @@

7</div>

8<div id="results">

9 {% if suggestions %}

10− <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>

10+ <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>

11 {% endif %}

12

13

14 <div id ="result_count">

15− Number of results: {{ number_of_results }}

15+ {{ _('Number of results') }}: {{ number_of_results }}

16 </div>

17

18 {% for result in results %}

@@ -23,7 +23,7 @@

23 {% endif %}

24 {% endfor %}

25 <div id="apis">

26− Download results

26+ {{ _('Download results') }}

27 <form method="post" action="/">

28 <div class="left">

29 <input type="hidden" name="q" value="{{ q }}" />

searx/templates/stats.html+1−1

@@ -1,7 +1,7 @@

1{% extends "base.html" %}

2{% block head %} {% endblock %}

3{% block content %}

4−<h2>Engine stats</h2>

4+<h2>{{ _('Engine stats') }}</h2>

5

6{% for stat_name,stat_category in stats %}

7<div class="left">