Merge branch 'integrated-videos' of https://github.com/Cqoicebordel/searx into Cqoicebordel-integrated-videos

Conflicts:
	searx/engines/vimeo.py
This commit is contained in:
Adam Tauber 2015-01-07 11:48:36 +01:00
commit 05be069f42
29 changed files with 408 additions and 134 deletions

View File

@ -6,12 +6,14 @@
# @using-api yes
# @results JSON
# @stable yes
# @parse url, title, thumbnail
# @parse url, title, thumbnail, publishedDate, embedded
#
# @todo set content-parameter with correct data
from urllib import urlencode
from json import loads
from cgi import escape
from datetime import datetime
# engine dependent config
categories = ['videos']
@ -20,7 +22,9 @@ language_support = True
# search-url
# see http://www.dailymotion.com/doc/api/obj-video.html
search_url = 'https://api.dailymotion.com/videos?fields=title,description,duration,url,thumbnail_360_url&sort=relevance&limit=5&page={pageno}&{query}' # noqa
search_url = 'https://api.dailymotion.com/videos?fields=created_time,title,description,duration,url,thumbnail_360_url,id&sort=relevance&limit=5&page={pageno}&{query}' # noqa
embedded_url = '<iframe frameborder="0" width="540" height="304" ' +\
'data-src="//www.dailymotion.com/embed/video/{videoid}" allowfullscreen></iframe>'
# do search-request
@ -51,14 +55,17 @@ def response(resp):
for res in search_res['list']:
title = res['title']
url = res['url']
#content = res['description']
content = ''
content = escape(res['description'])
thumbnail = res['thumbnail_360_url']
publishedDate = datetime.fromtimestamp(res['created_time'], None)
embedded = embedded_url.format(videoid=res['id'])
results.append({'template': 'videos.html',
'url': url,
'title': title,
'content': content,
'publishedDate': publishedDate,
'embedded': embedded,
'thumbnail': thumbnail})
# return results

61
searx/engines/deezer.py Normal file
View File

@ -0,0 +1,61 @@
## Deezer (Music)
#
# @website https://deezer.com
# @provide-api yes (http://developers.deezer.com/api/)
#
# @using-api yes
# @results JSON
# @stable yes
# @parse url, title, content, embedded
from json import loads
from urllib import urlencode
# engine dependent config
categories = ['music']
paging = True
# search-url
url = 'http://api.deezer.com/'
search_url = url + 'search?{query}&index={offset}'
embedded_url = '<iframe scrolling="no" frameborder="0" allowTransparency="true" ' +\
'data-src="http://www.deezer.com/plugins/player?type=tracks&id={audioid}" ' +\
'width="540" height="80"></iframe>'
# do search-request
def request(query, params):
offset = (params['pageno'] - 1) * 25
params['url'] = search_url.format(query=urlencode({'q': query}),
offset=offset)
return params
# get response from search-request
def response(resp):
results = []
search_res = loads(resp.text)
# parse results
for result in search_res.get('data', []):
if result['type'] == 'track':
title = result['title']
url = result['link']
content = result['artist']['name'] +\
" &bull; " +\
result['album']['title'] +\
" &bull; " + result['title']
embedded = embedded_url.format(audioid=result['id'])
# append result
results.append({'url': url,
'title': title,
'embedded': embedded,
'content': content})
# return results
return results

View File

@ -6,10 +6,11 @@
# @using-api yes
# @results JSON
# @stable yes
# @parse url, title, content
# @parse url, title, content, publishedDate, embedded
from json import loads
from urllib import urlencode
from urllib import urlencode, quote_plus
from dateutil import parser
# engine dependent config
categories = ['music']
@ -27,6 +28,10 @@ search_url = url + 'search?{query}'\
'&linked_partitioning=1'\
'&client_id={client_id}' # noqa
embedded_url = '<iframe width="100%" height="166" ' +\
'scrolling="no" frameborder="no" ' +\
'data-src="https://w.soundcloud.com/player/?url={uri}"></iframe>'
# do search-request
def request(query, params):
@ -50,10 +55,15 @@ def response(resp):
if result['kind'] in ('track', 'playlist'):
title = result['title']
content = result['description']
publishedDate = parser.parse(result['last_modified'])
uri = quote_plus(result['uri'])
embedded = embedded_url.format(uri=uri)
# append result
results.append({'url': result['permalink_url'],
'title': title,
'publishedDate': publishedDate,
'embedded': embedded,
'content': content})
# return results

