From c2d95ecba4bab16f67848bf3a8469abe6f7da0e6 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Tue, 13 Jan 2015 16:40:30 +0100 Subject: [PATCH] update version 0.6 --- sources/CHANGELOG.rst | 26 ++++ sources/searx/engines/500px.py | 57 ++++++++ sources/searx/engines/__init__.py | 23 ++- sources/searx/engines/bing_news.py | 11 +- sources/searx/engines/faroo.py | 15 +- sources/searx/engines/flickr-noapi.py | 89 ++++++++++++ sources/searx/engines/flickr.py | 86 ++++++++---- sources/searx/engines/google_images.py | 2 +- sources/searx/engines/kickass.py | 87 ++++++++++++ sources/searx/engines/mediawiki.py | 11 +- sources/searx/engines/openstreetmap.py | 14 +- sources/searx/engines/photon.py | 132 ++++++++++++++++++ sources/searx/engines/searchcode_code.py | 65 +++++++++ sources/searx/engines/searchcode_doc.py | 49 +++++++ sources/searx/engines/soundcloud.py | 7 +- sources/searx/engines/subtitleseeker.py | 74 ++++++++++ sources/searx/engines/yacy.py | 29 ++-- sources/searx/engines/yahoo.py | 9 +- sources/searx/https_rewrite.py | 68 ++++++++- sources/searx/https_rules/Soundcloud.xml | 2 +- sources/searx/search.py | 127 +++++++++-------- sources/searx/settings.yml | 37 ++++- .../static/courgette/img/icon_kickass.ico | Bin 0 -> 1150 bytes .../searx/static/default/img/icon_kickass.ico | Bin 0 -> 1150 bytes .../searx/static/oscar/img/icons/kickass.png | Bin 0 -> 4527 bytes sources/searx/static/oscar/js/searx.min.js | 4 +- .../oscar/js/searx_src/00_requirejs_config.js | 2 +- .../oscar/js/searx_src/element_modifiers.js | 21 +++ .../static/oscar/js/searx_src/leaflet_map.js | 2 +- .../courgette/result_templates/default.html | 4 +- .../courgette/result_templates/images.html | 2 +- .../courgette/result_templates/map.html | 4 +- .../courgette/result_templates/videos.html | 8 +- .../searx/templates/courgette/results.html | 6 +- sources/searx/templates/default/infobox.html | 2 +- .../default/result_templates/default.html | 2 +- .../default/result_templates/images.html | 2 +- .../default/result_templates/map.html | 4 +- .../default/result_templates/torrent.html | 5 +- .../default/result_templates/videos.html | 6 +- sources/searx/templates/default/results.html | 2 +- .../oscar/result_templates/default.html | 2 +- .../oscar/result_templates/images.html | 2 +- .../templates/oscar/result_templates/map.html | 2 +- .../oscar/result_templates/torrent.html | 2 +- .../oscar/result_templates/videos.html | 4 +- sources/searx/tests/test_webapp.py | 2 +- .../translations/de/LC_MESSAGES/messages.mo | Bin 5181 -> 5436 bytes .../translations/de/LC_MESSAGES/messages.po | 92 ++++++------ .../translations/en/LC_MESSAGES/messages.mo | Bin 4814 -> 5000 bytes .../translations/es/LC_MESSAGES/messages.mo | Bin 5009 -> 5195 bytes .../translations/fr/LC_MESSAGES/messages.mo | Bin 5294 -> 5496 bytes .../translations/fr/LC_MESSAGES/messages.po | 62 ++++---- .../translations/hu/LC_MESSAGES/messages.mo | Bin 4936 -> 5168 bytes .../translations/hu/LC_MESSAGES/messages.po | 122 ++++++++-------- .../translations/it/LC_MESSAGES/messages.mo | Bin 4963 -> 5149 bytes .../translations/ja/LC_MESSAGES/messages.mo | Bin 4855 -> 5041 bytes .../translations/nl/LC_MESSAGES/messages.mo | Bin 4926 -> 5198 bytes .../translations/nl/LC_MESSAGES/messages.po | 126 ++++++++--------- sources/searx/version.py | 2 +- sources/searx/webapp.py | 75 ++-------- 61 files changed, 1141 insertions(+), 448 deletions(-) create mode 100644 sources/CHANGELOG.rst create mode 100644 sources/searx/engines/500px.py create mode 100644 sources/searx/engines/flickr-noapi.py create mode 100644 sources/searx/engines/kickass.py create mode 100644 sources/searx/engines/photon.py create mode 100644 sources/searx/engines/searchcode_code.py create mode 100644 sources/searx/engines/searchcode_doc.py create mode 100644 sources/searx/engines/subtitleseeker.py create mode 100644 sources/searx/static/courgette/img/icon_kickass.ico create mode 100644 sources/searx/static/default/img/icon_kickass.ico create mode 100644 sources/searx/static/oscar/img/icons/kickass.png diff --git a/sources/CHANGELOG.rst b/sources/CHANGELOG.rst new file mode 100644 index 0000000..efdfdde --- /dev/null +++ b/sources/CHANGELOG.rst @@ -0,0 +1,26 @@ +0.6.0 +===== + +- Changelog added +- New engines + - Flickr (api) + - Subtitleseeker + - photon + - 500px + - Searchcode + - Searchcode doc + - Kickass torrent +- Precise search request timeout handling +- Better favicon support +- Stricter config parsing +- Translation updates +- Multiple ui fixes +- Flickr (noapi) engine fix +- Pep8 fixes + + +News +~~~~ + +Health status of searx instances and engines: http://stats.searx.oe5tpo.com +(source: https://github.com/pointhi/searx_stats) diff --git a/sources/searx/engines/500px.py b/sources/searx/engines/500px.py new file mode 100644 index 0000000..5d53af3 --- /dev/null +++ b/sources/searx/engines/500px.py @@ -0,0 +1,57 @@ +## 500px (Images) +# +# @website https://500px.com +# @provide-api yes (https://developers.500px.com/) +# +# @using-api no +# @results HTML +# @stable no (HTML can change) +# @parse url, title, thumbnail, img_src, content +# +# @todo rewrite to api + + +from urllib import urlencode +from urlparse import urljoin +from lxml import html + +# engine dependent config +categories = ['images'] +paging = True + +# search-url +base_url = 'https://500px.com' +search_url = base_url+'/search?search?page={pageno}&type=photos&{query}' + + +# do search-request +def request(query, params): + params['url'] = search_url.format(pageno=params['pageno'], + query=urlencode({'q': query})) + + return params + + +# get response from search-request +def response(resp): + results = [] + + dom = html.fromstring(resp.text) + + # parse results + for result in dom.xpath('//div[@class="photo"]'): + link = result.xpath('.//a')[0] + url = urljoin(base_url, link.attrib.get('href')) + title = result.xpath('.//div[@class="title"]//text()')[0] + img_src = link.xpath('.//img')[0].attrib['src'] + content = result.xpath('.//div[@class="info"]//text()')[0] + + # append result + results.append({'url': url, + 'title': title, + 'img_src': img_src, + 'content': content, + 'template': 'images.html'}) + + # return results + return results diff --git a/sources/searx/engines/__init__.py b/sources/searx/engines/__init__.py index 80356a8..d42339a 100644 --- a/sources/searx/engines/__init__.py +++ b/sources/searx/engines/__init__.py @@ -41,11 +41,8 @@ def load_module(filename): module.name = modname return module -if 'engines' not in settings or not settings['engines']: - print '[E] Error no engines found. Edit your settings.yml' - exit(2) -for engine_data in settings['engines']: +def load_engine(engine_data): engine_name = engine_data['engine'] engine = load_module(engine_name + '.py') @@ -84,10 +81,10 @@ for engine_data in settings['engines']: if engine_attr.startswith('_'): continue if getattr(engine, engine_attr) is None: - print '[E] Engine config error: Missing attribute "{0}.{1}"'.format(engine.name, engine_attr) # noqa + print('[E] Engine config error: Missing attribute "{0}.{1}"'\ + .format(engine.name, engine_attr)) sys.exit(1) - engines[engine.name] = engine engine.stats = { 'result_count': 0, 'search_count': 0, @@ -104,7 +101,12 @@ for engine_data in settings['engines']: if engine.shortcut: # TODO check duplications + if engine.shortcut in engine_shortcuts: + print('[E] Engine config error: ambigious shortcut: {0}'\ + .format(engine.shortcut)) + sys.exit(1) engine_shortcuts[engine.shortcut] = engine.name + return engine def get_engines_stats(): @@ -194,3 +196,12 @@ def get_engines_stats(): sorted(errors, key=itemgetter('avg'), reverse=True) ), ] + + +if 'engines' not in settings or not settings['engines']: + print '[E] Error no engines found. Edit your settings.yml' + exit(2) + +for engine_data in settings['engines']: + engine = load_engine(engine_data) + engines[engine.name] = engine diff --git a/sources/searx/engines/bing_news.py b/sources/searx/engines/bing_news.py index 5dce4a2..3dda04c 100644 --- a/sources/searx/engines/bing_news.py +++ b/sources/searx/engines/bing_news.py @@ -57,12 +57,16 @@ def response(resp): link = result.xpath('.//div[@class="newstitle"]/a')[0] url = link.attrib.get('href') title = ' '.join(link.xpath('.//text()')) - contentXPath = result.xpath('.//div[@class="sn_txt"]/div//span[@class="sn_snip"]//text()') + contentXPath = result.xpath('.//div[@class="sn_txt"]/div' + '//span[@class="sn_snip"]//text()') if contentXPath is not None: content = escape(' '.join(contentXPath)) # parse publishedDate - publishedDateXPath = result.xpath('.//div[@class="sn_txt"]/div//span[contains(@class,"sn_ST")]//span[contains(@class,"sn_tm")]//text()') + publishedDateXPath = result.xpath('.//div[@class="sn_txt"]/div' + '//span[contains(@class,"sn_ST")]' + '//span[contains(@class,"sn_tm")]' + '//text()') if publishedDateXPath is not None: publishedDate = escape(' '.join(publishedDateXPath)) @@ -74,7 +78,8 @@ def response(resp): timeNumbers = re.findall(r'\d+', publishedDate) publishedDate = datetime.now()\ - timedelta(hours=int(timeNumbers[0])) - elif re.match("^[0-9]+ hour(s|), [0-9]+ minute(s|) ago$", publishedDate): + elif re.match("^[0-9]+ hour(s|)," + " [0-9]+ minute(s|) ago$", publishedDate): timeNumbers = re.findall(r'\d+', publishedDate) publishedDate = datetime.now()\ - timedelta(hours=int(timeNumbers[0]))\ diff --git a/sources/searx/engines/faroo.py b/sources/searx/engines/faroo.py index dada475..5360ea1 100644 --- a/sources/searx/engines/faroo.py +++ b/sources/searx/engines/faroo.py @@ -22,10 +22,17 @@ api_key = None # search-url url = 'http://www.faroo.com/' -search_url = url + 'api?{query}&start={offset}&length={number_of_results}&l={language}&src={categorie}&i=false&f=json&key={api_key}' +search_url = url + 'api?{query}'\ + '&start={offset}'\ + '&length={number_of_results}'\ + '&l={language}'\ + '&src={categorie}'\ + '&i=false'\ + '&f=json'\ + '&key={api_key}' # noqa search_category = {'general': 'web', - 'news': 'news'} + 'news': 'news'} # do search-request @@ -80,8 +87,8 @@ def response(resp): # parse results for result in search_res['results']: if result['news']: - # timestamp (how many milliseconds have passed between now and the beginning of 1970) - publishedDate = datetime.datetime.fromtimestamp(result['date']/1000.0) + # timestamp (milliseconds since 1970) + publishedDate = datetime.datetime.fromtimestamp(result['date']/1000.0) # noqa # append news result results.append({'url': result['url'], diff --git a/sources/searx/engines/flickr-noapi.py b/sources/searx/engines/flickr-noapi.py new file mode 100644 index 0000000..522503b --- /dev/null +++ b/sources/searx/engines/flickr-noapi.py @@ -0,0 +1,89 @@ +#!/usr/bin/env python + +# Flickr (Images) +# +# @website https://www.flickr.com +# @provide-api yes (https://secure.flickr.com/services/api/flickr.photos.search.html) +# +# @using-api no +# @results HTML +# @stable no +# @parse url, title, thumbnail, img_src + +from urllib import urlencode +from json import loads +import re + +categories = ['images'] + +url = 'https://secure.flickr.com/' +search_url = url+'search/?{query}&page={page}' +photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}' +regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL) +image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's') + +paging = True + + +def build_flickr_url(user_id, photo_id): + return photo_url.format(userid=user_id, photoid=photo_id) + + +def request(query, params): + params['url'] = search_url.format(query=urlencode({'text': query}), + page=params['pageno']) + return params + + +def response(resp): + results = [] + + matches = regex.search(resp.text) + + if matches is None: + return results + + match = matches.group(1) + search_results = loads(match) + + if '_data' not in search_results: + return [] + + photos = search_results['_data'] + + for photo in photos: + + # In paged configuration, the first pages' photos are represented by a None object + if photo is None: + continue + + img_src = None + # From the biggest to the lowest format + for image_size in image_sizes: + if image_size in photo['sizes']: + img_src = photo['sizes'][image_size]['displayUrl'] + break + + if not img_src: + continue + + if 'id' not in photo['owner']: + continue + + url = build_flickr_url(photo['owner']['id'], photo['id']) + + title = photo['title'] + + content = '' + photo['owner']['username'] + '
' + + if 'description' in photo: + content = content + '' + photo['description'] + '' + + # append result + results.append({'url': url, + 'title': title, + 'img_src': img_src, + 'content': content, + 'template': 'images.html'}) + + return results diff --git a/sources/searx/engines/flickr.py b/sources/searx/engines/flickr.py index 4ec2841..2fa5ed7 100644 --- a/sources/searx/engines/flickr.py +++ b/sources/searx/engines/flickr.py @@ -1,54 +1,80 @@ #!/usr/bin/env python +## Flickr (Images) +# +# @website https://www.flickr.com +# @provide-api yes (https://secure.flickr.com/services/api/flickr.photos.search.html) +# +# @using-api yes +# @results JSON +# @stable yes +# @parse url, title, thumbnail, img_src +#More info on api-key : https://www.flickr.com/services/apps/create/ + from urllib import urlencode -#from json import loads -from urlparse import urljoin -from lxml import html -from time import time +from json import loads categories = ['images'] -url = 'https://secure.flickr.com/' -search_url = url+'search/?{query}&page={page}' -results_xpath = '//div[@class="view display-item-tile"]/figure/div' +nb_per_page = 15 +paging = True +api_key= None + + +url = 'https://api.flickr.com/services/rest/?method=flickr.photos.search&api_key={api_key}&{text}&sort=relevance&extras=description%2C+owner_name%2C+url_o%2C+url_z&per_page={nb_per_page}&format=json&nojsoncallback=1&page={page}' +photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}' paging = True +def build_flickr_url(user_id, photo_id): + return photo_url.format(userid=user_id,photoid=photo_id) + def request(query, params): - params['url'] = search_url.format(query=urlencode({'text': query}), - page=params['pageno']) - time_string = str(int(time())-3) - params['cookies']['BX'] = '3oqjr6d9nmpgl&b=3&s=dh' - params['cookies']['xb'] = '421409' - params['cookies']['localization'] = 'en-us' - params['cookies']['flrbp'] = time_string +\ - '-3a8cdb85a427a33efda421fbda347b2eaf765a54' - params['cookies']['flrbs'] = time_string +\ - '-ed142ae8765ee62c9ec92a9513665e0ee1ba6776' - params['cookies']['flrb'] = '9' + params['url'] = url.format(text=urlencode({'text': query}), + api_key=api_key, + nb_per_page=nb_per_page, + page=params['pageno']) return params def response(resp): results = [] - dom = html.fromstring(resp.text) - for result in dom.xpath(results_xpath): - img = result.xpath('.//img') + + search_results = loads(resp.text) - if not img: + # return empty array if there are no results + if not 'photos' in search_results: + return [] + + if not 'photo' in search_results['photos']: + return [] + + photos = search_results['photos']['photo'] + + # parse results + for photo in photos: + if 'url_o' in photo: + img_src = photo['url_o'] + elif 'url_z' in photo: + img_src = photo['url_z'] + else: continue - img = img[0] - img_src = 'https:'+img.attrib.get('src') + url = build_flickr_url(photo['owner'], photo['id']) - if not img_src: - continue - - href = urljoin(url, result.xpath('.//a')[0].attrib.get('href')) - title = img.attrib.get('alt', '') - results.append({'url': href, + title = photo['title'] + + content = ''+ photo['ownername'] +'
' + + content = content + '' + photo['description']['_content'] + '' + + # append result + results.append({'url': url, 'title': title, 'img_src': img_src, + 'content': content, 'template': 'images.html'}) + + # return results return results diff --git a/sources/searx/engines/google_images.py b/sources/searx/engines/google_images.py index 491f5c2..79fac3f 100644 --- a/sources/searx/engines/google_images.py +++ b/sources/searx/engines/google_images.py @@ -9,7 +9,7 @@ # @stable yes (but deprecated) # @parse url, title, img_src -from urllib import urlencode,unquote +from urllib import urlencode, unquote from json import loads # engine dependent config diff --git a/sources/searx/engines/kickass.py b/sources/searx/engines/kickass.py new file mode 100644 index 0000000..f1fcd9e --- /dev/null +++ b/sources/searx/engines/kickass.py @@ -0,0 +1,87 @@ +## Kickass Torrent (Videos, Music, Files) +# +# @website https://kickass.so +# @provide-api no (nothing found) +# +# @using-api no +# @results HTML (using search portal) +# @stable yes (HTML can change) +# @parse url, title, content, seed, leech, magnetlink + +from urlparse import urljoin +from cgi import escape +from urllib import quote +from lxml import html +from operator import itemgetter + +# engine dependent config +categories = ['videos', 'music', 'files'] +paging = True + +# search-url +url = 'https://kickass.so/' +search_url = url + 'search/{search_term}/{pageno}/' + +# specific xpath variables +magnet_xpath = './/a[@title="Torrent magnet link"]' +#content_xpath = './/font[@class="detDesc"]//text()' + + +# do search-request +def request(query, params): + params['url'] = search_url.format(search_term=quote(query), + pageno=params['pageno']) + + # FIX: SSLError: hostname 'kickass.so' + # doesn't match either of '*.kickass.to', 'kickass.to' + params['verify'] = False + + return params + + +# get response from search-request +def response(resp): + results = [] + + dom = html.fromstring(resp.text) + + search_res = dom.xpath('//table[@class="data"]//tr') + + # return empty array if nothing is found + if not search_res: + return [] + + # parse results + for result in search_res[1:]: + link = result.xpath('.//a[@class="cellMainLink"]')[0] + href = urljoin(url, link.attrib['href']) + title = ' '.join(link.xpath('.//text()')) + content = escape(html.tostring(result.xpath('.//span[@class="font11px lightgrey block"]')[0], method="text")) + seed = result.xpath('.//td[contains(@class, "green")]/text()')[0] + leech = result.xpath('.//td[contains(@class, "red")]/text()')[0] + + # convert seed to int if possible + if seed.isdigit(): + seed = int(seed) + else: + seed = 0 + + # convert leech to int if possible + if leech.isdigit(): + leech = int(leech) + else: + leech = 0 + + magnetlink = result.xpath(magnet_xpath)[0].attrib['href'] + + # append result + results.append({'url': href, + 'title': title, + 'content': content, + 'seed': seed, + 'leech': leech, + 'magnetlink': magnetlink, + 'template': 'torrent.html'}) + + # return results sorted by seeder + return sorted(results, key=itemgetter('seed'), reverse=True) diff --git a/sources/searx/engines/mediawiki.py b/sources/searx/engines/mediawiki.py index 4a8b0e8..8ca32c6 100644 --- a/sources/searx/engines/mediawiki.py +++ b/sources/searx/engines/mediawiki.py @@ -28,15 +28,17 @@ search_url = base_url + 'w/api.php?action=query'\ '&srprop=timestamp'\ '&format=json'\ '&sroffset={offset}'\ - '&srlimit={limit}' + '&srlimit={limit}' # noqa # do search-request def request(query, params): offset = (params['pageno'] - 1) * number_of_results + string_args = dict(query=urlencode({'srsearch': query}), - offset=offset, - limit=number_of_results) + offset=offset, + limit=number_of_results) + format_strings = list(Formatter().parse(base_url)) if params['language'] == 'all': @@ -67,7 +69,8 @@ def response(resp): # parse results for result in search_results['query']['search']: - url = base_url.format(language=resp.search_params['language']) + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8')) + url = base_url.format(language=resp.search_params['language']) +\ + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8')) # append result results.append({'url': url, diff --git a/sources/searx/engines/openstreetmap.py b/sources/searx/engines/openstreetmap.py index 36b6011..68446ef 100644 --- a/sources/searx/engines/openstreetmap.py +++ b/sources/searx/engines/openstreetmap.py @@ -9,20 +9,24 @@ # @parse url, title from json import loads +from searx.utils import searx_useragent # engine dependent config categories = ['map'] paging = False # search-url -url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1&addressdetails=1' - +base_url = 'https://nominatim.openstreetmap.org/' +search_string = 'search/{query}?format=json&polygon_geojson=1&addressdetails=1' result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}' # do search-request def request(query, params): - params['url'] = url.format(query=query) + params['url'] = base_url + search_string.format(query=query) + + # using searx User-Agent + params['headers']['User-Agent'] = searx_useragent() return params @@ -68,8 +72,8 @@ def response(resp): address.update({'house_number': address_raw.get('house_number'), 'road': address_raw.get('road'), 'locality': address_raw.get('city', - address_raw.get('town', - address_raw.get('village'))), + address_raw.get('town', # noqa + address_raw.get('village'))), # noqa 'postcode': address_raw.get('postcode'), 'country': address_raw.get('country'), 'country_code': address_raw.get('country_code')}) diff --git a/sources/searx/engines/photon.py b/sources/searx/engines/photon.py new file mode 100644 index 0000000..16340d2 --- /dev/null +++ b/sources/searx/engines/photon.py @@ -0,0 +1,132 @@ +## Photon (Map) +# +# @website https://photon.komoot.de +# @provide-api yes (https://photon.komoot.de/) +# +# @using-api yes +# @results JSON +# @stable yes +# @parse url, title + +from urllib import urlencode +from json import loads +from searx.utils import searx_useragent + +# engine dependent config +categories = ['map'] +paging = False +language_support = True +number_of_results = 10 + +# search-url +base_url = 'https://photon.komoot.de/' +search_string = 'api/?{query}&limit={limit}' +result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}' + +# list of supported languages +allowed_languages = ['de', 'en', 'fr', 'it'] + + +# do search-request +def request(query, params): + params['url'] = base_url +\ + search_string.format(query=urlencode({'q': query}), + limit=number_of_results) + + if params['language'] != 'all': + language = params['language'].split('_')[0] + if language in allowed_languages: + params['url'] = params['url'] + "&lang=" + language + + # using searx User-Agent + params['headers']['User-Agent'] = searx_useragent() + + # FIX: SSLError: SSL3_GET_SERVER_CERTIFICATE:certificate verify failed + params['verify'] = False + + return params + + +# get response from search-request +def response(resp): + results = [] + json = loads(resp.text) + + # parse results + for r in json.get('features', {}): + + properties = r.get('properties') + + if not properties: + continue + + # get title + title = properties['name'] + + # get osm-type + if properties.get('osm_type') == 'N': + osm_type = 'node' + elif properties.get('osm_type') == 'W': + osm_type = 'way' + elif properties.get('osm_type') == 'R': + osm_type = 'relation' + else: + # continue if invalide osm-type + continue + + url = result_base_url.format(osm_type=osm_type, + osm_id=properties.get('osm_id')) + + osm = {'type': osm_type, + 'id': properties.get('osm_id')} + + geojson = r.get('geometry') + + if properties.get('extent'): + boundingbox = [properties.get('extent')[3], + properties.get('extent')[1], + properties.get('extent')[0], + properties.get('extent')[2]] + else: + # TODO: better boundingbox calculation + boundingbox = [geojson['coordinates'][1], + geojson['coordinates'][1], + geojson['coordinates'][0], + geojson['coordinates'][0]] + + # address calculation + address = {} + + # get name + if properties.get('osm_key') == 'amenity' or\ + properties.get('osm_key') == 'shop' or\ + properties.get('osm_key') == 'tourism' or\ + properties.get('osm_key') == 'leisure': + address = {'name': properties.get('name')} + + # add rest of adressdata, if something is already found + if address.get('name'): + address.update({'house_number': properties.get('housenumber'), + 'road': properties.get('street'), + 'locality': properties.get('city', + properties.get('town', # noqa + properties.get('village'))), # noqa + 'postcode': properties.get('postcode'), + 'country': properties.get('country')}) + else: + address = None + + # append result + results.append({'template': 'map.html', + 'title': title, + 'content': '', + 'longitude': geojson['coordinates'][0], + 'latitude': geojson['coordinates'][1], + 'boundingbox': boundingbox, + 'geojson': geojson, + 'address': address, + 'osm': osm, + 'url': url}) + + # return results + return results diff --git a/sources/searx/engines/searchcode_code.py b/sources/searx/engines/searchcode_code.py new file mode 100644 index 0000000..2ba0e52 --- /dev/null +++ b/sources/searx/engines/searchcode_code.py @@ -0,0 +1,65 @@ +## Searchcode (It) +# +# @website https://searchcode.com/ +# @provide-api yes (https://searchcode.com/api/) +# +# @using-api yes +# @results JSON +# @stable yes +# @parse url, title, content + +from urllib import urlencode +from json import loads +import cgi +import re + +# engine dependent config +categories = ['it'] +paging = True + +# search-url +url = 'https://searchcode.com/' +search_url = url+'api/codesearch_I/?{query}&p={pageno}' + + +# do search-request +def request(query, params): + params['url'] = search_url.format(query=urlencode({'q': query}), + pageno=params['pageno']-1) + + return params + + +# get response from search-request +def response(resp): + results = [] + + search_results = loads(resp.text) + + # parse results + for result in search_results['results']: + href = result['url'] + title = "" + result['name'] + " - " + result['filename'] + content = result['repo'] + "
" + + lines = dict() + for line, code in result['lines'].items(): + lines[int(line)] = code + + content = content + '
'
+        for line, code in sorted(lines.items()):
+            content = content + '"
+            
+        content = content + "
' 
+            content = content + str(line) + '' 
+            # Replace every two spaces with ' &nbps;' to keep formatting while allowing the browser to break the line if necessary
+            content = content + cgi.escape(code).replace('\t', '    ').replace('  ', '  ').replace('  ', '  ') 
+            content = content + "
" + + # append result + results.append({'url': href, + 'title': title, + 'content': content}) + + # return results + return results diff --git a/sources/searx/engines/searchcode_doc.py b/sources/searx/engines/searchcode_doc.py new file mode 100644 index 0000000..e07cbea --- /dev/null +++ b/sources/searx/engines/searchcode_doc.py @@ -0,0 +1,49 @@ +## Searchcode (It) +# +# @website https://searchcode.com/ +# @provide-api yes (https://searchcode.com/api/) +# +# @using-api yes +# @results JSON +# @stable yes +# @parse url, title, content + +from urllib import urlencode +from json import loads + +# engine dependent config +categories = ['it'] +paging = True + +# search-url +url = 'https://searchcode.com/' +search_url = url+'api/search_IV/?{query}&p={pageno}' + + +# do search-request +def request(query, params): + params['url'] = search_url.format(query=urlencode({'q': query}), + pageno=params['pageno']-1) + + return params + + +# get response from search-request +def response(resp): + results = [] + + search_results = loads(resp.text) + + # parse results + for result in search_results['results']: + href = result['url'] + title = "[" + result['type'] + "] " + result['namespace'] + " " + result['name'] + content = '[' + result['type'] + "] " + result['name'] + " " + result['synopsis'] + "
" + result['description'] + + # append result + results.append({'url': href, + 'title': title, + 'content': content}) + + # return results + return results diff --git a/sources/searx/engines/soundcloud.py b/sources/searx/engines/soundcloud.py index 390e7ca..164a569 100644 --- a/sources/searx/engines/soundcloud.py +++ b/sources/searx/engines/soundcloud.py @@ -20,7 +20,12 @@ guest_client_id = 'b45b1aa10f1ac2941910a7f0d10f8e28' # search-url url = 'https://api.soundcloud.com/' -search_url = url + 'search?{query}&facet=model&limit=20&offset={offset}&linked_partitioning=1&client_id={client_id}' +search_url = url + 'search?{query}'\ + '&facet=model'\ + '&limit=20'\ + '&offset={offset}'\ + '&linked_partitioning=1'\ + '&client_id={client_id}' # noqa # do search-request diff --git a/sources/searx/engines/subtitleseeker.py b/sources/searx/engines/subtitleseeker.py new file mode 100644 index 0000000..2f1636f --- /dev/null +++ b/sources/searx/engines/subtitleseeker.py @@ -0,0 +1,74 @@ +## Subtitleseeker (Video) +# +# @website http://www.subtitleseeker.com +# @provide-api no +# +# @using-api no +# @results HTML +# @stable no (HTML can change) +# @parse url, title, content + +from cgi import escape +from urllib import quote_plus +from lxml import html +from searx.languages import language_codes + +# engine dependent config +categories = ['videos'] +paging = True +language = "" + +# search-url +url = 'http://www.subtitleseeker.com/' +search_url = url+'search/TITLES/{query}&p={pageno}' + +# specific xpath variables +results_xpath = '//div[@class="boxRows"]' + + +# do search-request +def request(query, params): + params['url'] = search_url.format(query=quote_plus(query), + pageno=params['pageno']) + return params + + +# get response from search-request +def response(resp): + results = [] + + dom = html.fromstring(resp.text) + + search_lang = "" + + if resp.search_params['language'] != 'all': + search_lang = [lc[1] + for lc in language_codes + if lc[0][:2] == resp.search_params['language']][0] + + # parse results + for result in dom.xpath(results_xpath): + link = result.xpath(".//a")[0] + href = link.attrib.get('href') + + if language is not "": + href = href + language + '/' + elif search_lang: + href = href + search_lang + '/' + + title = escape(link.xpath(".//text()")[0]) + + content = result.xpath('.//div[contains(@class,"red")]//text()')[0] + content = content + " - " + content = content + html.tostring(result.xpath('.//div[contains(@class,"grey-web")]')[0], method='text') + + if result.xpath(".//span") != []: + content = content + " - (" + result.xpath(".//span//text()")[0].strip() + ")" + + # append result + results.append({'url': href, + 'title': title, + 'content': escape(content)}) + + # return results + return results diff --git a/sources/searx/engines/yacy.py b/sources/searx/engines/yacy.py index 3ee0e91..4c4fac7 100644 --- a/sources/searx/engines/yacy.py +++ b/sources/searx/engines/yacy.py @@ -24,7 +24,11 @@ number_of_results = 5 # search-url base_url = 'http://localhost:8090' -search_url = '/yacysearch.json?{query}&startRecord={offset}&maximumRecords={limit}&contentdom={search_type}&resource=global' +search_url = '/yacysearch.json?{query}'\ + '&startRecord={offset}'\ + '&maximumRecords={limit}'\ + '&contentdom={search_type}'\ + '&resource=global' # noqa # yacy specific type-definitions search_types = {'general': 'text', @@ -39,10 +43,11 @@ def request(query, params): offset = (params['pageno'] - 1) * number_of_results search_type = search_types.get(params['category'], '0') - params['url'] = base_url + search_url.format(query=urlencode({'query': query}), - offset=offset, - limit=number_of_results, - search_type=search_type) + params['url'] = base_url +\ + search_url.format(query=urlencode({'query': query}), + offset=offset, + limit=number_of_results, + search_type=search_type) # add language tag if specified if params['language'] != 'all': @@ -70,19 +75,19 @@ def response(resp): # append result results.append({'url': result['link'], - 'title': result['title'], - 'content': result['description'], - 'publishedDate': publishedDate}) + 'title': result['title'], + 'content': result['description'], + 'publishedDate': publishedDate}) elif resp.search_params['category'] == 'images': # parse image results for result in search_results: # append result results.append({'url': result['url'], - 'title': result['title'], - 'content': '', - 'img_src': result['image'], - 'template': 'images.html'}) + 'title': result['title'], + 'content': '', + 'img_src': result['image'], + 'template': 'images.html'}) #TODO parse video, audio and file results diff --git a/sources/searx/engines/yahoo.py b/sources/searx/engines/yahoo.py index 938540e..c6c5b0d 100644 --- a/sources/searx/engines/yahoo.py +++ b/sources/searx/engines/yahoo.py @@ -20,7 +20,8 @@ paging = True language_support = True # search-url -search_url = 'https://search.yahoo.com/search?{query}&b={offset}&fl=1&vl=lang_{lang}' +base_url = 'https://search.yahoo.com/' +search_url = 'search?{query}&b={offset}&fl=1&vl=lang_{lang}' # specific xpath variables results_xpath = '//div[@class="res"]' @@ -57,9 +58,9 @@ def request(query, params): else: language = params['language'].split('_')[0] - params['url'] = search_url.format(offset=offset, - query=urlencode({'p': query}), - lang=language) + params['url'] = base_url + search_url.format(offset=offset, + query=urlencode({'p': query}), + lang=language) # TODO required? params['cookies']['sB'] = 'fl=1&vl=lang_{lang}&sh=1&rw=new&v=1'\ diff --git a/sources/searx/https_rewrite.py b/sources/searx/https_rewrite.py index 9faf359..408474a 100644 --- a/sources/searx/https_rewrite.py +++ b/sources/searx/https_rewrite.py @@ -16,6 +16,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. ''' import re +from urlparse import urlparse from lxml import etree from os import listdir from os.path import isfile, isdir, join @@ -86,15 +87,23 @@ def load_single_https_ruleset(filepath): # TODO hack, which convert a javascript regex group # into a valid python regex group - rule_from = ruleset.attrib.get('from').replace('$', '\\') - rule_to = ruleset.attrib.get('to').replace('$', '\\') + rule_from = ruleset.attrib['from'].replace('$', '\\') + if rule_from.endswith('\\'): + rule_from = rule_from[:-1]+'$' + rule_to = ruleset.attrib['to'].replace('$', '\\') + if rule_to.endswith('\\'): + rule_to = rule_to[:-1]+'$' # TODO, not working yet because of the hack above, # currently doing that in webapp.py # rule_from_rgx = re.compile(rule_from, re.I) # append rule - rules.append((rule_from, rule_to)) + try: + rules.append((re.compile(rule_from, re.I | re.U), rule_to)) + except: + # TODO log regex error + continue # this child define an exclusion elif ruleset.tag == 'exclusion': @@ -143,3 +152,56 @@ def load_https_rules(rules_path): https_rules.append(ruleset) print(' * {n} https-rules loaded'.format(n=len(https_rules))) + + + +def https_url_rewrite(result): + skip_https_rewrite = False + # check if HTTPS rewrite is possible + for target, rules, exclusions in https_rules: + + # check if target regex match with url + if target.match(result['parsed_url'].netloc): + # process exclusions + for exclusion in exclusions: + # check if exclusion match with url + if exclusion.match(result['url']): + skip_https_rewrite = True + break + + # skip https rewrite if required + if skip_https_rewrite: + break + + # process rules + for rule in rules: + try: + new_result_url = rule[0].sub(rule[1], result['url']) + except: + break + + # parse new url + new_parsed_url = urlparse(new_result_url) + + # continiue if nothing was rewritten + if result['url'] == new_result_url: + continue + + # get domainname from result + # TODO, does only work correct with TLD's like + # asdf.com, not for asdf.com.de + # TODO, using publicsuffix instead of this rewrite rule + old_result_domainname = '.'.join( + result['parsed_url'].hostname.split('.')[-2:]) + new_result_domainname = '.'.join( + new_parsed_url.hostname.split('.')[-2:]) + + # check if rewritten hostname is the same, + # to protect against wrong or malicious rewrite rules + if old_result_domainname == new_result_domainname: + # set new url + result['url'] = new_result_url + + # target has matched, do not search over the other rules + break + return result diff --git a/sources/searx/https_rules/Soundcloud.xml b/sources/searx/https_rules/Soundcloud.xml index 0baa583..6958e8c 100644 --- a/sources/searx/https_rules/Soundcloud.xml +++ b/sources/searx/https_rules/Soundcloud.xml @@ -89,7 +89,7 @@ - timeout_limit: + engines[engine_name].stats['page_load_time'] += timeout_limit engines[engine_name].stats['errors'] += 1 - results[engine_name] = cb_res - - # print engine name and specific error message - print '[E] Error with engine "{0}":\n\t{1}'.format( - engine_name, str(e)) return + # callback + search_results = callback(response) + # add results for result in search_results: result['engine'] = engine_name - # if it is a suggestion, add it to list of suggestions - if 'suggestion' in result: - # TODO type checks - suggestions.add(result['suggestion']) - continue - - # if it is an answer, add it to list of answers - if 'answer' in result: - answers.add(result['answer']) - continue - - # if it is an infobox, add it to list of infoboxes - if 'infobox' in result: - infoboxes.append(result) - continue - - # append result - cb_res.append(result) - - results[engine_name] = cb_res + results_queue.put_nowait((engine_name, search_results)) # update stats with current page-load-time - engines[engine_name].stats['page_load_time'] += \ - (datetime.now() - params['started']).total_seconds() + engines[engine_name].stats['page_load_time'] += search_duration return process_callback @@ -420,6 +413,7 @@ class Search(object): # init vars requests = [] + results_queue = Queue() results = {} suggestions = set() answers = set() @@ -452,14 +446,13 @@ class Search(object): request_params = default_request_params() request_params['headers']['User-Agent'] = user_agent request_params['category'] = selected_engine['category'] - request_params['started'] = datetime.now() + request_params['started'] = time() request_params['pageno'] = self.pageno request_params['language'] = self.lang # update request parameters dependent on # search-engine (contained in engines folder) - request_params = engine.request(self.query.encode('utf-8'), - request_params) + engine.request(self.query.encode('utf-8'), request_params) if request_params['url'] is None: # TODO add support of offline engines @@ -468,13 +461,9 @@ class Search(object): # create a callback wrapper for the search engine results callback = make_callback( selected_engine['name'], - results, - suggestions, - answers, - infoboxes, + results_queue, engine.response, - request_params - ) + request_params) # create dictionary which contain all # informations about the request @@ -482,7 +471,8 @@ class Search(object): headers=request_params['headers'], hooks=dict(response=callback), cookies=request_params['cookies'], - timeout=engine.timeout + timeout=engine.timeout, + verify=request_params['verify'] ) # specific type of request (GET or POST) @@ -497,11 +487,34 @@ class Search(object): continue # append request to list - requests.append((req, request_params['url'], request_args)) + requests.append((req, request_params['url'], request_args, selected_engine['name'])) + if not requests: + return results, suggestions, answers, infoboxes # send all search-request threaded_requests(requests) + + while not results_queue.empty(): + engine_name, engine_results = results_queue.get_nowait() + + # TODO type checks + [suggestions.add(x['suggestion']) + for x in list(engine_results) + if 'suggestion' in x + and engine_results.remove(x) is None] + + [answers.add(x['answer']) + for x in list(engine_results) + if 'answer' in x + and engine_results.remove(x) is None] + + infoboxes.extend(x for x in list(engine_results) + if 'infobox' in x + and engine_results.remove(x) is None) + + results[engine_name] = engine_results + # update engine-specific stats for engine_name, engine_results in results.items(): engines[engine_name].stats['search_count'] += 1 diff --git a/sources/searx/settings.yml b/sources/searx/settings.yml index c84c27d..260b56c 100644 --- a/sources/searx/settings.yml +++ b/sources/searx/settings.yml @@ -1,7 +1,7 @@ server: port : 8888 secret_key : "ultrasecretkey" # change this! - debug : True # Debug mode, only for development + debug : False # Debug mode, only for development request_timeout : 2.0 # seconds base_url : False # Set custom base_url. Possible values: False or "https://your.custom.host/location/" themes_path : "" # Custom ui themes path @@ -64,12 +64,20 @@ engines: # engine : filecrop # categories : files # shortcut : fc + + - name : 500px + engine : 500px + shortcut : px - name : flickr - engine : flickr categories : images shortcut : fl - timeout: 3.0 +# You can use the engine using the official stable API, but you need an API key +# See : https://www.flickr.com/services/apps/create/ +# engine : flickr +# api_key: 'apikey' # required! +# Or you can use the html non-stable engine, activated by default + engine : flickr-noapi - name : general-file engine : generalfile @@ -95,10 +103,18 @@ engines: engine : openstreetmap shortcut : osm + - name : photon + engine : photon + shortcut : ph + # - name : piratebay # engine : piratebay # shortcut : tpb + - name : kickass + engine : kickass + shortcut : ka + - name : soundcloud engine : soundcloud shortcut : sc @@ -106,6 +122,21 @@ engines: - name : stackoverflow engine : stackoverflow shortcut : st + + - name : searchcode doc + engine : searchcode_doc + shortcut : scd + + - name : searchcode code + engine : searchcode_code + shortcut : scc + + - name : subtitleseeker + engine : subtitleseeker + shortcut : ss +# The language is an option. You can put any language written in english +# Examples : English, French, German, Hungarian, Chinese... +# language : English - name : startpage engine : startpage diff --git a/sources/searx/static/courgette/img/icon_kickass.ico b/sources/searx/static/courgette/img/icon_kickass.ico new file mode 100644 index 0000000000000000000000000000000000000000..4aa2c77a578d0322b42542e862e4dfdf77da920f GIT binary patch literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x$gfiO1%0|*lXWF5VW6}`jvNn5+> z5u+ZaM$W-IQ7^gZhiP%^e;8H|NxUs%<0=bNgNs)2314Sk+V=$Z4sc>bFIjy3&oG4uR}zY31tcIaj(Ir|vfR&@SzsO|p`!m$$< z{Qvgz*MAUr^!nZZjG4>9;vhNWl%jX&`i)|3YM$;#}0cM7}o4>4k| z9}pP>((jN}el2p!vi~5QId9$n+51oZzxMPcSU-q3bmRX2d#~R9FIlz~tOlmmG%~pZ zq~AHG;!51iRsTV_bon;8K6J*^J;%XnU}`O*Q(Hj#oia-HCC^>|AB5BAZ~Wh}<R=_t- k@G~%cU}s=>z|6pK0E8JC7#ctrs0b?t%7N4zGiG1_0JW|9m;e9( literal 0 HcmV?d00001 diff --git a/sources/searx/static/default/img/icon_kickass.ico b/sources/searx/static/default/img/icon_kickass.ico new file mode 100644 index 0000000000000000000000000000000000000000..4aa2c77a578d0322b42542e862e4dfdf77da920f GIT binary patch literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x$gfiO1%0|*lXWF5VW6}`jvNn5+> z5u+ZaM$W-IQ7^gZhiP%^e;8H|NxUs%<0=bNgNs)2314Sk+V=$Z4sc>bFIjy3&oG4uR}zY31tcIaj(Ir|vfR&@SzsO|p`!m$$< z{Qvgz*MAUr^!nZZjG4>9;vhNWl%jX&`i)|3YM$;#}0cM7}o4>4k| z9}pP>((jN}el2p!vi~5QId9$n+51oZzxMPcSU-q3bmRX2d#~R9FIlz~tOlmmG%~pZ zq~AHG;!51iRsTV_bon;8K6J*^J;%XnU}`O*Q(Hj#oia-HCC^>|AB5BAZ~Wh}<R=_t- k@G~%cU}s=>z|6pK0E8JC7#ctrs0b?t%7N4zGiG1_0JW|9m;e9( literal 0 HcmV?d00001 diff --git a/sources/searx/static/oscar/img/icons/kickass.png b/sources/searx/static/oscar/img/icons/kickass.png new file mode 100644 index 0000000000000000000000000000000000000000..567d1039ff8e74b4ef68634cf5d04d80f271aa0d GIT binary patch literal 4527 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"+d+"",d){case"phone":case"fax":c+=''+b.tags[d]+"";break;case"email":c+=''+b.tags[d]+"";break;case"website":case"url":c+=''+b.tags[d]+"";break;case"wikidata":c+=''+b.tags[d]+"";break;case"wikipedia":if(-1!=b.tags[d].indexOf(":")){c+=''+b.tags[d]+"";break}default:c+=b.tags[d]}c+=""}$(g).html(c),$(g).removeClass("hidden"),$(h).addClass("hidden")}}).fail(function(){$(h).html($(h).html()+'

