diff options
47 files changed, 152 insertions, 103 deletions
diff --git a/searx/engines/kickass.py b/searx/engines/kickass.py index 4e5a64350..ea7f17c23 100644 --- a/searx/engines/kickass.py +++ b/searx/engines/kickass.py @@ -45,11 +45,6 @@ def request(query, params): def response(resp): results = [] - # check if redirect comparing to the True value, - # because resp can be a Mock object, and any attribut name returns something. - if resp.is_redirect is True: - return results - dom = html.fromstring(resp.text) search_res = dom.xpath('//table[@class="data"]//tr') diff --git a/searx/search.py b/searx/search.py index 79a8ae0a9..83163d1e5 100644 --- a/searx/search.py +++ b/searx/search.py @@ -87,6 +87,12 @@ def make_callback(engine_name, results_queue, callback, params): # creating a callback wrapper for the search engine results def process_callback(response, **kwargs): + # check if redirect comparing to the True value, + # because resp can be a Mock object, and any attribut name returns something. + if response.is_redirect is True: + logger.debug('{0} redirect on: {1}'.format(engine_name, response)) + return + response.search_params = params timeout_overhead = 0.2 # seconds diff --git a/searx/static/themes/courgette/js/searx.js b/searx/static/themes/courgette/js/searx.js index 47dc722da..92a25e349 100644 --- a/searx/static/themes/courgette/js/searx.js +++ b/searx/static/themes/courgette/js/searx.js @@ -1,6 +1,6 @@ if(searx.autocompleter) { window.addEvent('domready', function() { - new Autocompleter.Request.JSON('q', '/autocompleter', { + new Autocompleter.Request.JSON('q', './autocompleter', { postVar:'q', postData:{ 'format': 'json' diff --git a/searx/static/themes/default/js/searx.js b/searx/static/themes/default/js/searx.js index 9be969bb3..d6d5b74bb 100644 --- a/searx/static/themes/default/js/searx.js +++ b/searx/static/themes/default/js/searx.js @@ -1,6 +1,6 @@ if(searx.autocompleter) { window.addEvent('domready', function() { - new Autocompleter.Request.JSON('q', '/autocompleter', { + new Autocompleter.Request.JSON('q', './autocompleter', { postVar:'q', postData:{ 'format': 'json' diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js index 2015c4d6a..8a1055da3 100644 --- a/searx/static/themes/oscar/js/searx.min.js +++ b/searx/static/themes/oscar/js/searx.min.js @@ -1,2 +1,2 @@ /*! oscar/searx.min.js | 09-01-2015 | https://github.com/asciimoo/searx */ -requirejs.config({baseUrl:"./static/themes/oscar/js",paths:{app:"../app"}}),searx.autocompleter&&(searx.searchResults=new Bloodhound({datumTokenizer:Bloodhound.tokenizers.obj.whitespace("value"),queryTokenizer:Bloodhound.tokenizers.whitespace,remote:"/autocompleter?q=%QUERY"}),searx.searchResults.initialize()),$(document).ready(function(){searx.autocompleter&&$("#q").typeahead(null,{name:"search-results",displayKey:function(a){return a},source:searx.searchResults.ttAdapter()})}),$(document).ready(function(){$("#q.autofocus").focus(),$(".select-all-on-click").click(function(){$(this).select()}),$(".btn-collapse").click(function(){var a=$(this).data("btn-text-collapsed"),b=$(this).data("btn-text-not-collapsed");""!==a&&""!==b&&(new_html=$(this).hasClass("collapsed")?$(this).html().replace(a,b):$(this).html().replace(b,a),$(this).html(new_html))}),$(".btn-toggle .btn").click(function(){var a="btn-"+$(this).data("btn-class"),b=$(this).data("btn-label-default"),c=$(this).data("btn-label-toggled");""!==c&&(new_html=$(this).hasClass("btn-default")?$(this).html().replace(b,c):$(this).html().replace(c,b),$(this).html(new_html)),$(this).toggleClass(a),$(this).toggleClass("btn-default")}),$(".media-loader").click(function(){var a=$(this).data("target"),b=$(a+" > iframe"),c=b.attr("src");(void 0===c||c===!1)&&b.attr("src",b.data("src"))}),$(".btn-sm").dblclick(function(){var a="btn-"+$(this).data("btn-class");$(this).hasClass("btn-default")?($(".btn-sm > input").attr("checked","checked"),$(".btn-sm > input").prop("checked",!0),$(".btn-sm").addClass(a),$(".btn-sm").addClass("active"),$(".btn-sm").removeClass("btn-default")):($(".btn-sm > input").attr("checked",""),$(".btn-sm > input").removeAttr("checked"),$(".btn-sm > input").checked=!1,$(".btn-sm").removeClass(a),$(".btn-sm").removeClass("active"),$(".btn-sm").addClass("btn-default"))})}),$(document).ready(function(){$(".searx_overpass_request").on("click",function(a){var b="https://overpass-api.de/api/interpreter?data=",c=b+"[out:json][timeout:25];(",d=");out meta;",e=$(this).data("osm-id"),f=$(this).data("osm-type"),g=$(this).data("result-table"),h="#"+$(this).data("result-table-loadicon"),i=["addr:city","addr:country","addr:housenumber","addr:postcode","addr:street"];if(e&&f&&g){g="#"+g;var j=null;switch(f){case"node":j=c+"node("+e+");"+d;break;case"way":j=c+"way("+e+");"+d;break;case"relation":j=c+"relation("+e+");"+d}if(j){$.ajax(j).done(function(a){if(a&&a.elements&&a.elements[0]){var b=a.elements[0],c=$(g).html();for(var d in b.tags)if(null===b.tags.name||-1==i.indexOf(d)){switch(c+="<tr><td>"+d+"</td><td>",d){case"phone":case"fax":c+='<a href="tel:'+b.tags[d].replace(/ /g,"")+'">'+b.tags[d]+"</a>";break;case"email":c+='<a href="mailto:'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"website":case"url":c+='<a href="'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"wikidata":c+='<a href="https://www.wikidata.org/wiki/'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"wikipedia":if(-1!=b.tags[d].indexOf(":")){c+='<a href="https://'+b.tags[d].substring(0,b.tags[d].indexOf(":"))+".wikipedia.org/wiki/"+b.tags[d].substring(b.tags[d].indexOf(":")+1)+'">'+b.tags[d]+"</a>";break}default:c+=b.tags[d]}c+="</td></tr>"}$(g).html(c),$(g).removeClass("hidden"),$(h).addClass("hidden")}}).fail(function(){$(h).html($(h).html()+'<p class="text-muted">could not load data!</p>')})}}$(this).off(a)}),$(".searx_init_map").on("click",function(a){var b=$(this).data("leaflet-target"),c=$(this).data("map-lon"),d=$(this).data("map-lat"),e=$(this).data("map-zoom"),f=$(this).data("map-boundingbox"),g=$(this).data("map-geojson");require(["leaflet-0.7.3.min"],function(){f&&(southWest=L.latLng(f[0],f[2]),northEast=L.latLng(f[1],f[3]),map_bounds=L.latLngBounds(southWest,northEast)),L.Icon.Default.imagePath="./static/themes/oscar/img/map";{var a=L.map(b),h="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",i='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors',j=new L.TileLayer(h,{minZoom:1,maxZoom:19,attribution:i}),k="http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg",l='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',m=new L.TileLayer(k,{minZoom:1,maxZoom:18,subdomains:"1234",attribution:l}),n="http://otile{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg",o='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="https://developer.mapquest.com/content/osm/mq_logo.png"> | Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency';new L.TileLayer(n,{minZoom:1,maxZoom:11,subdomains:"1234",attribution:o})}map_bounds?setTimeout(function(){a.fitBounds(map_bounds,{maxZoom:17})},0):c&&d&&(e?a.setView(new L.LatLng(d,c),e):a.setView(new L.LatLng(d,c),8)),a.addLayer(m);var p={"OSM Mapnik":j,MapQuest:m};L.control.layers(p).addTo(a),g&&L.geoJson(g).addTo(a)}),$(this).off(a)})});
\ No newline at end of file +requirejs.config({baseUrl:"./static/themes/oscar/js",paths:{app:"../app"}}),searx.autocompleter&&(searx.searchResults=new Bloodhound({datumTokenizer:Bloodhound.tokenizers.obj.whitespace("value"),queryTokenizer:Bloodhound.tokenizers.whitespace,remote:"./autocompleter?q=%QUERY"}),searx.searchResults.initialize()),$(document).ready(function(){searx.autocompleter&&$("#q").typeahead(null,{name:"search-results",displayKey:function(a){return a},source:searx.searchResults.ttAdapter()})}),$(document).ready(function(){$("#q.autofocus").focus(),$(".select-all-on-click").click(function(){$(this).select()}),$(".btn-collapse").click(function(){var a=$(this).data("btn-text-collapsed"),b=$(this).data("btn-text-not-collapsed");""!==a&&""!==b&&(new_html=$(this).hasClass("collapsed")?$(this).html().replace(a,b):$(this).html().replace(b,a),$(this).html(new_html))}),$(".btn-toggle .btn").click(function(){var a="btn-"+$(this).data("btn-class"),b=$(this).data("btn-label-default"),c=$(this).data("btn-label-toggled");""!==c&&(new_html=$(this).hasClass("btn-default")?$(this).html().replace(b,c):$(this).html().replace(c,b),$(this).html(new_html)),$(this).toggleClass(a),$(this).toggleClass("btn-default")}),$(".media-loader").click(function(){var a=$(this).data("target"),b=$(a+" > iframe"),c=b.attr("src");(void 0===c||c===!1)&&b.attr("src",b.data("src"))}),$(".btn-sm").dblclick(function(){var a="btn-"+$(this).data("btn-class");$(this).hasClass("btn-default")?($(".btn-sm > input").attr("checked","checked"),$(".btn-sm > input").prop("checked",!0),$(".btn-sm").addClass(a),$(".btn-sm").addClass("active"),$(".btn-sm").removeClass("btn-default")):($(".btn-sm > input").attr("checked",""),$(".btn-sm > input").removeAttr("checked"),$(".btn-sm > input").checked=!1,$(".btn-sm").removeClass(a),$(".btn-sm").removeClass("active"),$(".btn-sm").addClass("btn-default"))})}),$(document).ready(function(){$(".searx_overpass_request").on("click",function(a){var b="https://overpass-api.de/api/interpreter?data=",c=b+"[out:json][timeout:25];(",d=");out meta;",e=$(this).data("osm-id"),f=$(this).data("osm-type"),g=$(this).data("result-table"),h="#"+$(this).data("result-table-loadicon"),i=["addr:city","addr:country","addr:housenumber","addr:postcode","addr:street"];if(e&&f&&g){g="#"+g;var j=null;switch(f){case"node":j=c+"node("+e+");"+d;break;case"way":j=c+"way("+e+");"+d;break;case"relation":j=c+"relation("+e+");"+d}if(j){$.ajax(j).done(function(a){if(a&&a.elements&&a.elements[0]){var b=a.elements[0],c=$(g).html();for(var d in b.tags)if(null===b.tags.name||-1==i.indexOf(d)){switch(c+="<tr><td>"+d+"</td><td>",d){case"phone":case"fax":c+='<a href="tel:'+b.tags[d].replace(/ /g,"")+'">'+b.tags[d]+"</a>";break;case"email":c+='<a href="mailto:'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"website":case"url":c+='<a href="'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"wikidata":c+='<a href="https://www.wikidata.org/wiki/'+b.tags[d]+'">'+b.tags[d]+"</a>";break;case"wikipedia":if(-1!=b.tags[d].indexOf(":")){c+='<a href="https://'+b.tags[d].substring(0,b.tags[d].indexOf(":"))+".wikipedia.org/wiki/"+b.tags[d].substring(b.tags[d].indexOf(":")+1)+'">'+b.tags[d]+"</a>";break}default:c+=b.tags[d]}c+="</td></tr>"}$(g).html(c),$(g).removeClass("hidden"),$(h).addClass("hidden")}}).fail(function(){$(h).html($(h).html()+'<p class="text-muted">could not load data!</p>')})}}$(this).off(a)}),$(".searx_init_map").on("click",function(a){var b=$(this).data("leaflet-target"),c=$(this).data("map-lon"),d=$(this).data("map-lat"),e=$(this).data("map-zoom"),f=$(this).data("map-boundingbox"),g=$(this).data("map-geojson");require(["leaflet-0.7.3.min"],function(){f&&(southWest=L.latLng(f[0],f[2]),northEast=L.latLng(f[1],f[3]),map_bounds=L.latLngBounds(southWest,northEast)),L.Icon.Default.imagePath="./static/themes/oscar/img/map";{var a=L.map(b),h="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",i='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors',j=new L.TileLayer(h,{minZoom:1,maxZoom:19,attribution:i}),k="http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg",l='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',m=new L.TileLayer(k,{minZoom:1,maxZoom:18,subdomains:"1234",attribution:l}),n="http://otile{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg",o='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="https://developer.mapquest.com/content/osm/mq_logo.png"> | Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency';new L.TileLayer(n,{minZoom:1,maxZoom:11,subdomains:"1234",attribution:o})}map_bounds?setTimeout(function(){a.fitBounds(map_bounds,{maxZoom:17})},0):c&&d&&(e?a.setView(new L.LatLng(d,c),e):a.setView(new L.LatLng(d,c),8)),a.addLayer(m);var p={"OSM Mapnik":j,MapQuest:m};L.control.layers(p).addTo(a),g&&L.geoJson(g).addTo(a)}),$(this).off(a)})});
\ No newline at end of file diff --git a/searx/static/themes/oscar/js/searx_src/autocompleter.js b/searx/static/themes/oscar/js/searx_src/autocompleter.js index 561bff35a..70c66d2fc 100644 --- a/searx/static/themes/oscar/js/searx_src/autocompleter.js +++ b/searx/static/themes/oscar/js/searx_src/autocompleter.js @@ -19,7 +19,7 @@ if(searx.autocompleter) { searx.searchResults = new Bloodhound({
datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
queryTokenizer: Bloodhound.tokenizers.whitespace,
- remote: '/autocompleter?q=%QUERY'
+ remote: './autocompleter?q=%QUERY'
});
searx.searchResults.initialize();
}
diff --git a/searx/templates/courgette/preferences.html b/searx/templates/courgette/preferences.html index efa0f65fa..2abfafb13 100644 --- a/searx/templates/courgette/preferences.html +++ b/searx/templates/courgette/preferences.html @@ -14,7 +14,7 @@ <p> <select name='language'> <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option> - {% for lang_id,lang_name,country_name in language_codes %} + {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %} <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option> {% endfor %} </select> @@ -24,7 +24,7 @@ <legend>{{ _('Interface language') }}</legend> <p> <select name='locale'> - {% for locale_id,locale_name in locales.items() %} + {% for locale_id,locale_name in locales.items() | sort %} <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> {% endfor %} </select> diff --git a/searx/templates/courgette/result_templates/code.html b/searx/templates/courgette/result_templates/code.html index 6721bd0fe..382ce2a56 100644 --- a/searx/templates/courgette/result_templates/code.html +++ b/searx/templates/courgette/result_templates/code.html @@ -3,7 +3,9 @@ {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
<p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
{% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
+ <div dir="ltr">
{{ result.codelines|code_highlighter(result.code_language)|safe }}
+ </div>
- <p class="url">{{ result.pretty_url }}</p>
+ <p class="url">{{ result.pretty_url }}‎</p>
</div>
diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html index efd9778dc..f5f5acef7 100644 --- a/searx/templates/courgette/result_templates/default.html +++ b/searx/templates/courgette/result_templates/default.html @@ -8,6 +8,6 @@ <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %} <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p> - <p class="url">{{ result.pretty_url }}</p> + <p class="url">{{ result.pretty_url }}‎</p> </div> </div>
\ No newline at end of file diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html index efd9778dc..f5f5acef7 100644 --- a/searx/templates/courgette/result_templates/map.html +++ b/searx/templates/courgette/result_templates/map.html @@ -8,6 +8,6 @@ <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %} <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p> - <p class="url">{{ result.pretty_url }}</p> + <p class="url">{{ result.pretty_url }}‎</p> </div> </div>
\ No newline at end of file diff --git a/searx/templates/courgette/result_templates/torrent.html b/searx/templates/courgette/result_templates/torrent.html index 607c1de02..b961eb09b 100644 --- a/searx/templates/courgette/result_templates/torrent.html +++ b/searx/templates/courgette/result_templates/torrent.html @@ -9,5 +9,5 @@ {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %} {% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile">{{ _('torrent file') }}</a>{% endif %} </span> - <p class="url">{{ result.pretty_url }}</p> + <p class="url">{{ result.pretty_url }}‎</p> </div>
\ No newline at end of file diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html index 891b69f28..4e0174ba6 100644 --- a/searx/templates/courgette/result_templates/videos.html +++ b/searx/templates/courgette/result_templates/videos.html @@ -6,5 +6,5 @@ <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %} <a href="{{ result.url }}"><img width="400" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a> - <p class="url">{{ result.pretty_url }}</p> + <p class="url">{{ result.pretty_url }}‎</p> </div> diff --git a/searx/templates/courgette/results.html b/searx/templates/courgette/results.html index 6d603fdee..619c99763 100644 --- a/searx/templates/courgette/results.html +++ b/searx/templates/courgette/results.html @@ -13,7 +13,7 @@ <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_")|replace(' ','+') }}{% endif %}" readonly /> </div> <div id="apis"> - {{ _('Download results') }} + {{ _('Download results') }}<br /> {% for output_type in ('csv', 'json', 'rss') %} <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> <div class="left"> diff --git a/searx/templates/default/preferences.html b/searx/templates/default/preferences.html index 43180fd5b..e03c18e3f 100644 --- a/searx/templates/default/preferences.html +++ b/searx/templates/default/preferences.html @@ -15,7 +15,7 @@ <p> <select name='language'> <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option> - {% for lang_id,lang_name,country_name in language_codes %} + {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %} <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option> {% endfor %} </select> @@ -25,7 +25,7 @@ <legend>{{ _('Interface language') }}</legend> <p> <select name='locale'> - {% for locale_id,locale_name in locales.items() %} + {% for locale_id,locale_name in locales.items() | sort %} <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> {% endfor %} </select> diff --git a/searx/templates/default/result_templates/code.html b/searx/templates/default/result_templates/code.html index 751fb3b56..78eda1884 100644 --- a/searx/templates/default/result_templates/code.html +++ b/searx/templates/default/result_templates/code.html @@ -1,9 +1,11 @@ <div class="result {{ result.class }}">
<h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
- <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a></p>
+ <p class="url">{{ result.pretty_url }}‎ <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a></p>
{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
<p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
{% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
-
+
+ <div dir="ltr">
{{ result.codelines|code_highlighter(result.code_language)|safe }}
+ </div>
</div>
diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index 167db888b..4cbf231f1 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -1,6 +1,6 @@ <div class="result {{ result.class }}"> <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a> + <p class="url">{{ result.pretty_url }}‎ <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p> <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p> </div> diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html index b0eda2be5..e2d00f920 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/default/result_templates/map.html @@ -6,7 +6,7 @@ <div> <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a> + <p class="url">{{ result.pretty_url }}‎ <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">{{ _('cached') }}</a> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p> <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p> </div> diff --git a/searx/templates/default/result_templates/torrent.html b/searx/templates/default/result_templates/torrent.html index 6a71f9ac6..b91babfc6 100644 --- a/searx/templates/default/result_templates/torrent.html +++ b/searx/templates/default/result_templates/torrent.html @@ -3,7 +3,7 @@ <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" /> {% endif %} <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - <p class="url">{{ result.pretty_url }}</p> + <p class="url">{{ result.pretty_url }}‎</p> {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %} <p> {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %} diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html index 298799198..b85b4cf5a 100644 --- a/searx/templates/default/result_templates/videos.html +++ b/searx/templates/default/result_templates/videos.html @@ -2,5 +2,5 @@ <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3> {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %} <a href="{{ result.url }}"><img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a> - <p class="url">{{ result.url }}</p> + <p class="url">{{ result.url }}‎</p> </div> diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index df5c53965..c185f8774 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -46,7 +46,7 @@ <body> <div class="container"> {% include 'oscar/navbar.html' %} - + {% block site_alert_error %} {% endblock %} {% block site_alert_warning %} @@ -62,7 +62,7 @@ {% endblock %} {% block site_alert_success %} {% endblock %} - + {% block content %} {% endblock %} diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index 42721a812..1ba1617a9 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -33,13 +33,14 @@ {% macro result_footer_rtl(result) -%}
<div class="clearfix"></div>
<span class="label label-default pull-left">{{ result.engine }}</span>
- <p class="text-muted">{{ result.pretty_url }}</p>
+ <p class="text-muted">{{ result.pretty_url }}‎</p>
{%- endmacro %}
{% macro preferences_item_header(info, label, rtl) -%}
{% if rtl %}
<div class="row form-group">
- <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>
+ <label class="col-sm-3 col-md-2 pull-right">{{ label }}</label>
+ <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span>
<div class="col-sm-4 col-md-4">
{% else %}
<div class="row form-group">
@@ -51,7 +52,6 @@ {% macro preferences_item_footer(info, label, rtl) -%}
{% if rtl %}
</div>
- <label class="col-sm-3 col-md-2">{{ label }}</label>
</div>
{% else %}
</div>
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index b98100e8e..126bdbd7b 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -44,7 +44,7 @@ {{ preferences_item_header(language_info, language_label, rtl) }} <select class="form-control" name='language'> <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option> - {% for lang_id,lang_name,country_name in language_codes %} + {% for lang_id,lang_name,country_name in language_codes | sort(attribute=1) %} <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option> {% endfor %} </select> @@ -54,7 +54,7 @@ {% set locale_info = _('Change the language of the layout') %} {{ preferences_item_header(locale_info, locale_label, rtl) }} <select class="form-control" name='locale'> - {% for locale_id,locale_name in locales.items() %} + {% for locale_id,locale_name in locales.items() | sort %} <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> {% endfor %} </select> diff --git a/searx/templates/oscar/result_templates/code.html b/searx/templates/oscar/result_templates/code.html index 0ec0983b3..6890c7851 100644 --- a/searx/templates/oscar/result_templates/code.html +++ b/searx/templates/oscar/result_templates/code.html @@ -7,7 +7,9 @@ {% if result.repository %}<p class="result-content">{{ icon('file') }} <a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
+<div dir="ltr">
{{ result.codelines|code_highlighter(result.code_language)|safe }}
+</div>
{% if rtl %}
{{ result_footer_rtl(result) }}
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index 8303573f0..a75825611 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -91,7 +91,7 @@ </div>
<div class="panel-body">
{% for suggestion in suggestions %}
- <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">
+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} suggestion_item">
<input type="hidden" name="q" value="{{ suggestion }}">
<button type="submit" class="btn btn-default btn-xs">{{ suggestion }}</button>
</form>
@@ -115,7 +115,7 @@ <label>{{ _('Download results') }}</label>
<div class="clearfix"></div>
{% for output_type in ('csv', 'json', 'rss') %}
- <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-left result_download">
+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} result_download">
<input type="hidden" name="q" value="{{ q }}">
<input type="hidden" name="format" value="{{ output_type }}">
{% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1">{% endfor %}
diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo Binary files differindex 265f46788..d4202b004 100644 --- a/searx/translations/de/LC_MESSAGES/messages.mo +++ b/searx/translations/de/LC_MESSAGES/messages.mo diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index 056bf8167..c6a78a57d 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2015-02-10 17:41+0000\n" "Last-Translator: pointhi\n" "Language-Team: German " @@ -361,6 +361,13 @@ msgstr "torrent Datei" msgid "Click on the magnifier to perform search" msgstr "klicke auf die Lupe, um die Suche zu starten" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "Im Cache" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Powered by" @@ -369,10 +376,6 @@ msgstr "Powered by" msgid "a privacy-respecting, hackable metasearch engine" msgstr "eine privatsphären-respektierende, hackbare Metasuchmaschine" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "Im Cache" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "Startseite" diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo Binary files differindex f1e013b35..1871f6b77 100644 --- a/searx/translations/en/LC_MESSAGES/messages.mo +++ b/searx/translations/en/LC_MESSAGES/messages.mo diff --git a/searx/translations/en/LC_MESSAGES/messages.po b/searx/translations/en/LC_MESSAGES/messages.po index eba5c86b2..c143038da 100644 --- a/searx/translations/en/LC_MESSAGES/messages.po +++ b/searx/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2014-01-30 15:22+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL@li.org>\n" @@ -353,6 +353,13 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "" @@ -361,10 +368,6 @@ msgstr "" msgid "a privacy-respecting, hackable metasearch engine" msgstr "" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "" diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.mo Binary files differindex 6089ea6d9..76e6a900e 100644 --- a/searx/translations/es/LC_MESSAGES/messages.mo +++ b/searx/translations/es/LC_MESSAGES/messages.mo diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po index 866840e06..890c2bd4a 100644 --- a/searx/translations/es/LC_MESSAGES/messages.po +++ b/searx/translations/es/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2015-02-11 12:51+0000\n" "Last-Translator: Alejandro León Aznar\n" "Language-Team: Spanish " @@ -359,6 +359,13 @@ msgstr "archivo torrent" msgid "Click on the magnifier to perform search" msgstr "Haz clic en la lupa para realizar la búsqueda" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "en caché" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Creado por" @@ -367,10 +374,6 @@ msgstr "Creado por" msgid "a privacy-respecting, hackable metasearch engine" msgstr "un metabuscador hackeable que respeta la privacidad" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "en caché" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "inicio" diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo Binary files differindex 3944fd77e..28141d905 100644 --- a/searx/translations/fr/LC_MESSAGES/messages.mo +++ b/searx/translations/fr/LC_MESSAGES/messages.mo diff --git a/searx/translations/fr/LC_MESSAGES/messages.po b/searx/translations/fr/LC_MESSAGES/messages.po index e17ecbad0..15adbb302 100644 --- a/searx/translations/fr/LC_MESSAGES/messages.po +++ b/searx/translations/fr/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2015-02-10 17:01+0000\n" "Last-Translator: Cqoicebordel <david.barouh@wanadoo.fr>\n" "Language-Team: French " @@ -361,6 +361,13 @@ msgstr "fichier torrent" msgid "Click on the magnifier to perform search" msgstr "Cliquez sur la loupe pour effectuer une recherche" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "en cache" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Powered by" @@ -369,10 +376,6 @@ msgstr "Powered by" msgid "a privacy-respecting, hackable metasearch engine" msgstr "un meta-moteur de recherche hackable et respectueux de la vie privée" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "en cache" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "accueil" diff --git a/searx/translations/he/LC_MESSAGES/messages.mo b/searx/translations/he/LC_MESSAGES/messages.mo Binary files differindex e0f26c913..ee34e6b5b 100644 --- a/searx/translations/he/LC_MESSAGES/messages.mo +++ b/searx/translations/he/LC_MESSAGES/messages.mo diff --git a/searx/translations/he/LC_MESSAGES/messages.po b/searx/translations/he/LC_MESSAGES/messages.po index 83723f9d4..7924d3444 100644 --- a/searx/translations/he/LC_MESSAGES/messages.po +++ b/searx/translations/he/LC_MESSAGES/messages.po @@ -1,27 +1,26 @@ -# Translations template for PROJECT. +# Hebrew translations for . # Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# +# This file is distributed under the same license as the project. +# # Translators: # GenghisKhan <genghiskhan@gmx.ca>, 2015 -# GenghisKhan <genghiskhan@gmx.ca>, 2015 # pointhi, 2014 # rike, 2014 # stf <stefan.marsiske@gmail.com>, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2015-02-11 13:31+0000\n" "Last-Translator: pointhi\n" -"Language-Team: Hebrew (http://www.transifex.com/projects/p/searx/language/he/)\n" +"Language-Team: Hebrew " +"(http://www.transifex.com/projects/p/searx/language/he/)\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -"Language: he\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:100 msgid "files" @@ -256,9 +255,11 @@ msgstr "חסום" #: searx/templates/default/preferences.html:110 #: searx/templates/oscar/preferences.html:161 msgid "" -"These settings are stored in your cookies, this allows us not to store this " -"data about you." -msgstr "הגדרות אלו הינן מאוחסנות בתוך העוגיות שלך, אלו מאפשרות לנו לא לאחסן את מידע זה אודותייך." +"These settings are stored in your cookies, this allows us not to store " +"this data about you." +msgstr "" +"הגדרות אלו הינן מאוחסנות בתוך העוגיות שלך, אלו מאפשרות לנו לא לאחסן את " +"מידע זה אודותייך." #: searx/templates/courgette/preferences.html:124 #: searx/templates/default/preferences.html:112 @@ -266,7 +267,9 @@ msgstr "הגדרות אלו הינן מאוחסנות בתוך העוגיות ש msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "עוגיות אלו משרתות את נוחיותך הבלעדית, אנחנו לא משתמשים בהן כדי לעקוב אחריך." +msgstr "" +"עוגיות אלו משרתות את נוחיותך הבלעדית, אנחנו לא משתמשים בהן כדי לעקוב " +"אחריך." #: searx/templates/courgette/preferences.html:127 #: searx/templates/default/preferences.html:115 @@ -359,6 +362,13 @@ msgstr "קובץ torrent" msgid "Click on the magnifier to perform search" msgstr "לחצו על הזכוכית מגדלת כדי לבצע חיפוש" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "מוטמן" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "" @@ -367,10 +377,6 @@ msgstr "" msgid "a privacy-respecting, hackable metasearch engine" msgstr "" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "מוטמן" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "בית" @@ -410,7 +416,10 @@ msgid "" "Change how forms are submited, <a " "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods</a>" -msgstr "שינוי האופן בו טפסים נשלחים, <a href=\"http://he.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">למדו עוד אודות שיטות בקשה (request methods)</a>" +msgstr "" +"שינוי האופן בו טפסים נשלחים, <a " +"href=\"http://he.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" +" rel=\"external\">למדו עוד אודות שיטות בקשה (request methods)</a>" #: searx/templates/oscar/preferences.html:93 msgid "Filter content" @@ -566,3 +575,4 @@ msgstr "הצג וידאו" #: searx/templates/oscar/result_templates/videos.html:7 msgid "hide video" msgstr "הסתר וידאו" + diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.mo Binary files differindex 45c7aa508..b868510a2 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.mo +++ b/searx/translations/hu/LC_MESSAGES/messages.mo diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po index 38ed56893..99d94797f 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.po +++ b/searx/translations/hu/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2015-02-10 17:21+0000\n" "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Hungarian " @@ -357,6 +357,13 @@ msgstr "torrent fájl" msgid "Click on the magnifier to perform search" msgstr "A nagyítóra kattintva indítható a keresés" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "tárolt" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Az oldalt kiszolgálja: " @@ -365,10 +372,6 @@ msgstr "Az oldalt kiszolgálja: " msgid "a privacy-respecting, hackable metasearch engine" msgstr "egy privátszféra tisztelő, könnyen módosítható metakereső" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "tárolt" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "főoldal" diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.mo Binary files differindex dac396304..015752577 100644 --- a/searx/translations/it/LC_MESSAGES/messages.mo +++ b/searx/translations/it/LC_MESSAGES/messages.mo diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po index ba594d4ae..e7f0185bf 100644 --- a/searx/translations/it/LC_MESSAGES/messages.po +++ b/searx/translations/it/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2015-02-10 16:50+0000\n" "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n" "Language-Team: Italian " @@ -359,6 +359,13 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "" @@ -367,10 +374,6 @@ msgstr "" msgid "a privacy-respecting, hackable metasearch engine" msgstr "" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "" diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo Binary files differindex 6868cb7df..39ad86342 100644 --- a/searx/translations/ja/LC_MESSAGES/messages.mo +++ b/searx/translations/ja/LC_MESSAGES/messages.mo diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po index d3350cdd3..9fdabec7d 100644 --- a/searx/translations/ja/LC_MESSAGES/messages.po +++ b/searx/translations/ja/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2015-02-10 17:31+0000\n" "Last-Translator: pointhi\n" "Language-Team: Japanese " @@ -355,6 +355,13 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "" @@ -363,10 +370,6 @@ msgstr "" msgid "a privacy-respecting, hackable metasearch engine" msgstr "" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "スタートページ" diff --git a/searx/translations/nl/LC_MESSAGES/messages.mo b/searx/translations/nl/LC_MESSAGES/messages.mo Binary files differindex e03facda4..7decf2d99 100644 --- a/searx/translations/nl/LC_MESSAGES/messages.mo +++ b/searx/translations/nl/LC_MESSAGES/messages.mo diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po index 681c925df..af6c8c48f 100644 --- a/searx/translations/nl/LC_MESSAGES/messages.po +++ b/searx/translations/nl/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2015-02-10 16:50+0000\n" "Last-Translator: André Koot <meneer@tken.net>\n" "Language-Team: Dutch " @@ -359,6 +359,13 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "Klik op het vergrootglas om te zoeken" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "gecached" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Powered by" @@ -367,10 +374,6 @@ msgstr "Powered by" msgid "a privacy-respecting, hackable metasearch engine" msgstr "een privacy eerbiedigende, aanpasbare metazoekmachine" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "gecached" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "thuis" diff --git a/searx/translations/ru/LC_MESSAGES/messages.mo b/searx/translations/ru/LC_MESSAGES/messages.mo Binary files differindex b03eee4ff..af60fd5e8 100644 --- a/searx/translations/ru/LC_MESSAGES/messages.mo +++ b/searx/translations/ru/LC_MESSAGES/messages.mo diff --git a/searx/translations/ru/LC_MESSAGES/messages.po b/searx/translations/ru/LC_MESSAGES/messages.po index f1e1ea29c..b89227f59 100644 --- a/searx/translations/ru/LC_MESSAGES/messages.po +++ b/searx/translations/ru/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2015-02-10 17:01+0000\n" "Last-Translator: dimqua <dimqua@riseup.net>\n" "Language-Team: Russian (Russia) " @@ -360,6 +360,13 @@ msgstr "торрент-файл" msgid "Click on the magnifier to perform search" msgstr "Нажмите на лупу, чтобы выполнить поиск" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "в архиве" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Используется" @@ -368,10 +375,6 @@ msgstr "Используется" msgid "a privacy-respecting, hackable metasearch engine" msgstr "свободный движок метапоиска, уважающий вашу приватность" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "в архиве" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "главная" diff --git a/searx/translations/tr/LC_MESSAGES/messages.mo b/searx/translations/tr/LC_MESSAGES/messages.mo Binary files differindex ce447a3f7..1dc52c5b9 100644 --- a/searx/translations/tr/LC_MESSAGES/messages.mo +++ b/searx/translations/tr/LC_MESSAGES/messages.mo diff --git a/searx/translations/tr/LC_MESSAGES/messages.po b/searx/translations/tr/LC_MESSAGES/messages.po index 951cdb34c..e65ee0b43 100644 --- a/searx/translations/tr/LC_MESSAGES/messages.po +++ b/searx/translations/tr/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-02-11 14:09+0100\n" +"POT-Creation-Date: 2015-02-13 18:27+0100\n" "PO-Revision-Date: 2015-02-10 16:50+0000\n" "Last-Translator: Caner Başaran <basaran.caner@gmail.com>\n" "Language-Team: Turkish " @@ -357,6 +357,13 @@ msgstr "" msgid "Click on the magnifier to perform search" msgstr "Arama yapmak için büyütece tıklayın" +#: searx/templates/default/result_templates/code.html:3 +#: searx/templates/default/result_templates/default.html:3 +#: searx/templates/default/result_templates/map.html:9 +#: searx/templates/oscar/macros.html:20 +msgid "cached" +msgstr "önbellek" + #: searx/templates/oscar/base.html:74 msgid "Powered by" msgstr "Gücümün kaynağı" @@ -367,10 +374,6 @@ msgstr "" "kişisel gizliliğe saygılı ve merak edenlerin kurcalayabildiği bir meta " "arama motoru" -#: searx/templates/oscar/macros.html:20 -msgid "cached" -msgstr "önbellek" - #: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33 msgid "home" msgstr "anasayfa" diff --git a/searx/webapp.py b/searx/webapp.py index b12a08db5..13c965e0d 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -81,6 +81,8 @@ app = Flask( template_folder=templates_path ) +app.jinja_env.trim_blocks = True +app.jinja_env.lstrip_blocks = True app.secret_key = settings['server']['secret_key'] babel = Babel(app) |