View File

@ -1,4 +1,4 @@
## Vimeo (Videos)
# Vimeo (Videos)
#
# @website https://vimeo.com/
# @provide-api yes (http://developer.vimeo.com/api),
@ -7,15 +7,16 @@
# @using-api no (TODO, rewrite to api)
# @results HTML (using search portal)
# @stable no (HTML can change)
# @parse url, title, publishedDate, thumbnail
# @parse url, title, publishedDate, thumbnail, embedded
#
# @todo rewrite to api
# @todo set content-parameter with correct data
from urllib import urlencode
from lxml import html
from HTMLParser import HTMLParser
from searx.engines.xpath import extract_text
from dateutil import parser
from cgi import escape
# engine dependent config
categories = ['videos']
@ -32,6 +33,10 @@ title_xpath = './a/div[@class="data"]/p[@class="title"]'
content_xpath = './a/img/@src'
publishedDate_xpath = './/p[@class="meta"]//attribute::datetime'
embedded_url = '<iframe data-src="//player.vimeo.com/video{videoid}" ' +\
'width="540" height="304" frameborder="0" ' +\
'webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>'
# do search-request
def request(query, params):
@ -46,13 +51,17 @@ def response(resp):
results = []
dom = html.fromstring(resp.text)
p = HTMLParser()
# parse results
for result in dom.xpath(results_xpath):
url = base_url + result.xpath(url_xpath)[0]
title = escape(html.tostring(result.xpath(title_xpath)[0], method='text', encoding='UTF-8').decode("utf-8"))
thumbnail = result.xpath(content_xpath)[0]
publishedDate = parser.parse(result.xpath(publishedDate_xpath)[0])
videoid = result.xpath(url_xpath)[0]
url = base_url + videoid
title = p.unescape(extract_text(result.xpath(title_xpath)))
thumbnail = extract_text(result.xpath(content_xpath)[0])
publishedDate = parser.parse(extract_text(
result.xpath(publishedDate_xpath)[0]))
embedded = embedded_url.format(videoid=videoid)
# append result
results.append({'url': url,
@ -60,6 +69,7 @@ def response(resp):
'content': '',
'template': 'videos.html',
'publishedDate': publishedDate,
'embedded': embedded,
'thumbnail': thumbnail})
# return results

View File

@ -6,7 +6,7 @@
# @using-api yes
# @results JSON
# @stable yes
# @parse url, title, content, publishedDate, thumbnail
# @parse url, title, content, publishedDate, thumbnail, embedded
from json import loads
from urllib import urlencode
@ -19,7 +19,11 @@ language_support = True
# search-url
base_url = 'https://gdata.youtube.com/feeds/api/videos'
search_url = base_url + '?alt=json&{query}&start-index={index}&max-results=5' # noqa
search_url = base_url + '?alt=json&{query}&start-index={index}&max-results=5'
embedded_url = '<iframe width="540" height="304" ' +\
'data-src="//www.youtube-nocookie.com/embed/{videoid}" ' +\
'frameborder="0" allowfullscreen></iframe>'
# do search-request
@ -60,6 +64,8 @@ def response(resp):
if url.endswith('&'):
url = url[:-1]
videoid = url[32:]
title = result['title']['$t']
content = ''
thumbnail = ''
@ -72,12 +78,15 @@ def response(resp):
content = result['content']['$t']
embedded = embedded_url.format(videoid=videoid)
# append result
results.append({'url': url,
'title': title,
'content': content,
'template': 'videos.html',
'publishedDate': publishedDate,
'embedded': embedded,
'thumbnail': thumbnail})
# return results

View File

@ -35,6 +35,10 @@ engines:
engine : currency_convert
categories : general
shortcut : cc
- name : deezer
engine : deezer
shortcut : dz
- name : deviantart
engine : deviantart

File diff suppressed because one or more lines are too long

View File