could not load data!

')})}}$(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/oscar/img/map";{var a=L.map(b),h="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",i='Map data © OpenStreetMap 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 © OpenStreetMap contributors | Tiles Courtesy of MapQuest ',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 © OpenStreetMap contributors | Tiles Courtesy of MapQuest | 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 +/*! oscar/searx.min.js | 19-12-2014 | https://github.com/asciimoo/searx */ +requirejs.config({baseUrl:"./static/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")}),$(".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+=""+d+"",d){case"phone":case"fax":c+=''+b.tags[d]+"";break;case"email":c+=''+b.tags[d]+"";break;case"website":case"url":c+=''+b.tags[d]+"";break;case"wikidata":c+=''+b.tags[d]+"";break;case"wikipedia":if(-1!=b.tags[d].indexOf(":")){c+=''+b.tags[d]+"";break}default:c+=b.tags[d]}c+=""}$(g).html(c),$(g).removeClass("hidden"),$(h).addClass("hidden")}}).fail(function(){$(h).html($(h).html()+'

could not load data!

')})}}$(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/oscar/img/map";{var a=L.map(b),h="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",i='Map data © OpenStreetMap 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 © OpenStreetMap contributors | Tiles Courtesy of MapQuest ',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 © OpenStreetMap contributors | Tiles Courtesy of MapQuest | 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/sources/searx/static/oscar/js/searx_src/00_requirejs_config.js b/sources/searx/static/oscar/js/searx_src/00_requirejs_config.js index 3676784..99ec4b5 100644 --- a/sources/searx/static/oscar/js/searx_src/00_requirejs_config.js +++ b/sources/searx/static/oscar/js/searx_src/00_requirejs_config.js @@ -16,7 +16,7 @@ */ requirejs.config({ - baseUrl: '/static/oscar/js', + baseUrl: './static/oscar/js', paths: { app: '../app' } diff --git a/sources/searx/static/oscar/js/searx_src/element_modifiers.js b/sources/searx/static/oscar/js/searx_src/element_modifiers.js index 088bd7a..dd45b77 100644 --- a/sources/searx/static/oscar/js/searx_src/element_modifiers.js +++ b/sources/searx/static/oscar/js/searx_src/element_modifiers.js @@ -63,4 +63,25 @@ $(document).ready(function(){ $(this).toggleClass(btnClass); $(this).toggleClass('btn-default'); }); + + /** + * Select or deselect every categories on double clic + */ + $(".btn-sm").dblclick(function() { + var btnClass = 'btn-' + $(this).data('btn-class'); // primary + if($(this).hasClass('btn-default')) { + $(".btn-sm > input").attr('checked', 'checked'); + $(".btn-sm > input").prop("checked", true); + $(".btn-sm").addClass(btnClass); + $(".btn-sm").addClass('active'); + $(".btn-sm").removeClass('btn-default'); + } else { + $(".btn-sm > input").attr('checked', ''); + $(".btn-sm > input").removeAttr('checked'); + $(".btn-sm > input").checked = false; + $(".btn-sm").removeClass(btnClass); + $(".btn-sm").removeClass('active'); + $(".btn-sm").addClass('btn-default'); + } + }); }); diff --git a/sources/searx/static/oscar/js/searx_src/leaflet_map.js b/sources/searx/static/oscar/js/searx_src/leaflet_map.js index 88af1e7..b5112ef 100644 --- a/sources/searx/static/oscar/js/searx_src/leaflet_map.js +++ b/sources/searx/static/oscar/js/searx_src/leaflet_map.js @@ -116,7 +116,7 @@ $(document).ready(function(){ // TODO hack // change default imagePath - L.Icon.Default.imagePath = "/static/oscar/img/map"; + L.Icon.Default.imagePath = "./static/oscar/img/map"; // init map var map = L.map(leaflet_target); diff --git a/sources/searx/templates/courgette/result_templates/default.html b/sources/searx/templates/courgette/result_templates/default.html index 734f906..3e93eee 100644 --- a/sources/searx/templates/courgette/result_templates/default.html +++ b/sources/searx/templates/courgette/result_templates/default.html @@ -1,7 +1,7 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %}
diff --git a/sources/searx/templates/courgette/result_templates/images.html b/sources/searx/templates/courgette/result_templates/images.html index 1f15ff2..ebda538 100644 --- a/sources/searx/templates/courgette/result_templates/images.html +++ b/sources/searx/templates/courgette/result_templates/images.html @@ -1,6 +1,6 @@

- + {{ result.title|striptags }} original context

diff --git a/sources/searx/templates/courgette/result_templates/map.html b/sources/searx/templates/courgette/result_templates/map.html index 734f906..3e93eee 100644 --- a/sources/searx/templates/courgette/result_templates/map.html +++ b/sources/searx/templates/courgette/result_templates/map.html @@ -1,7 +1,7 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %}
diff --git a/sources/searx/templates/courgette/result_templates/videos.html b/sources/searx/templates/courgette/result_templates/videos.html index 8ceb0b1..2694a91 100644 --- a/sources/searx/templates/courgette/result_templates/videos.html +++ b/sources/searx/templates/courgette/result_templates/videos.html @@ -1,12 +1,10 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %} -

{{ result.title|safe }}

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} - {{ result.title }} + {{ result.title|striptags }}

{{ result.url }}

-

diff --git a/sources/searx/templates/courgette/results.html b/sources/searx/templates/courgette/results.html index d0b53b4..62bef8c 100644 --- a/sources/searx/templates/courgette/results.html +++ b/sources/searx/templates/courgette/results.html @@ -10,7 +10,7 @@
{{ _('Search URL') }}: - +
{{ _('Download results') }} @@ -43,9 +43,9 @@ {% for result in results %} {% if result['template'] %} - {% include 'default/result_templates/'+result['template'] %} + {% include 'courgette/result_templates/'+result['template'] %} {% else %} - {% include 'default/result_templates/default.html' %} + {% include 'courgette/result_templates/default.html' %} {% endif %} {% endfor %} diff --git a/sources/searx/templates/default/infobox.html b/sources/searx/templates/default/infobox.html index d03b008..d3ff8f0 100644 --- a/sources/searx/templates/default/infobox.html +++ b/sources/searx/templates/default/infobox.html @@ -1,6 +1,6 @@