@ -63,6 +63,18 @@ $(document).ready(function(){
$(this).toggleClass(btnClass);
$(this).toggleClass('btn-default');
});
/**
* change text during btn-toggle click if possible
*/
$('.media-loader').click(function() {
var target = $(this).data('target');
var iframe_load = $(target + ' > iframe');
var srctest = iframe_load.attr('src');
if(srctest === undefined || srctest === false){
iframe_load.attr('src', iframe_load.data('src'));
}
});
/**
* Select or deselect every categories on double clic

View File

@ -5,6 +5,18 @@
{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
{% if result.embedded %}
<small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader" data-toggle="collapse" data-target="#result-media-{{ index }}" data-btn-text-collapsed="{{ _('show media') }}" data-btn-text-not-collapsed="{{ _('hide media') }}">{{ icon('music') }} {{ _('show media') }}</a></small>
{% endif %}
{% if result.embedded %}
<div id="result-media-{{ index }}" class="collapse">
{% autoescape false %}
{{ result.embedded }}
{% endautoescape %}
</div>
{% endif %}
{% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
<div class="clearfix"></div>

View File

@ -5,6 +5,18 @@
{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
{% if result.embedded %}
<small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader" data-toggle="collapse" data-target="#result-video-{{ index }}" data-btn-text-collapsed="{{ _('show video') }}" data-btn-text-not-collapsed="{{ _('hide video') }}">{{ icon('film') }} {{ _('show video') }}</a></small>
{% endif %}
{% if result.embedded %}
<div id="result-video-{{ index }}" class="collapse">
{% autoescape false %}
{{ result.embedded }}
{% endautoescape %}
</div>
{% endif %}
<div class="container-fluid">
<div class="row">
<a href="{{ result.url }}"><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ result.thumbnail|safe }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a>

View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-12-27 14:39+0100\n"
"POT-Creation-Date: 2015-01-05 20:54+0100\n"
"PO-Revision-Date: 2014-12-27 10:30+0000\n"
"Last-Translator: pointhi\n"
"Language-Team: German "
@ -21,11 +21,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
#: searx/webapp.py:247
#: searx/webapp.py:263
msgid "{minutes} minute(s) ago"
msgstr "vor {minutes} Minute(n)"
#: searx/webapp.py:249
#: searx/webapp.py:265
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "vor {hours} Stunde(n), {minutes} Minute(n)"
@ -173,31 +173,31 @@ msgstr "Zurück"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
#: searx/templates/oscar/results.html:83
#: searx/templates/oscar/results.html:87
msgid "Search URL"
msgstr "Such-URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
#: searx/templates/oscar/results.html:88
#: searx/templates/oscar/results.html:92
msgid "Download results"
msgstr "Ergebnisse herunterladen"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:42
#: searx/templates/oscar/results.html:63
#: searx/templates/oscar/results.html:67
msgid "Suggestions"
msgstr "Vorschläge"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:78
#: searx/templates/oscar/results.html:37
#: searx/templates/oscar/results.html:41
msgid "previous page"
msgstr "vorherige Seite"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:89
#: searx/templates/oscar/results.html:45
#: searx/templates/oscar/results.html:49
msgid "next page"
msgstr "nächste Seite"
@ -276,7 +276,7 @@ msgstr "ändere das Aussehen von searx"
msgid "Search results"
msgstr "Suchergebnisse"
#: searx/templates/oscar/results.html:78
#: searx/templates/oscar/results.html:82
msgid "Links"
msgstr "Links"
@ -360,6 +360,14 @@ msgstr "Irgendetwas ist falsch gelaufen."
msgid "cached"
msgstr "Im Cache"
#: searx/templates/oscar/result_templates/default.html:9
msgid "show media"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "hide media"
msgstr ""
#: searx/templates/oscar/result_templates/images.html:21
msgid "Get image"
msgstr "Bild ansehen"
@ -392,6 +400,14 @@ msgstr "Seeder"
msgid "Leecher"
msgstr "Leecher"
#: searx/templates/oscar/result_templates/videos.html:9
msgid "show video"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "hide video"
msgstr ""
msgid "Localization"
msgstr "Übersetzung"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-12-27 14:39+0100\n"
"POT-Creation-Date: 2015-01-05 20:54+0100\n"
"PO-Revision-Date: 2014-01-30 15:22+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en <LL@li.org>\n"
@ -17,11 +17,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
#: searx/webapp.py:247
#: searx/webapp.py:263
msgid "{minutes} minute(s) ago"
msgstr ""
#: searx/webapp.py:249
#: searx/webapp.py:265
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr ""
@ -165,31 +165,31 @@ msgstr ""
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
#: searx/templates/oscar/results.html:83
#: searx/templates/oscar/results.html:87
msgid "Search URL"
msgstr ""
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
#: searx/templates/oscar/results.html:88
#: searx/templates/oscar/results.html:92
msgid "Download results"
msgstr ""
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:42
#: searx/templates/oscar/results.html:63
#: searx/templates/oscar/results.html:67
msgid "Suggestions"
msgstr ""
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:78
#: searx/templates/oscar/results.html:37
#: searx/templates/oscar/results.html:41
msgid "previous page"
msgstr ""
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:89
#: searx/templates/oscar/results.html:45
#: searx/templates/oscar/results.html:49
msgid "next page"
msgstr ""
@ -265,7 +265,7 @@ msgstr ""
msgid "Search results"
msgstr ""
#: searx/templates/oscar/results.html:78
#: searx/templates/oscar/results.html:82
msgid "Links"
msgstr ""
@ -346,6 +346,14 @@ msgstr ""
msgid "cached"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "show media"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "hide media"
msgstr ""
#: searx/templates/oscar/result_templates/images.html:21
msgid "Get image"
msgstr ""
@ -378,6 +386,14 @@ msgstr ""
msgid "Leecher"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "show video"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "hide video"
msgstr ""
msgid "Localization"
msgstr ""

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-12-27 14:39+0100\n"
"POT-Creation-Date: 2015-01-05 20:54+0100\n"
"PO-Revision-Date: 2014-11-26 20:38+0000\n"
"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n"
"Language-Team: Spanish "
@ -19,11 +19,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
#: searx/webapp.py:247
#: searx/webapp.py:263
msgid "{minutes} minute(s) ago"
msgstr "hace {minutes} minuto(s)"
#: searx/webapp.py:249
#: searx/webapp.py:265
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "hace {hours} hora(s) y {minutes} minuto(s)"
@ -171,31 +171,31 @@ msgstr "Atrás"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
#: searx/templates/oscar/results.html:83
#: searx/templates/oscar/results.html:87
msgid "Search URL"
msgstr "Buscar URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
#: searx/templates/oscar/results.html:88
#: searx/templates/oscar/results.html:92
msgid "Download results"
msgstr "Descargar resultados"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:42
#: searx/templates/oscar/results.html:63
#: searx/templates/oscar/results.html:67
msgid "Suggestions"
msgstr "Sugerencias"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:78
#: searx/templates/oscar/results.html:37
#: searx/templates/oscar/results.html:41
msgid "previous page"
msgstr "Página anterior"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:89
#: searx/templates/oscar/results.html:45
#: searx/templates/oscar/results.html:49
msgid "next page"
msgstr "Página siguiente"
@ -271,7 +271,7 @@ msgstr ""
msgid "Search results"
msgstr ""
#: searx/templates/oscar/results.html:78
#: searx/templates/oscar/results.html:82
msgid "Links"
msgstr ""
@ -352,6 +352,14 @@ msgstr ""
msgid "cached"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "show media"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "hide media"
msgstr ""
#: searx/templates/oscar/result_templates/images.html:21
msgid "Get image"
msgstr ""
@ -384,6 +392,14 @@ msgstr ""
msgid "Leecher"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "show video"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "hide video"
msgstr ""
msgid "Localization"
msgstr ""
@ -404,15 +420,9 @@ msgstr "General"
msgid "music"
msgstr "Música"
msgid "social media"
msgstr "Medios sociales"
msgid "images"
msgstr "Imágenes"
msgid "videos"
msgstr "Vídeos"
msgid "it"
msgstr "TIC"

View File

@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-12-27 14:39+0100\n"
"POT-Creation-Date: 2015-01-05 20:54+0100\n"
"PO-Revision-Date: 2014-12-14 21:00+0000\n"
"Last-Translator: Cqoicebordel <david.barouh@wanadoo.fr>\n"
"Language-Team: French "
@ -22,11 +22,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
#: searx/webapp.py:247
#: searx/webapp.py:263
msgid "{minutes} minute(s) ago"
msgstr "il y a {minutes} minute(s)"
#: searx/webapp.py:249
#: searx/webapp.py:265
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "il y a {hours} heure(s), {minutes} minute(s)"
@ -174,31 +174,31 @@ msgstr "retour"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
#: searx/templates/oscar/results.html:83
#: searx/templates/oscar/results.html:87
msgid "Search URL"
msgstr "URL de recherche"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
#: searx/templates/oscar/results.html:88
#: searx/templates/oscar/results.html:92
msgid "Download results"
msgstr "Télécharger les résultats"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:42
#: searx/templates/oscar/results.html:63
#: searx/templates/oscar/results.html:67
msgid "Suggestions"
msgstr "Suggestions"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:78
#: searx/templates/oscar/results.html:37
#: searx/templates/oscar/results.html:41
msgid "previous page"
msgstr "page précédente"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:89
#: searx/templates/oscar/results.html:45
#: searx/templates/oscar/results.html:49
msgid "next page"
msgstr "page suivante"
@ -277,7 +277,7 @@ msgstr "Modifier l'affichage de searx"
msgid "Search results"
msgstr "Résultats de recherche"
#: searx/templates/oscar/results.html:78
#: searx/templates/oscar/results.html:82
msgid "Links"
msgstr "Liens"
@ -362,6 +362,14 @@ msgstr "Il y a un problème."
msgid "cached"
msgstr "en cache"
#: searx/templates/oscar/result_templates/default.html:9
msgid "show media"
msgstr "afficher le média"
#: searx/templates/oscar/result_templates/default.html:9
msgid "hide media"
msgstr "cacher le media"
#: searx/templates/oscar/result_templates/images.html:21
msgid "Get image"
msgstr "Voir l'image"
@ -394,6 +402,14 @@ msgstr "Sources"
msgid "Leecher"
msgstr "Téléchargeurs"
#: searx/templates/oscar/result_templates/videos.html:9
msgid "show video"
msgstr "afficher la vidéo"
#: searx/templates/oscar/result_templates/videos.html:9
msgid "hide video"
msgstr "cacher la vidéo"
msgid "Localization"
msgstr "Localisation"

View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-12-27 14:39+0100\n"
"POT-Creation-Date: 2015-01-05 20:54+0100\n"
"PO-Revision-Date: 2014-12-22 16:11+0000\n"
"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n"
"Language-Team: Hungarian "
@ -20,11 +20,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
#: searx/webapp.py:247
#: searx/webapp.py:263
msgid "{minutes} minute(s) ago"
msgstr "{minutes} perce"
#: searx/webapp.py:249
#: searx/webapp.py:265
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "{hours} óra, {minutes} perce"
@ -170,31 +170,31 @@ msgstr "vissza"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
#: searx/templates/oscar/results.html:83
#: searx/templates/oscar/results.html:87
msgid "Search URL"
msgstr "Keresési URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
#: searx/templates/oscar/results.html:88
#: searx/templates/oscar/results.html:92
msgid "Download results"
msgstr "Találatok letöltése"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:42
#: searx/templates/oscar/results.html:63
#: searx/templates/oscar/results.html:67
msgid "Suggestions"
msgstr "Javaslatok"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:78
#: searx/templates/oscar/results.html:37
#: searx/templates/oscar/results.html:41
msgid "previous page"
msgstr "előző oldal"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:89
#: searx/templates/oscar/results.html:45
#: searx/templates/oscar/results.html:49
msgid "next page"
msgstr "következő oldal"
@ -273,7 +273,7 @@ msgstr "Megjelenés"
msgid "Search results"
msgstr "Keresési eredmények"
#: searx/templates/oscar/results.html:78
#: searx/templates/oscar/results.html:82
msgid "Links"
msgstr "Linkek"
@ -354,6 +354,14 @@ msgstr "Hiba történt"
msgid "cached"
msgstr "tárolt"
#: searx/templates/oscar/result_templates/default.html:9
msgid "show media"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "hide media"
msgstr ""
#: searx/templates/oscar/result_templates/images.html:21
msgid "Get image"
msgstr "Kép megjelenítése"
@ -386,6 +394,14 @@ msgstr "Seeder"
msgid "Leecher"
msgstr "Leecher"
#: searx/templates/oscar/result_templates/videos.html:9
msgid "show video"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "hide video"
msgstr ""
msgid "Localization"
msgstr "Nyelv"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-12-27 14:39+0100\n"
"POT-Creation-Date: 2015-01-05 20:54+0100\n"
"PO-Revision-Date: 2014-11-26 20:38+0000\n"
"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n"
"Language-Team: Italian "
@ -19,11 +19,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
#: searx/webapp.py:247
#: searx/webapp.py:263
msgid "{minutes} minute(s) ago"
msgstr "di {minutes} minuti fa"
#: searx/webapp.py:249
#: searx/webapp.py:265
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "di {ore} h e {minutes} minuti fa"
@ -171,31 +171,31 @@ msgstr "indietro"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
#: searx/templates/oscar/results.html:83
#: searx/templates/oscar/results.html:87
msgid "Search URL"
msgstr "URL della ricerca"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
#: searx/templates/oscar/results.html:88
#: searx/templates/oscar/results.html:92
msgid "Download results"
msgstr "Scarica i risultati"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:42
#: searx/templates/oscar/results.html:63
#: searx/templates/oscar/results.html:67
msgid "Suggestions"
msgstr "Suggerimenti"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:78
#: searx/templates/oscar/results.html:37
#: searx/templates/oscar/results.html:41
msgid "previous page"
msgstr "pagina precedente"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:89
#: searx/templates/oscar/results.html:45
#: searx/templates/oscar/results.html:49
msgid "next page"
msgstr "pagina successiva"
@ -271,7 +271,7 @@ msgstr ""
msgid "Search results"
msgstr ""
#: searx/templates/oscar/results.html:78
#: searx/templates/oscar/results.html:82
msgid "Links"
msgstr ""
@ -352,6 +352,14 @@ msgstr ""
msgid "cached"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "show media"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "hide media"
msgstr ""
#: searx/templates/oscar/result_templates/images.html:21
msgid "Get image"
msgstr ""
@ -384,6 +392,14 @@ msgstr ""
msgid "Leecher"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "show video"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "hide video"
msgstr ""
msgid "Localization"
msgstr ""
@ -404,15 +420,9 @@ msgstr "generale"
msgid "music"
msgstr "musica"
msgid "social media"
msgstr "social media"
msgid "images"
msgstr "immagini"
msgid "videos"
msgstr "video"
msgid "it"
msgstr "it"

View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-12-27 14:39+0100\n"
"POT-Creation-Date: 2015-01-05 20:54+0100\n"
"PO-Revision-Date: 2014-11-26 20:38+0000\n"
"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n"
"Language-Team: Japanese "
@ -20,11 +20,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
#: searx/webapp.py:247
#: searx/webapp.py:263
msgid "{minutes} minute(s) ago"
msgstr "{minutes}分前"
#: searx/webapp.py:249
#: searx/webapp.py:265
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "{hours}時間と{minutes}分前"
@ -168,31 +168,31 @@ msgstr "バック"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
#: searx/templates/oscar/results.html:83
#: searx/templates/oscar/results.html:87
msgid "Search URL"
msgstr ""
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
#: searx/templates/oscar/results.html:88
#: searx/templates/oscar/results.html:92
msgid "Download results"
msgstr "ダウンロードの結果"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:42
#: searx/templates/oscar/results.html:63
#: searx/templates/oscar/results.html:67
msgid "Suggestions"
msgstr "提案"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:78
#: searx/templates/oscar/results.html:37
#: searx/templates/oscar/results.html:41
msgid "previous page"
msgstr "前のページ"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:89
#: searx/templates/oscar/results.html:45
#: searx/templates/oscar/results.html:49
msgid "next page"
msgstr "次のページ"
@ -268,7 +268,7 @@ msgstr ""
msgid "Search results"
msgstr ""
#: searx/templates/oscar/results.html:78
#: searx/templates/oscar/results.html:82
msgid "Links"
msgstr ""
@ -349,6 +349,14 @@ msgstr ""
msgid "cached"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "show media"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "hide media"
msgstr ""
#: searx/templates/oscar/result_templates/images.html:21
msgid "Get image"
msgstr ""
@ -381,6 +389,14 @@ msgstr ""
msgid "Leecher"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "show video"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "hide video"
msgstr ""
msgid "Localization"
msgstr ""
@ -401,15 +417,9 @@ msgstr "ウェブ"
msgid "music"
msgstr "音楽"
msgid "social media"
msgstr "ソーシャルメディア"
msgid "images"
msgstr "画像"
msgid "videos"
msgstr "動画"
msgid "it"
msgstr "情報技術"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-12-27 14:39+0100\n"
"POT-Creation-Date: 2015-01-05 20:54+0100\n"
"PO-Revision-Date: 2014-12-11 13:50+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch "
@ -19,11 +19,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
#: searx/webapp.py:247
#: searx/webapp.py:263
msgid "{minutes} minute(s) ago"
msgstr "{minutes} min geleden"
#: searx/webapp.py:249
#: searx/webapp.py:265
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "{hours} uur, {minutes} min geleden"
@ -171,31 +171,31 @@ msgstr "terug"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
#: searx/templates/oscar/results.html:83
#: searx/templates/oscar/results.html:87
msgid "Search URL"
msgstr "Zoek URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
#: searx/templates/oscar/results.html:88
#: searx/templates/oscar/results.html:92
msgid "Download results"
msgstr "Downloaden zoekresultaten"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:42
#: searx/templates/oscar/results.html:63
#: searx/templates/oscar/results.html:67
msgid "Suggestions"
msgstr "Suggesties"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:78
#: searx/templates/oscar/results.html:37
#: searx/templates/oscar/results.html:41
msgid "previous page"
msgstr "vorige pagina"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:89
#: searx/templates/oscar/results.html:45
#: searx/templates/oscar/results.html:49
msgid "next page"
msgstr "volgende pagina"
@ -274,7 +274,7 @@ msgstr "Wijzig searx layout"
msgid "Search results"
msgstr "Zoekresultaten"
#: searx/templates/oscar/results.html:78
#: searx/templates/oscar/results.html:82
msgid "Links"
msgstr "Links"
@ -357,6 +357,14 @@ msgstr "Er ging iets fout."
msgid "cached"
msgstr "gecached"
#: searx/templates/oscar/result_templates/default.html:9
msgid "show media"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "hide media"
msgstr ""
#: searx/templates/oscar/result_templates/images.html:21
msgid "Get image"
msgstr "Toon afbeelding"
@ -389,6 +397,14 @@ msgstr "Aanbieder"
msgid "Leecher"
msgstr "Ophaler"
#: searx/templates/oscar/result_templates/videos.html:9
msgid "show video"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "hide video"
msgstr ""
msgid "Localization"
msgstr "Vertaling"

View File

@ -1,30 +1,30 @@
# English translations for PROJECT.
# English translations for .
# Copyright (C) 2014 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
# This file is distributed under the same license as the project.
#
# Translators:
# Caner Başaran <basaran.caner@gmail.com>, 2014
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014
msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2014-12-27 14:39+0100\n"
"POT-Creation-Date: 2015-01-05 20:54+0100\n"
"PO-Revision-Date: 2014-12-28 08:20+0000\n"
"Last-Translator: Caner Başaran <basaran.caner@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/searx/language/tr/)\n"
"Language-Team: Turkish "
"(http://www.transifex.com/projects/p/searx/language/tr/)\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: searx/webapp.py:247
#: searx/webapp.py:263
msgid "{minutes} minute(s) ago"
msgstr "{minutes} dakika() önce"
#: searx/webapp.py:249
#: searx/webapp.py:265
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "{hours} saat(), {minutes} dakika() önce"
@ -142,9 +142,11 @@ msgstr "Engelle"
#: searx/templates/default/preferences.html:92
#: 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 "Ayarlar çerezlerinizde saklanır. Verdiğiniz izinler, sizin hakkınızda veri saklamak için değil."
"These settings are stored in your cookies, this allows us not to store "
"this data about you."
msgstr ""
"Ayarlar çerezlerinizde saklanır. Verdiğiniz izinler, sizin hakkınızda "
"veri saklamak için değil."
#: searx/templates/courgette/preferences.html:94
#: searx/templates/default/preferences.html:94
@ -168,31 +170,31 @@ msgstr "geri"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
#: searx/templates/oscar/results.html:83
#: searx/templates/oscar/results.html:87
msgid "Search URL"
msgstr "Arama Bağlantısı"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
#: searx/templates/oscar/results.html:88
#: searx/templates/oscar/results.html:92
msgid "Download results"
msgstr "Arama sonuçlarını indir"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:42
#: searx/templates/oscar/results.html:63
#: searx/templates/oscar/results.html:67
msgid "Suggestions"
msgstr "Öneriler"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:78
#: searx/templates/oscar/results.html:37
#: searx/templates/oscar/results.html:41
msgid "previous page"
msgstr "önceki sayfa"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:89
#: searx/templates/oscar/results.html:45
#: searx/templates/oscar/results.html:49
msgid "next page"
msgstr "sonraki sayfa"
@ -221,7 +223,9 @@ msgstr "Gücümün kaynağı"
#: searx/templates/oscar/base.html:69
msgid "a privacy-respecting, hackable metasearch engine"
msgstr "kişisel gizliliğe saygılı ve merak edenlerin kurcalayabildiği bir meta arama motoru"
msgstr ""
"kişisel gizliliğe saygılı ve merak edenlerin kurcalayabildiği bir meta "
"arama motoru"
#: searx/templates/oscar/navbar.html:6
msgid "Toggle navigation"
@ -258,7 +262,10 @@ msgid ""
"Change how forms are submited, <a "
"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\""
" rel=\"external\">learn more about request methods</a>"
msgstr "Aramaların nasıl gönderildiğini değiştir, <a href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">istek yöntemleri hakkında daha fazla bilgi</a>"
msgstr ""
"Aramaların nasıl gönderildiğini değiştir, <a "
"href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\""
" rel=\"external\">istek yöntemleri hakkında daha fazla bilgi</a>"
#: searx/templates/oscar/preferences.html:84
msgid "Change searx layout"
@ -268,12 +275,11 @@ msgstr "searx yerleşim düzenini değiştir"
msgid "Search results"
msgstr "Arama sonuçları"
#: searx/templates/oscar/results.html:78
#: searx/templates/oscar/results.html:82
msgid "Links"
msgstr "Bağlantılar"
#: 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 "Aramayı başlat"
@ -311,7 +317,9 @@ msgstr "Uyarı!"
#: searx/templates/oscar/messages/js_disabled.html:3
msgid "Please enable JavaScript to use full functionality of this site."
msgstr "Lütfen, bu sitenin tüm işlevlerini kullanmak için JavaScript'i etkinleştirin."
msgstr ""
"Lütfen, bu sitenin tüm işlevlerini kullanmak için JavaScript'i "
"etkinleştirin."
#: searx/templates/oscar/messages/no_data_available.html:4
msgid "There is currently no data available. "
@ -325,7 +333,9 @@ msgstr "Üzgünüz!"
msgid ""
"we didn't find any results. Please use another query or search in more "
"categories."
msgstr "herhangi bir sonuç bulamadık. Lütfen, başka sorgu kullanın veya daha fazla kategoride arama yapın."
msgstr ""
"herhangi bir sonuç bulamadık. Lütfen, başka sorgu kullanın veya daha "
"fazla kategoride arama yapın."
#: searx/templates/oscar/messages/save_settings_successfull.html:7
msgid "Well done!"
@ -350,6 +360,14 @@ msgstr "Bazı bazı şeylerde problem olmuş."
msgid "cached"
msgstr "önbellek"
#: searx/templates/oscar/result_templates/default.html:9
msgid "show media"
msgstr ""
#: searx/templates/oscar/result_templates/default.html:9
msgid "hide media"
msgstr ""
#: searx/templates/oscar/result_templates/images.html:21
msgid "Get image"
msgstr "Görseli indir"
@ -382,6 +400,14 @@ msgstr "Besleyenler"
msgid "Leecher"
msgstr "Sömürenler"
#: searx/templates/oscar/result_templates/videos.html:9
msgid "show video"
msgstr ""
#: searx/templates/oscar/result_templates/videos.html:9
msgid "hide video"
msgstr ""
msgid "Localization"
msgstr ""
@ -419,3 +445,4 @@ msgstr "haberler"
msgid "map"
msgstr "harita"

View File

@ -9,7 +9,7 @@ SEARX_DIR='searx'
pybabel extract -F babel.cfg -o messages.pot $SEARX_DIR
for f in `ls $SEARX_DIR'/translations/'`; do
pybabel update -i messages.pot -d $SEARX_DIR'/translations/' -l $f
pybabel update -N -i messages.pot -d $SEARX_DIR'/translations/' -l $f
# TODO - need to fix category translations
sed -i 's/#~ //' $SEARX_DIR'/translations/'$f'/LC_MESSAGES/messages.po'
done