{{ infobox.infobox }}

- {% if infobox.img_src %}{% endif %} + {% if infobox.img_src %}{{ infobox.infobox|striptags }}{% endif %}

{{ infobox.entity }}

{{ infobox.content | safe }}

{% if infobox.attributes %} diff --git a/sources/searx/templates/default/result_templates/default.html b/sources/searx/templates/default/result_templates/default.html index d0e725a..0f3e3e6 100644 --- a/sources/searx/templates/default/result_templates/default.html +++ b/sources/searx/templates/default/result_templates/default.html @@ -1,5 +1,5 @@
-

{% if result['favicon'] %}{% endif %}{{ result.title|safe }}

+

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{{ result.pretty_url }} cached

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

diff --git a/sources/searx/templates/default/result_templates/images.html b/sources/searx/templates/default/result_templates/images.html index bead78c..4c6d59e 100644 --- a/sources/searx/templates/default/result_templates/images.html +++ b/sources/searx/templates/default/result_templates/images.html @@ -1,6 +1,6 @@

- + {{ result.title|striptags }} original context

diff --git a/sources/searx/templates/default/result_templates/map.html b/sources/searx/templates/default/result_templates/map.html index 78221aa..f9ba7dc 100644 --- a/sources/searx/templates/default/result_templates/map.html +++ b/sources/searx/templates/default/result_templates/map.html @@ -1,7 +1,7 @@
- {% if result['favicon'] %} - + {% if "icon_"~result.engine~".ico" in favicons %} + {{result.engine}} {% endif %}
diff --git a/sources/searx/templates/default/result_templates/torrent.html b/sources/searx/templates/default/result_templates/torrent.html index 6c62793..5925f13 100644 --- a/sources/searx/templates/default/result_templates/torrent.html +++ b/sources/searx/templates/default/result_templates/torrent.html @@ -1,7 +1,6 @@

{{ result.title|safe }}

- {% if result.content %}

{{ result.content|safe }}

{% endif %} -

Seed: {{ result.seed }}, Leech: {{ result.leech }}

-

magnet link

{{ result.pretty_url }}

+ {% if result.content %}

{{ result.content|safe }}

{% endif %} +

magnet link - Seed: {{ result.seed }}, Leech: {{ result.leech }}

diff --git a/sources/searx/templates/default/result_templates/videos.html b/sources/searx/templates/default/result_templates/videos.html index 233a6c0..16b2d5f 100644 --- a/sources/searx/templates/default/result_templates/videos.html +++ b/sources/searx/templates/default/result_templates/videos.html @@ -1,8 +1,6 @@
-

-

{% if result['favicon'] %}{% endif %}{{ result.title|safe }}

+

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} - {{ result.title }} + {{ result.title|striptags }}

{{ result.url }}

-

diff --git a/sources/searx/templates/default/results.html b/sources/searx/templates/default/results.html index 5419835..199eb1d 100644 --- a/sources/searx/templates/default/results.html +++ b/sources/searx/templates/default/results.html @@ -10,7 +10,7 @@
{{ _('Search URL') }}: - +
{{ _('Download results') }} diff --git a/sources/searx/templates/oscar/result_templates/default.html b/sources/searx/templates/oscar/result_templates/default.html index 0f090d8..3c8e625 100644 --- a/sources/searx/templates/oscar/result_templates/default.html +++ b/sources/searx/templates/oscar/result_templates/default.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} diff --git a/sources/searx/templates/oscar/result_templates/images.html b/sources/searx/templates/oscar/result_templates/images.html index 7689f9f..94627c9 100644 --- a/sources/searx/templates/oscar/result_templates/images.html +++ b/sources/searx/templates/oscar/result_templates/images.html @@ -7,7 +7,7 @@
-

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|striptags }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|striptags }}

{{ result.title }} diff --git a/sources/searx/templates/oscar/result_templates/map.html b/sources/searx/templates/oscar/result_templates/map.html index 343e713..a0858c0 100644 --- a/sources/searx/templates/oscar/result_templates/map.html +++ b/sources/searx/templates/oscar/result_templates/map.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} diff --git a/sources/searx/templates/oscar/result_templates/torrent.html b/sources/searx/templates/oscar/result_templates/torrent.html index 1e133e3..b6753f7 100644 --- a/sources/searx/templates/oscar/result_templates/torrent.html +++ b/sources/searx/templates/oscar/result_templates/torrent.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} diff --git a/sources/searx/templates/oscar/result_templates/videos.html b/sources/searx/templates/oscar/result_templates/videos.html index 06275b8..2b95688 100644 --- a/sources/searx/templates/oscar/result_templates/videos.html +++ b/sources/searx/templates/oscar/result_templates/videos.html @@ -1,13 +1,13 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+

{% if result.engine~".png" in favicons %}{{ result.engine }} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }}
- {{ result.title|urlencode }} {{ result['favicon'] }} + {{ result.title|striptags }} {{ result.engine }} {% if result.content %}

{{ result.content|safe }}

{% endif %}
diff --git a/sources/searx/tests/test_webapp.py b/sources/searx/tests/test_webapp.py index 7771567..35ae493 100644 --- a/sources/searx/tests/test_webapp.py +++ b/sources/searx/tests/test_webapp.py @@ -49,7 +49,7 @@ class ViewsTestCase(SearxTestCase): ) result = self.app.post('/', data={'q': 'test'}) self.assertIn( - '

First Test

', # noqa + '

youtubeSecond Test

', # noqa result.data ) self.assertIn( diff --git a/sources/searx/translations/de/LC_MESSAGES/messages.mo b/sources/searx/translations/de/LC_MESSAGES/messages.mo index 2c65bc1217ffebd49c8bf7b783b5c9138921338e..5914116277dcc5a11ad81dda177c6b54cc109626 100644 GIT binary patch delta 2026 zcmYMze`r-@7{KxO`eSoH-KKLIo4$qahuqmVvT|rCWrEC&+L&n=oZY?m-qX%KXPtAd zi;J@C3et zAL26HU82;TID)M>f!tCv*re3Bnq^SOg&(m7|G)~oiIS+Ctdh8a1DDhqT!GES>swF? z*WXU!rXOJl5hxlpS5gLSeX-^P5;08*fGPWrT>#-Rd zu^%78C-4oF0{%joznCgms%lXRx`RUtuET}63&%ScJjy^?au65cA(TWD#p|yln^s3r z3ObGw_yd&rAEV4ajncu-Q4)NC689|1yl;@&)DI{H{!~u?rA5CNC;W?&;1)`PN@mG< zJxZXvP!hG`V|X{V;z4Y{_wZy)sX3JOPZL}c=1|_57m-`)O(cbys-pig;S?8Ua28i% zz=K+YuVGy7qb#_Ba{pJ9m#d5iyAm5wTE7t`(GDb(dJ?5z2iq_}$@dn@#-_#@NNcB2 zp8YJ!yKoUV;Wd<87t-5N!$23^z^9llb)Z^fwBBVI^R=L5?j&Z zB`n9zS)uK@YL^Mq-mvQR@{gAuSg>%93G&~Tor^8$x>t8~bl=k%ov3K4=sy^J7Gj_`8LC+5oX=iSd z@z~sC+Bfd79wzs8+f7+R1azbG)hoxhCDLKmO(_YLw4IO{`;8xjhNQ0QquL}vNaF^h zzJ+Rgpaa{aLmhZj6==%|v^S)Ot$_Hps|%|GTI%SG%`Ce3jJAVtgW4-WRgdkC1ZwUW zp##$v<|O;=jvCcV05#y7WYYMSo3ql6>Pu^vt1Z#k()I0yom-A$bTaFX$ipzMbRwYa zeq)D)X1LifXWR`sy0A1=X=RLC*pP3s`RFV&ZJ*%UjjpZ9Y<+20C|H%%)t9EYRlP7vPMXm4NtZnB zW|>sGiXan}$HE4^aBRa1$54aC3nxNh7sCrHLx!CLVK@;ll!?xP;P=M@hUEF2=e+#? z|8sJ_?7FyX@p?nqis3WP?|y#gOZ4{tXK%SNe9aJ#N_-q^@M)~VgUHt$;&BhA@Ejh- zMr^4tCWO0@E;EL$7{vx-7R_NAK{}Rk3$CCNoJJ+QfPBpwk9+ZAvHuFHfNMp6MkV|m z32e$(+>I@$I3qk%zU1Vhr{?LR^ug9VH>E0KVm)JD31SywY&!i zQipZ8728qsdr>Fbk1B8+n=z?z@|$BcwBzHbMDJ+;SFsb%U=%OoOW4M?Rlovj{t0Br zoJ19T8h7G(4C58l&dV7r!!4-zL0r^83k^15T2X~`paSkeEf_>C7)D)>r?3=9QR|;U z&6_}SnMqV(an#9Vi{r1M;xD1%zgx}utK%dc3Um&Y=wsA{{0w(tIni3M7e5FX^CT+3 zCW}@04bG3lhf=b=QupbGgLbt0-xJFmqd96&a>XpYiQ;3ZULZx`R+ zzdOO4LIpm9SFuxlC$+=ZGr zSacK>U=o$c;yakZF1&-flpRflh4SV=;fspWK*gB#QrSddqw-iu;rZ%s0^!JGPNaVz z(ziPt35Tnnd$woX&ZqO~tlKjZ^X!1LCmiYP2|v^m>31TJ4)lfnv6`03*=*YNQfYs= z=5~4hh|T2-$7_Ruwq-YAbJj_utrMNi#o{U2Ht+0@y_%i#^8WR$E1_hXIZjk#u5)Dl zY$|8n1haC^6KQuUcF6jxb=yMw++;R46Z0q|WTJENR5G3Mm@`i*&&H>%zfsrhzg{`m zes@3COyq1bX>&1mA(qOR7i=yOo0;)K{>#Cx2c5YYCzi=rXJ&nEDwB?@ z8r7S#Fz2{)-hy>|{X%f6)Y?R$vwk(;->PcxuQohT8Zrm`e;c}+Y}&QXY%VudxG#> diff --git a/sources/searx/translations/de/LC_MESSAGES/messages.po b/sources/searx/translations/de/LC_MESSAGES/messages.po index 1323b44..9526536 100644 --- a/sources/searx/translations/de/LC_MESSAGES/messages.po +++ b/sources/searx/translations/de/LC_MESSAGES/messages.po @@ -1,25 +1,28 @@ -# English translations for . +# English translations for PROJECT. # Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the project. -# +# This file is distributed under the same license as the PROJECT project. +# # Translators: # pointhi, 2014 +# pointhi, 2014 +# rike, 2014 +# stf , 2014 # stf , 2014 # rike, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-03-15 18:40+0000\n" -"Last-Translator: pointhi\n" -"Language-Team: German " -"(http://www.transifex.com/projects/p/searx/language/de/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"PO-Revision-Date: 2014-12-25 10:01+0000\n" +"Last-Translator: Adam Tauber \n" +"Language-Team: German (http://www.transifex.com/projects/p/searx/language/de/)\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: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:308 msgid "{minutes} minute(s) ago" @@ -143,11 +146,9 @@ msgstr "Blockieren" #: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store " -"this data about you." -msgstr "" -"Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, " -"damit wir keine Ihrer persönlichen Daten speichern müssen." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, damit wir keine Ihrer persönlichen Daten speichern müssen." #: searx/templates/courgette/preferences.html:94 #: searx/templates/default/preferences.html:96 @@ -155,9 +156,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Diese Cookies dienen einzig Ihrem Komfort, wir verwenden sie nicht, um " -"Sie zu überwachen." +msgstr "Diese Cookies dienen einzig Ihrem Komfort, wir verwenden sie nicht, um Sie zu überwachen." #: searx/templates/courgette/preferences.html:97 #: searx/templates/default/preferences.html:99 @@ -214,35 +213,35 @@ msgstr "Suchmaschinenstatistik" #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" -msgstr "" +msgstr "klicke auf die Lupe, um die Suche zu starten" #: searx/templates/default/preferences.html:72 msgid "Localization" -msgstr "" +msgstr "Übersetzung" #: searx/templates/default/preferences.html:82 msgid "Yes" -msgstr "" +msgstr "Ja" #: searx/templates/default/preferences.html:82 msgid "No" -msgstr "" +msgstr "Nein" #: searx/templates/default/results.html:34 msgid "Answers" -msgstr "" +msgstr "Antworten" #: searx/templates/oscar/base.html:69 msgid "Powered by" -msgstr "" +msgstr "Powered by" #: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "eine privatsphären respektierende, hackbare Metasuchmaschine" +msgstr "eine privatsphären-respektierende, hackbare Metasuchmaschine" #: searx/templates/oscar/navbar.html:6 msgid "Toggle navigation" -msgstr "" +msgstr "Navigation umschalten" #: searx/templates/oscar/navbar.html:15 msgid "home" @@ -260,25 +259,22 @@ msgstr "Suchmaschinen" #: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" -msgstr "Welche Sprache bevorzugst du für die Suche?" +msgstr "welche Sprache bevorzugst du für die Suche?" #: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" -msgstr "Ändere die Sprache des Layouts" +msgstr "ändere die Sprache des Layouts" #: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" -msgstr "finde Sachen während der Eingabe" +msgstr "zeige Vorschläge während der Eingabe an" #: searx/templates/oscar/preferences.html:73 msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"ändere wie Formulare übertragen werden, lerne mehr über Anfragemethoden" +msgstr "ändere wie Formulare übertragen werden, lerne mehr über Anfragemethoden" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" @@ -290,9 +286,10 @@ msgstr "Suchergebnisse" #: searx/templates/oscar/results.html:73 msgid "Links" -msgstr "" +msgstr "Links" -#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:7 msgid "Start search" msgstr "Suche starten" @@ -302,7 +299,7 @@ msgstr "Suchfilter anzeigen" #: searx/templates/oscar/search_full.html:11 msgid "Hide search filters" -msgstr "Suchfilter verstecke" +msgstr "Suchfilter verstecken" #: searx/templates/oscar/stats.html:2 msgid "stats" @@ -318,11 +315,11 @@ msgstr "Schließen" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "Information!" +msgstr "Achtung" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "" +msgstr "Es sieht so aus als ob das dein erstes mal mit searx ist." #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" @@ -330,7 +327,7 @@ msgstr "Warnung!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "Bitte aktiviere JavaScript um alle möglichkeiten dieser Seite zu nutzen." +msgstr "Bitte aktiviere JavaScript, um alle funktionen dieser Seite zu nutzen. " #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -344,13 +341,11 @@ msgstr "Entschuldigung!" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen " -"anderen Suchbegriff oder Suche das gewünschte in einer anderen Kategorie." +msgstr "Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen anderen Suchbegriff, oder Suche das gewünschte in einer anderen Kategorie. " #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "Gut gemacht!" +msgstr "Gut gemacht" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." @@ -358,7 +353,7 @@ msgstr "Einstellungen wurden erfolgreich gespeichert." #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "Verdammt!" +msgstr "Oh nein'" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." @@ -369,7 +364,7 @@ msgstr "Irgendetwas ist falsch gelaufen." #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/oscar/result_templates/videos.html:6 msgid "cached" -msgstr "cached" +msgstr "zwischengelagert" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" @@ -393,15 +388,15 @@ msgstr "Details anzeigen" #: searx/templates/oscar/result_templates/map.html:14 msgid "hide details" -msgstr "Details verstecke" +msgstr "Details verstecken" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" -msgstr "" +msgstr "Samenverstreuer" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" -msgstr "" +msgstr "Zecke" # categories - manually added # TODO - automatically add @@ -431,4 +426,3 @@ msgstr "Neuigkeiten" msgid "map" msgstr "Karte" - diff --git a/sources/searx/translations/en/LC_MESSAGES/messages.mo b/sources/searx/translations/en/LC_MESSAGES/messages.mo index ca6febf423461760c3e75d98efb918561543b7c5..0dc3e5d599a0d8ffb2bae6492526caba373040a7 100644 GIT binary patch delta 1603 zcmb`{-%FEG9LMpqsY|D3YEvkyB{+8>v_!fPLMhA$?Z*N`OhVSw;g88Sx-e~KH%19U zmQojiBo$F%qmX_Op-^NfcHxCY8VEt5j40l#;4UH$v?q!`23^wMm=3z&hIFbzkMuNk9B#XC5T6PSx99LDU#HuT~k za?3oyZN|jSb2>Q;EaE0y#dKUl1#%Kqf%9n?GCMF2J=XYMR3cTDM^J(5QTuja3HBjh zbDu^DJjM*-n`d;i@f*~`&tW#cM?KLBt|x|-T(6-ME4Zmd524oAq1H8`?uRiGyD~lW2lWEqUKMc=D$Eya2gfhHEQ1( z)Vz5lH?x3BaM?-yRiba!gkPute^3E3n5AnMYNJ9_ATRoH7kaTD^YI>@vl%mmn!k_D zmH0u_K1WdrG@|aeWKw?x>R@0T&!ApK0WV6Y)`tq`A78%0nFbfW_F;rc5=m3$cW?nh7$ zbQjkX!%D8FkfNGo29;(fuTX(zt?@TuPf67*Z+^{C37LM7CK+Bb%p--{0Y{rA&R2`{1oTt;m?gqnB_^{#H95*$ZWXu`Vx z5*1(?6=2@FUPSHl8I{;7`tb*Pv6}MbYeH9UqCCZA^MnFz?r^6&)*5toG_`bwnnS^e zI~I0#1tZPjNQXNbY>EV06EzNpEw3gVXlf62H^oBXPE#9JMxIJTC=$a%ggWRC6etBD z?GOx!)gkN9V28j{6j4!Fvx8YAM2CV9f*86L%TY+D7KL(LyYhAe|BcnV`Ujm=m@?cB?t z2mPq{RhZU5h#NLxVN@Y?sDPVM3$~*cw4>T%KbGJD)cS7Jyu(N?OQ8xojyjn^XM7YD z|2!)GRUhZC2N@nHP!5&oE~+6PU_E+?7Q#4=xy(9H^B=QVg+E8ddBa5od_;|ZK_yzk z94@0?L6)l2l=&d%uZeR!P*=V~HP14t7XrLU?Iet>wFXqet*AnGp_+1^^Sl>TK%e7j zRKl~UxZ~J_SyY@CX>L?N5fyMA^==nYm48PS@(bHBNQZGK){QDGg<98-T6fABA4B$F zSCFsW;6ezygPLDJHD!8+8&x=u>dJ4<1P@uYV?Qd<8q~s#7{x|ZQzlVOc^g%Ln~UbJ zL~S5~D!2h-*n-X2i)=h?6WpkIuA>rU{tj3cbwoK-A@@)LAEM?zLd}1QYRXrrrhJV$ z(YL613#eDJh$`$W>STWY8Sh{+FGdM`s01PBe*_h16DrXbOkx|>;{>WH3z**>taar_ qD@t6YUH!uYgMIngvJrRwkZ;aap4b*iw6-N$^6@~_{l7V9T)zQWB8r=kLbu!o3(5{jUxATp2$?fa7pJp~PS?&sXI{r~6OGc%Yuo#lHQ7j)Y2 zsp6Z$_gR3R{(icGjo~s!xrJgcM&b!{;xKZVQEp*4f#Y}sm*egbW74n*vv2@uGPiM+ zF+OvjLL3#ZaT$Ka2wXq~3MZ-pCvl_7q+%jw*!5dbi4@uHL_#qgm75Z{ zg^|QJ_b6!Mr>Mn0$5?!UTG0nwN(>8mUchiHpiznLK#i|LjoXiEw=fDjF$ViF8i!H+ zFJTJt%{2$@Q+p5<;20`_%cw29jw|sM#^W4vnvIheosOBP zz$Lbos6)HYer`kU#1Wre=tBiQi8=#gn1gpw6MaM_@C~(+In+)#IGNh=Fx0pR)XLH@ z8MCnvi%<(ajv7B`>pM?D9VhJ$k5QS;Ae&*{Ad54fPyy#r{}YR-gi|;8`XaR zc{}C|>XltY^}B)@dp>KwW9z4 delta 1420 zcmYMzOGwmF6vy#1QnbhvQ9^`Sh$ur3cacU& zLM;-rO)AlV)uI+HTvSGqtumvCsAv&|EsCJ;4=y##{6GKyeVlXd{oi?7ez`2MnCBZd zJ~4i)_)U2A^#8NdZ^qYlaY@6yn285*86HEvc8W_nw&OT-!!7)2$VLcTW5WjQ`{?enMt7MveZ3BMtM&Bx>l458xGaZv$>kRcYs zT=H8pH>$i7RY)AeIDi41K@~QKn)n8D@q_FCiCH{*2$F+2n2l>t<10}+TZ<|%hK1Os ze)3x%H(K#|RH7ku;B_p;F>JyocpO)=Y!%Rp8h;V#vJq6lqgaL$ScUVbmHX-RVFoIG z5EJSMal<047*$9KDqsz2!Vc7gFzR^JV+tNX&5xqS9YJzgGpeu_)XsFd{(e;abEx=( z0rp=FBQz+`I4aR?)PcN<<>)6`2rF^SW3~?!;0u#g_zzT^-&~Y9ovi9FKtfnCj$=9M z6+A~B%J*69zY_a+VcN0)7GVt*U=(#)TW~#|MJ2rDoI)MSY4<#f+JRTjx2S}lQSbZ@ zR$x8{MRCFjZd5=6YUNSXz@w-YbmB^kV;BcfD|&%i@oVQN)VL+rALJyfkRoKUR)XZV z&8R$kP=_+HpBq)!hDzM)1`MGRTt#i^P1k-0OL@MBQC!3`xQP>~LwSvh#!sRa@Bmft zW7H1MVihhS1tzSNKdUOLa&ARU+>P3zdQ>5YUHb{tVQWRLumg1%2a05ozwiVcupX~J)dXo23Q#`4W z)_8l@>Ev8mpEubUc;-p3-nO>7c6;@fWJ%^pZ*n5L;oq1*aMXLHF;J6ym)GI>3+h*Z Aga7~l diff --git a/sources/searx/translations/fr/LC_MESSAGES/messages.mo b/sources/searx/translations/fr/LC_MESSAGES/messages.mo index 68619732ab12f2ab9a82913cde12b77ef3c0575c..e306e78aa552eac372f2933288abeaad6f095842 100644 GIT binary patch delta 1670 zcmYMze`r-@9LMqJZr-cgt}bWS;hK3GxTg8z-Z3nu)nfUN%+vy>#GvE7&+VSPyJtJQ z*JLd2QVFT{mqj8(Fo;~~A}@(hLqnm`B7Z=Te^iivh0!0;C<*KRsRz28dtT3Z&htFq z@AEz9%&z%kZT0(>1#cRDyZN{C|Ef+`|Nkc9#&DRII4#7(n8eqx0goexndYfC_}ycf0ZFs{Q%DS?kMNqqAO4K4fyYV+UVQoN4Z(JlNpG3?{|E;i!h+*G35 zQ1f@A<_)3lhqxHWu^Erz5Hs<2~DFG z{tz|(9BTX=s)CnL0X|2qdj&P_8j_p&7M0+SjnrQyy6pzsK?V356(GqdU8hhBb)W)u z;nTPgyYLXU;sckcQYs?>j?5{mOJuEiu;d>FI({@grh9#+$Lr4Yrqjo+Hnpzq9}R=7 z-4{kVTlBW%`~yL5!#+O>D}}xn{gR&x!wvbUmPq#0rTdG)XvL0uW0lA&`d%@tj970Z zmmLyBH_nVvR>vvRw+PRkb*gwDV B&lCUv delta 1494 zcmYM!T}V@59LMoz>eM#V1-vX!Y9Swzgaa@1OuMM$#941%a2 zf(UOkx`;%=15rX01O*XP5O`xn=r1&8Io2Y#OdOYC z2bLR?Gku)+xN#A^coUUi6qRrSIm|*{!|Er$Imd}+JcLSgT^%@rtMCqX;43_U)l6Fj44|IBf^?Z%sDejvHIAc&?@=>% z(^-ICRD2)i)ZyoZNtk7*LRO*zhEW5WPy=G9?Xd&%aVKj0Zq##~NG{WbDlCawnXJ=4 zh>Cv!75|!t_1BGC+)$vqs6_Ws8*&oYpqprZY`}4sG22mzW*IF1p!$o*ro;i%gldrx zW*t7oO{mQ`=eV?#^;g0uFRT`~paNx3?`#-(){LPx-vdH#Orn04xhdyl299t~JEpJ?lQ@ml*u-y- z$(#MCacNY-)7XTAxD6j8E0!~VIZ@zwl&=-=IW9si=?dg9bu>)g#83g-P~-NYmi!QE zC5}1$C!Om7)JmLpyo%InM$l_o_=Dj@?`F#Bc#AB8`Gg8Qi%O{FI0(g9hlg=7-l((( z+*L07QDMHTFrMn~&Gy*uiq7TPdp)mRR%k;o)EEs#YORoEdD`~Wx2MjePo=ZR>su22 zsc0~4g(CIVhI(s#FdT}8BRAqD{=k-=L?+moINhB(8Ej6RN~Y79Y&LczlSm(HNM, 2014 +# Cqoicebordel , 2014 +# FIRST AUTHOR , 2014 +# rike, 2014 # rike, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-09-07 21:24+0000\n" -"Last-Translator: Adam Tauber \n" -"Language-Team: French " -"(http://www.transifex.com/projects/p/searx/language/fr/)\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"PO-Revision-Date: 2014-12-14 21:00+0000\n" +"Last-Translator: Cqoicebordel \n" +"Language-Team: French (http://www.transifex.com/projects/p/searx/language/fr/)\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: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: searx/webapp.py:308 msgid "{minutes} minute(s) ago" @@ -142,11 +145,9 @@ msgstr "Bloquer" #: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store " -"this data about you." -msgstr "" -"Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne pas" -" collecter vos données." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne pas collecter vos données." #: searx/templates/courgette/preferences.html:94 #: searx/templates/default/preferences.html:96 @@ -154,9 +155,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Ces cookies existent pour votre confort d'utilisation, nous ne les " -"utilisons pas pour vous espionner." +msgstr "Ces cookies existent pour votre confort d'utilisation, nous ne les utilisons pas pour vous espionner." #: searx/templates/courgette/preferences.html:97 #: searx/templates/default/preferences.html:99 @@ -213,19 +212,19 @@ msgstr "Statistiques du moteur" #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" -msgstr "" +msgstr "Cliquez sur la loupe pour effectuer une recherche" #: searx/templates/default/preferences.html:72 msgid "Localization" -msgstr "" +msgstr "Localisation" #: searx/templates/default/preferences.html:82 msgid "Yes" -msgstr "" +msgstr "Oui" #: searx/templates/default/preferences.html:82 msgid "No" -msgstr "" +msgstr "Non" #: searx/templates/default/results.html:34 msgid "Answers" @@ -274,10 +273,7 @@ msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" -"Permet de choisir comment la recherche est envoyée, en savoir plus sur les méthodes HTTP" +msgstr "Permet de choisir comment la recherche est envoyée, en savoir plus sur les méthodes HTTP" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" @@ -291,7 +287,8 @@ msgstr "Résultats de recherche" msgid "Links" msgstr "Liens" -#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:7 msgid "Start search" msgstr "Lancer une recherche" @@ -329,9 +326,7 @@ msgstr "Attention !" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" -"Merci d'activer JavaScript pour utiliser toutes les fonctionnalités de ce" -" site." +msgstr "Merci d'activer JavaScript pour utiliser toutes les fonctionnalités de ce site." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " @@ -345,9 +340,7 @@ msgstr "Désolé !" msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" -"nous n'avons trouvé aucun résultat. Effectuez une autre recherche ou " -"changez de catégorie." +msgstr "nous n'avons trouvé aucun résultat. Effectuez une autre recherche ou changez de catégorie." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" @@ -432,4 +425,3 @@ msgstr "actus" msgid "map" msgstr "carte" - diff --git a/sources/searx/translations/hu/LC_MESSAGES/messages.mo b/sources/searx/translations/hu/LC_MESSAGES/messages.mo index 0cbdd85ab88263ab28d50b0204a09278626b8a6b..58fadcdb2d4dbc2e69ebbe51b8d6c1c3c99a6a8a 100644 GIT binary patch delta 2614 zcmZwHYitx%6u|LYO3RxSA4MmeeH#;-UBui*^5jS^@&Q6=yK4%|`?;(S~l-+vq> zk*%>iQ34-CnKy&0@FnD@hB-(ApWsa5t1mc_i7%oo{yUtDKccMYPpl+{PjP)4r{j}6 zltj0qyuT0Sy+bI^J)DI(ti$6t8&9E({{R;gU!CPdGQNb3_**>SZ~$CD@t+&~#$Ll(TM=AtCj#9;+KjMcaU^XoX-#fg;UC{D)XD1rLp`zMe^ ztJ5e6ok5xSBb4!0tc`G6M0S~ z!#LUfSa)T=0o zjJ^8d?G zOyWC8VtG|dnzA=-D1nkF6*+DMuz%AJjqVr)l3-O>JFow65FmNK0XG z#*!H=t*cvGjh6KrT3Slq&sbme(7veXm_g37)u!Ii%P^JQ8yL2wQ_)b6i-toeG|e&^ z+O)3&E{u#0qf(+bFpcKI8#SGWJIe!E-Px(#jcd&(R+2`lTRYlisM@BTXw=c6;r3}K ztJNmMHB)^uX~{PY+YCd?4YQ_Uxe0EjP3{}qk0YtgIu{lF!lK!|`AYQifRXV+&nMYu ztj?%d$vG-bBrWeT# znn9Ou^@OXbvT20c>DGaf>~-xfdV=N%qhc_The?Oz)TW%_ISJDVDGxjEqzKk+ZZHZX zb)92{W{H+TH4~X=h^@2L9<383yje5Uk^L(MB$v_bp1!YCl}g=TSGJ4fC<)bbL$%eR zJ!FHzJB1!=g2!ZPQ*D=ZRVr{#KXq7cmo(tSrlobrhMNg9TvHgGGo0@*vlh$gvS_5c zh7n0^^L$@w!R=7n^xfD#PHgxdi@sZ`p7V85Gf=7%_n|e`zUtYOc9mwIdweS!6~iEx zjE3mrkSbF6^1!ORVMpg(D&`s)z7a2&=xRP1voc?KK>1P0VS`lG3WA)eSh4Rpp-M)@ zZim*E*yByQnD8M+e=tm+V`%8OqK^crIa2-m>Lu%328>m1xNSFLNa;Hl?s|-n#z)09J67 delta 1691 zcmYMyUuaup7{~E9OVh0Bn)TmWaNSJRwHsZ#q;}d?2OX<*)YaK^lx=!*)|{?c(xlx< zI~Jz_-Pn!L%3)I2WCST=SY$3x6r3Ulb%m{^4sZ+OA>4wmU=1EeE^~_8W}LxQoW~|? ztv03|yO1U`hC6Tq8;vQMc^>L%xQMlQ1(l$TO85zKnRRY0c*k$Qk1F72--oD#e;|QP z6_fX3D=N+~Hx+OM8Df&yKz?(A2UVUy6;i+U8#_4%;Lu@GR<^6;Xkg zQH8Fc#$ET@*HJt0rSDx-!k}0JIpp^r^81hY{o_bza~!n;XHYwI9>XgAG7n0ygi3G?wIi#jPxCpd zpsz5A-=WUP6AaSU_BU0Ep>2W6XVt+#^_X3l$)_s!!WTAG#v?xj;)#J+V*g;GuPdI2 z$0M&D?M~W@X(ye}bq`wwdob1;PxN)i2fE|W$9fZk&&DfbTb>IvAIv%D?6ZzJxKPMX zm&cld`=^#_g$n!;Lg|`~$(~ B;%)!{ diff --git a/sources/searx/translations/hu/LC_MESSAGES/messages.po b/sources/searx/translations/hu/LC_MESSAGES/messages.po index 3d6fa84..dd284ce 100644 --- a/sources/searx/translations/hu/LC_MESSAGES/messages.po +++ b/sources/searx/translations/hu/LC_MESSAGES/messages.po @@ -1,24 +1,24 @@ -# English translations for . +# English translations for PROJECT. # Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the project. -# +# This file is distributed under the same license as the PROJECT project. +# # Translators: # Adam Tauber , 2014 # FIRST AUTHOR , 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-09-07 21:30+0000\n" +"PO-Revision-Date: 2014-12-22 16:11+0000\n" "Last-Translator: Adam Tauber \n" -"Language-Team: Hungarian " -"(http://www.transifex.com/projects/p/searx/language/hu/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/searx/language/hu/)\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: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:308 msgid "{minutes} minute(s) ago" @@ -93,19 +93,19 @@ msgstr "Felület nyelve" #: searx/templates/default/preferences.html:36 #: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" -msgstr "" +msgstr "Automatikus kiegészítés" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 #: searx/templates/oscar/preferences.html:66 msgid "Method" -msgstr "" +msgstr "Method" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 #: searx/templates/oscar/preferences.html:76 msgid "Themes" -msgstr "" +msgstr "Megjelenés" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:66 @@ -142,8 +142,8 @@ msgstr "Tiltás" #: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store " -"this data about you." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak." #: searx/templates/courgette/preferences.html:94 @@ -152,9 +152,7 @@ msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak." msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a " -"felhasználók követésére." +msgstr "Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a felhasználók követésére." #: searx/templates/courgette/preferences.html:97 #: searx/templates/default/preferences.html:99 @@ -211,189 +209,190 @@ msgstr "Kereső statisztikák" #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" -msgstr "" +msgstr "A nagyítóra kattintva indítható a keresés" #: searx/templates/default/preferences.html:72 msgid "Localization" -msgstr "" +msgstr "Nyelv" #: searx/templates/default/preferences.html:82 msgid "Yes" -msgstr "" +msgstr "Igen" #: searx/templates/default/preferences.html:82 msgid "No" -msgstr "" +msgstr "Nem" #: searx/templates/default/results.html:34 msgid "Answers" -msgstr "" +msgstr "Válaszok" #: searx/templates/oscar/base.html:69 msgid "Powered by" -msgstr "" +msgstr "Az oldalt kiszolgálja: " #: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "" +msgstr "egy privátszféra tisztelő, könnyen módosítható metakereső" #: searx/templates/oscar/navbar.html:6 msgid "Toggle navigation" -msgstr "" +msgstr "Navigáció megjelenítés" #: searx/templates/oscar/navbar.html:15 msgid "home" -msgstr "" +msgstr "főoldal" #: searx/templates/oscar/preferences.html:11 #: searx/templates/oscar/preferences.html:17 msgid "General" -msgstr "" +msgstr "Általános" #: searx/templates/oscar/preferences.html:12 #: searx/templates/oscar/preferences.html:99 msgid "Engines" -msgstr "" +msgstr "Kereső motorok" #: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" -msgstr "" +msgstr "Preferált keresési nyelv" #: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" -msgstr "" +msgstr "Felület nyelve" #: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" -msgstr "" +msgstr "Autómatikus kereső kifejezés kiegészítés" #: searx/templates/oscar/preferences.html:73 msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" +msgstr "Keresés metódusa (bővebben)" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" -msgstr "" +msgstr "Megjelenés" #: searx/templates/oscar/results.html:6 msgid "Search results" -msgstr "" +msgstr "Keresési eredmények" #: searx/templates/oscar/results.html:73 msgid "Links" -msgstr "" +msgstr "Linkek" -#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:7 msgid "Start search" -msgstr "" +msgstr "Keresés indítása" #: searx/templates/oscar/search_full.html:11 msgid "Show search filters" -msgstr "" +msgstr "Keresési szűrők megjelenítése" #: searx/templates/oscar/search_full.html:11 msgid "Hide search filters" -msgstr "" +msgstr "Keresési szűrők elrejtése" #: searx/templates/oscar/stats.html:2 msgid "stats" -msgstr "" +msgstr "statisztikák" #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 #: searx/templates/oscar/messages/unknow_error.html:5 msgid "Close" -msgstr "" +msgstr "Bezár" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "" +msgstr "Figyelem!" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "" +msgstr "Úgy tűnik először használod a keresőt." #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" -msgstr "" +msgstr "Figyelem!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" +msgstr "Engedélyezze a javascript-et a teljes funkcionalitás használathoz" #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " -msgstr "" +msgstr "Nincs megjeleníthető adat." #: searx/templates/oscar/messages/no_results.html:7 msgid "Sorry!" -msgstr "" +msgstr "Elnézést!" #: searx/templates/oscar/messages/no_results.html:8 msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" +msgstr "Nincs megjeleníthető találat." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "" +msgstr "Siker!" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." -msgstr "" +msgstr "Beállítások mentve" #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "" +msgstr "Oh!" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." -msgstr "" +msgstr "Hiba történt" #: searx/templates/oscar/result_templates/default.html:6 #: searx/templates/oscar/result_templates/map.html:7 #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/oscar/result_templates/videos.html:6 msgid "cached" -msgstr "" +msgstr "tárolt" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" -msgstr "" +msgstr "Kép megjelenítése" #: searx/templates/oscar/result_templates/images.html:22 msgid "View source" -msgstr "" +msgstr "Forrás megtekintése" #: searx/templates/oscar/result_templates/map.html:10 msgid "show map" -msgstr "" +msgstr "Térkép" #: searx/templates/oscar/result_templates/map.html:10 msgid "hide map" -msgstr "" +msgstr "Térkép elrejtése" #: searx/templates/oscar/result_templates/map.html:14 msgid "show details" -msgstr "" +msgstr "Részletek" #: searx/templates/oscar/result_templates/map.html:14 msgid "hide details" -msgstr "" +msgstr "Részletek elrejtése" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" -msgstr "" +msgstr "Seeder" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" -msgstr "" +msgstr "Leecher" # categories - manually added # TODO - automatically add @@ -423,4 +422,3 @@ msgstr "hírek" msgid "map" msgstr "térkép" - diff --git a/sources/searx/translations/it/LC_MESSAGES/messages.mo b/sources/searx/translations/it/LC_MESSAGES/messages.mo index 59799b504c68430f8b965267860e16f157329068..ea25e74d3bdf70fd83a0f7bddb868a4a8b446020 100644 GIT binary patch delta 1603 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 delta 1424 zcmYk*OGs2v9LMqh)tPY`-xE4enictg#GFVfdmtzY)d-FiNd=KTgcf25p=bk@tBM2> zXHg3&R}Dg4kRWPhK~bS(iy~{01W}7HdQh9bKRQsu^?uGhkN^LF?mgbF{!y8F8x4#Z zza)QU{AIHA^zXMlXvSqbxaD9o=HVV(h6j<$j&TcPH%?+NF2`8NYz?kQx-5a^*nv^A zl=admqT?dw;utEy1S;Vaa@jPuQoQf_=TQZ`aehE0{DK6w0E=rehKkd|O$F>lrdSe- z$#0!BRQYLCA${0{!x+IwsKVw@3m32$7v1=G%;(u7NFf$t0al>q*P-5Q1FFCzmf%T^ zlivnuXvY^&iAFSl*RTq2UU^Qm29_LXz4>B0QTvYrb zOlcrSgH2dDs*p-lz>TN{+fWOdP{*ScvvD_SeH&`tJ|vfQq6+Imy_p_2K7@*Y9u@y; zg!iwGG#v^wiAr<}bs+Cx4F-u8!#X_cne9T&f52iDK7)$$l$#28g&Kd4O7syYaS8Pa z(p05GnaStXhGL!2;PinXHVC!L+Bbw}O!8RW7d=M^M` zT}Q3Upbllqr=bdGQKxdzP56b{u}5|-C~%fw70+d;L)nZvl;fxZzM|e(kOys`7*+5J ztj0>L#{?2TW#?$<@LWPA8u>e5+h20^UQ-pFz!k?8ax^^MZ5H^?yS4Vn1Df znD3zHLJU|7|EDyx({-o>aa@Uws84eMmFO@gu?uT(8g(e&Mg4(biRa%9WqYB-iN5Zh whCO5ZD!|ppXdC~WBO6g zm%WW2=S_V=@wb)VLVjPIB(wkjcC;(SqweB$GQ1zoh7ZFTa5v;p&+(cL_re$8oA5L^ zJWZ)?Sb@Fp5y+N$2cD%=Lw&$t9t+>YQ{hoK3;qqo(M-IG<1St-sdL~0*pshc4n@e? zoSUFH-Uh{P6)uMNKpyofFA?xIoQ;3=J_9lQIh5ePf^*@wP$D`ETf*R#%>RZn;VL#o z=mseFw?esh3zYpBcEE8s2kwNYz}-;JzXTWJU%kda6d#10@TdI1A5b#z7ZgV`2vaV0 z!XCH~4#BJ7&G0EG0)B^bz8w`@Rdb;TI+NFV@LV_rUI!b?7+lXlQgR=h3U@+r^hmz` zI3#HGG!#M4K{5O~l=JUGIsYM)41Nm5!DmqH9)xo48;Cab9Tb6wW|DtN(UJVXaVQS{ zf#P5`r)1s<#n2)sj(Xt@un+da`(PK`2VZVe>Hw7cRg7aw)uE*RUdWbu6pD~N9pqmI zFS76kd;>};45#I5$l$r~F(?^$7i#!1lv4c+&wzhI>5;h_#k&Za4khBVp>+TGa2;Hk zuRoA;7ZhQQrx~2i;8`fj_CtbE2lDy1`TPecj(>rR;4#Rfy68A@)C6Cc~BuQ!k6uUi8&aZ&2?|*=S7+#leY=9EU=A6S&4BQGOq6mtiF({Ee2u0|w ze1A_qe+i1Cx1gNc4{v~gapTE5PMWgKrp^6xmru0Me5P&s z@{9HIWdkevn|o)SHLHL5lKy_(f8oGI%O<{_bwOK~-yX+FU?a6U^YId6qIwpFHfnZs zbgx=tYsQ4S99tb&Eef&_MK;pgTX(dJN;dUbmIRCSN~6n(9l3l_+56f+Utbh9Z|hh# z`{4G-Gk*C)beS zMN-{FA}QazHgx2zrpwlAtd^2E_NCCII<9JO^>}P61UM9C&fB)AIp>r+8#l35HN~=v zY^tut0|#VHdpAlp(v~ehR+GepC5z%nZHcLk87WvB21Kr|u_j1$R_j(!OIwg>BNK1;|ilnDx3rXfGeyQ42E1S?J zYNLxPskrjg9rq_{Zq=Z*&AvHZ0Xsorj0?KeW>a#JAw4GWx;M4O^VRC2cXctm!PL!A zF>y67=`j>rk7NtXmCvllcFNmzAW| z9MxK}rEII_yi{>@+>J)M8dojJwjnxkT(Tuwml76iN`Wf{W0IxK=TH5pv8l>}saX13 zN2cydd^}dIu@wrV3kl!RFlRZFZAVhKS{K^@a{*sPw;Hx#CGWoNE|lW^mlfSApmg7f zR$HYu7$s6_iL0C9m=u;2H3CNt0=rmaux8SNN%+p`54n{$qms`;(K%U3m28m?wSgiK zZ@3sKGuexrYIR(|br+^;a$X?-uY5UksrtWFx#_%WuAH~F%S#ha-fB%+SDH`GJ7=(x zkUB{que`v&#*0z^I;wzgBY#3AyoLm} zIwtpFJ1WjNHx;lOdBt+rN`BkRgDPJ@6%yhozJf{o5>?n0)Wq+w6@QGzf5&FpF@kKw zjo5;>quw7t?d(oefjQiS&uEBaoS^Ns0#H}n_1uUc9e;paJ zRaC*Jup7^!hwG@7#~G}{CRF?sRy5Gg1BAYy2dD#i9(yoOw00c8_hM!fr~ucP ztiu05#fgzkiCa*GY>vDO*Jux*KEXQbQ2yM^{wr~k50=3c>f2=TR@{X;6F#bd5-QKQ321O zzSaAf!}E9t#@ROQSWmjT9N!eHUZ}5))lUZDT=8J_O5#{ebtZW^=4FR6*`34L9lc)G z^ODn3{kdRizC2$n^pE>tFq|3mvOD^{AuheQeS39sLvO6D{9I5f+t^}QJWzc0a6SkF zx6<6{K8jzhEtUg!spa{W2MUMg3qjc?ii=@TaN80yb)oO)T_rIx_+J$^<`+UgpII&j z3#FjEm=DQVu&KFBx!@n}v}vCRekSkx2SaxwG3!=RyWMKT(OBTpjh, 2014 msgid "" msgstr "" -"Project-Id-Version: searx\n" +"Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2014-11-26 20:41+0100\n" -"PO-Revision-Date: 2014-09-09 15:33+0000\n" +"PO-Revision-Date: 2014-12-11 13:50+0000\n" "Last-Translator: André Koot \n" -"Language-Team: Dutch " -"(http://www.transifex.com/projects/p/searx/language/nl/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/searx/language/nl/)\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: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: searx/webapp.py:308 msgid "{minutes} minute(s) ago" @@ -92,19 +92,19 @@ msgstr "Interfacetaal" #: searx/templates/default/preferences.html:36 #: searx/templates/oscar/preferences.html:53 msgid "Autocomplete" -msgstr "" +msgstr "Auto-aanvullen" #: searx/templates/courgette/preferences.html:47 #: searx/templates/default/preferences.html:47 #: searx/templates/oscar/preferences.html:66 msgid "Method" -msgstr "" +msgstr "Methode" #: searx/templates/courgette/preferences.html:56 #: searx/templates/default/preferences.html:56 #: searx/templates/oscar/preferences.html:76 msgid "Themes" -msgstr "" +msgstr "Thema's" #: searx/templates/courgette/preferences.html:66 #: searx/templates/default/preferences.html:66 @@ -141,11 +141,9 @@ msgstr "Blokkeren" #: searx/templates/default/preferences.html:94 #: searx/templates/oscar/preferences.html:132 msgid "" -"These settings are stored in your cookies, this allows us not to store " -"this data about you." -msgstr "" -"Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets" -" over jou te bewaren." +"These settings are stored in your cookies, this allows us not to store this " +"data about you." +msgstr "Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets over jou te bewaren." #: searx/templates/courgette/preferences.html:94 #: searx/templates/default/preferences.html:96 @@ -153,9 +151,7 @@ msgstr "" msgid "" "These cookies serve your sole convenience, we don't use these cookies to " "track you." -msgstr "" -"Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies " -"niet om je te volgen." +msgstr "Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies niet om je te volgen." #: searx/templates/courgette/preferences.html:97 #: searx/templates/default/preferences.html:99 @@ -212,189 +208,190 @@ msgstr "Zoekmachinestatistieken" #: searx/templates/default/categories.html:8 msgid "Click on the magnifier to perform search" -msgstr "" +msgstr "Klik op het vergrootglas om te zoeken" #: searx/templates/default/preferences.html:72 msgid "Localization" -msgstr "" +msgstr "Vertaling" #: searx/templates/default/preferences.html:82 msgid "Yes" -msgstr "" +msgstr "Ja" #: searx/templates/default/preferences.html:82 msgid "No" -msgstr "" +msgstr "Nee" #: searx/templates/default/results.html:34 msgid "Answers" -msgstr "" +msgstr "Antwoorden" #: searx/templates/oscar/base.html:69 msgid "Powered by" -msgstr "" +msgstr "Powered by" #: searx/templates/oscar/base.html:69 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "" +msgstr "een privacy eerbiedigende, aanpasbare metazoekmachine" #: searx/templates/oscar/navbar.html:6 msgid "Toggle navigation" -msgstr "" +msgstr "Omschakelen navigatie" #: searx/templates/oscar/navbar.html:15 msgid "home" -msgstr "" +msgstr "thuis" #: searx/templates/oscar/preferences.html:11 #: searx/templates/oscar/preferences.html:17 msgid "General" -msgstr "" +msgstr "Algemeen" #: searx/templates/oscar/preferences.html:12 #: searx/templates/oscar/preferences.html:99 msgid "Engines" -msgstr "" +msgstr "Zoekmachines" #: searx/templates/oscar/preferences.html:39 msgid "What language do you prefer for search?" -msgstr "" +msgstr "Welke taal wil je gebruiken voor het zoeken?" #: searx/templates/oscar/preferences.html:50 msgid "Change the language of the layout" -msgstr "" +msgstr "Wijzig de taal van de layout" #: searx/templates/oscar/preferences.html:63 msgid "Find stuff as you type" -msgstr "" +msgstr "Zoek tijdens het typen" #: searx/templates/oscar/preferences.html:73 msgid "" "Change how forms are submited, learn more about request methods" -msgstr "" +msgstr "Bepaal hoe de formulieren worden ingestuurd, lees meer over request methodes" #: searx/templates/oscar/preferences.html:84 msgid "Change searx layout" -msgstr "" +msgstr "Wijzig searx layout" #: searx/templates/oscar/results.html:6 msgid "Search results" -msgstr "" +msgstr "Zoekresultaten" #: searx/templates/oscar/results.html:73 msgid "Links" -msgstr "" +msgstr "Links" -#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 +#: searx/templates/oscar/search.html:6 +#: searx/templates/oscar/search_full.html:7 msgid "Start search" -msgstr "" +msgstr "Start zoeken" #: searx/templates/oscar/search_full.html:11 msgid "Show search filters" -msgstr "" +msgstr "Toon zoekfilters" #: searx/templates/oscar/search_full.html:11 msgid "Hide search filters" -msgstr "" +msgstr "Verberg zoekfilters" #: searx/templates/oscar/stats.html:2 msgid "stats" -msgstr "" +msgstr "stats" #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 #: searx/templates/oscar/messages/unknow_error.html:5 msgid "Close" -msgstr "" +msgstr "Sluiten" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "" +msgstr "Heads up!" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." -msgstr "" +msgstr "Het lijkt erop dat je searx voor de eerste keer gebruikt." #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" -msgstr "" +msgstr "Waarschuwing!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" +msgstr "Activeer JavaScript om alle functionaliteit van deze site te gebruiken." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " -msgstr "" +msgstr "Er zijn momenteel geen gegevens beschikbaar." #: searx/templates/oscar/messages/no_results.html:7 msgid "Sorry!" -msgstr "" +msgstr "Sorry!" #: searx/templates/oscar/messages/no_results.html:8 msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" +msgstr "we kregen geen resultaat. Probeer een andere opvraag of zoek in meer categorieën." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "" +msgstr "Goed gedaan!" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." -msgstr "" +msgstr "Instellingen succesvol opgeslagen." #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "" +msgstr "Verdraaid!" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." -msgstr "" +msgstr "Er ging iets fout." #: searx/templates/oscar/result_templates/default.html:6 #: searx/templates/oscar/result_templates/map.html:7 #: searx/templates/oscar/result_templates/torrent.html:6 #: searx/templates/oscar/result_templates/videos.html:6 msgid "cached" -msgstr "" +msgstr "gecached" #: searx/templates/oscar/result_templates/images.html:21 msgid "Get image" -msgstr "" +msgstr "Toon afbeelding" #: searx/templates/oscar/result_templates/images.html:22 msgid "View source" -msgstr "" +msgstr "Bekijk bron" #: searx/templates/oscar/result_templates/map.html:10 msgid "show map" -msgstr "" +msgstr "toon kaart" #: searx/templates/oscar/result_templates/map.html:10 msgid "hide map" -msgstr "" +msgstr "verberg kaart" #: searx/templates/oscar/result_templates/map.html:14 msgid "show details" -msgstr "" +msgstr "toon details" #: searx/templates/oscar/result_templates/map.html:14 msgid "hide details" -msgstr "" +msgstr "verberg details" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" -msgstr "" +msgstr "Aanbieder" #: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" -msgstr "" +msgstr "Ophaler" # categories - manually added # TODO - automatically add @@ -424,4 +421,3 @@ msgstr "nieuws" msgid "map" msgstr "kaart" - diff --git a/sources/searx/version.py b/sources/searx/version.py index ae07c2b..d8888fc 100644 --- a/sources/searx/version.py +++ b/sources/searx/version.py @@ -18,7 +18,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. # version of searx VERSION_MAJOR = 0 -VERSION_MINOR = 5 +VERSION_MINOR = 6 VERSION_BUILD = 0 VERSION_STRING = "{0}.{1}.{2}".format(VERSION_MAJOR, diff --git a/sources/searx/webapp.py b/sources/searx/webapp.py index 5419755..8d16768 100644 --- a/sources/searx/webapp.py +++ b/sources/searx/webapp.py @@ -41,15 +41,12 @@ from searx.utils import ( UnicodeWriter, highlight_content, html_to_text, get_themes ) from searx.version import VERSION_STRING -from searx.https_rewrite import https_rules from searx.languages import language_codes +from searx.https_rewrite import https_url_rewrite from searx.search import Search from searx.query import Query from searx.autocomplete import backends as autocomplete_backends -from urlparse import urlparse -import re - static_path, templates_path, themes =\ get_themes(settings['themes_path'] @@ -68,9 +65,12 @@ app.secret_key = settings['server']['secret_key'] babel = Babel(app) -#TODO configurable via settings.yml -favicons = ['wikipedia', 'youtube', 'vimeo', 'dailymotion', 'soundcloud', - 'twitter', 'stackoverflow', 'github', 'deviantart'] +global_favicons = [] +for indice, theme in enumerate(themes): + global_favicons.append([]) + theme_img_path = searx_dir+"/static/"+theme+"/img/" + for (dirpath, dirnames, filenames) in os.walk(theme_img_path): + global_favicons[indice].extend(filenames) cookie_max_age = 60 * 60 * 24 * 365 * 23 # 23 years @@ -215,59 +215,7 @@ def index(): if settings['server']['https_rewrite']\ and result['parsed_url'].scheme == 'http': - skip_https_rewrite = False - - # check if HTTPS rewrite is possible - for target, rules, exclusions in https_rules: - - # check if target regex match with url - if target.match(result['url']): - # process exclusions - for exclusion in exclusions: - # check if exclusion match with url - if exclusion.match(result['url']): - skip_https_rewrite = True - break - - # skip https rewrite if required - if skip_https_rewrite: - break - - # process rules - for rule in rules: - try: - # TODO, precompile rule - p = re.compile(rule[0]) - - # rewrite url if possible - new_result_url = p.sub(rule[1], result['url']) - except: - break - - # parse new url - new_parsed_url = urlparse(new_result_url) - - # continiue if nothing was rewritten - if result['url'] == new_result_url: - continue - - # get domainname from result - # TODO, does only work correct with TLD's like - # asdf.com, not for asdf.com.de - # TODO, using publicsuffix instead of this rewrite rule - old_result_domainname = '.'.join( - result['parsed_url'].hostname.split('.')[-2:]) - new_result_domainname = '.'.join( - new_parsed_url.hostname.split('.')[-2:]) - - # check if rewritten hostname is the same, - # to protect against wrong or malicious rewrite rules - if old_result_domainname == new_result_domainname: - # set new url - result['url'] = new_result_url - - # target has matched, do not search over the other rules - break + result = https_url_rewrite(result) if search.request_data.get('format', 'html') == 'html': if 'content' in result: @@ -288,10 +236,6 @@ def index(): else: result['pretty_url'] = result['url'] - for engine in result['engines']: - if engine in favicons: - result['favicon'] = engine - # TODO, check if timezone is calculated right if 'publishedDate' in result: result['pubdate'] = result['publishedDate'].strftime('%Y-%m-%d %H:%M:%S%z') @@ -344,7 +288,8 @@ def index(): suggestions=search.suggestions, answers=search.answers, infoboxes=search.infoboxes, - theme=get_current_theme_name() + theme=get_current_theme_name(), + favicons=global_favicons[themes.index(get_current_theme_name())] )