NTab仓库
fjmwkj
/
searxng
mirror of https://github.com/searxng/searxng
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge remote-tracking branch 'asciimoo/master'

Thomas Pointhuber 11 years ago
parent
07f83cab22 73ab92544a
commit
e30f43bd81
22 changed files with 383 additions and 162 deletions
Split View Show Diff Stats
  1. 2 2
      searx/engines/xpath.py
  2. 4 3
      searx/settings.yml
  3. 2 0
      searx/static/css/style.css
  4. 3 3
      searx/templates/about.html
  5. 3 3
      searx/templates/base.html
  6. 1 1
      searx/templates/github_ribbon.html
  7. 2 2
      searx/templates/index.html
  8. 2 2
      searx/templates/preferences.html
  9. 10 6
      searx/templates/results.html
  10. 1 1
      searx/templates/search.html
  11. BIN
      searx/translations/de/LC_MESSAGES/messages.mo
  12. 67 57
      searx/translations/de/LC_MESSAGES/messages.po
  13. BIN
      searx/translations/en/LC_MESSAGES/messages.mo
  14. 42 27
      searx/translations/en/LC_MESSAGES/messages.po
  15. BIN
      searx/translations/es/LC_MESSAGES/messages.mo
  16. 158 0
      searx/translations/es/LC_MESSAGES/messages.po
  17. BIN
      searx/translations/fr/LC_MESSAGES/messages.mo
  18. 42 28
      searx/translations/fr/LC_MESSAGES/messages.po
  19. BIN
      searx/translations/hu/LC_MESSAGES/messages.mo
  20. 42 27
      searx/translations/hu/LC_MESSAGES/messages.po
  21. 1 0
      searx/utils.py
  22. 1 0
      searx/webapp.py

+ 2 - 2
searx/engines/xpath.py
View File 

@@ -1,7 +1,7 @@
 
 from lxml import html
 
 from urllib import urlencode, unquote
 
 from urlparse import urlparse, urljoin
 
-from lxml.etree import _ElementStringResult
 
+from lxml.etree import _ElementStringResult, _ElementUnicodeResult
 
 from searx.utils import html_to_text
 
 
 search_url = None
 
@@ -29,7 +29,7 @@ def extract_text(xpath_results):
 
         for e in xpath_results:
 
             result = result + extract_text(e)
 
         return result
 
-    elif type(xpath_results) == _ElementStringResult:
 
+    elif type(xpath_results) in [_ElementStringResult, _ElementUnicodeResult]:
 
         # it's a string
 
         return ''.join(xpath_results)
 
     else:

+ 4 - 3
searx/settings.yml
View File 

@@ -21,7 +21,7 @@ engines:
 
     engine : bing_news
 
     locale : en-US
 
     shortcut : bin
 
-    
+
 
   - name : currency
 
     engine : currency_convert
 
     categories : general
 
@@ -69,7 +69,7 @@ engines:
 
   - name : google news
 
     engine : google_news
 
     shortcut : gon
 
-    
+
 
   - name : piratebay
 
     engine : piratebay
 
     categories : videos, music, files
 
@@ -124,7 +124,7 @@ engines:
 
   - name : yahoo news
 
     engine : yahoo_news
 
     shortcut : yhn
 
-    
+
 
   - name : youtube
 
     engine : youtube
 
     categories : videos
 
@@ -150,3 +150,4 @@ locales:
 
     de : Deutsch
 
     hu : Magyar
 
     fr : Français
 
+    es : Español

+ 2 - 0
searx/static/css/style.css
View File 

@@ -165,6 +165,8 @@ tr:hover { background: #DDDDDD; }
 
 #suggestions span { display: block; margin: 0 2px 2px 2px; padding: 0; }
 
 #suggestions form { display: block; }
 
 #suggestions input { padding: 2px 6px; margin: 2px 4px;  font-size: 0.8em; display: inline-block; background: #3498DB; color: #FFFFFF; border-radius: 4px; border: 0; cursor: pointer; }
 
+#search_url { margin-top: 8px; }
 
+#search_url input { border: 1px solid #888888; padding: 4px; color: #444444; width: 20em; display: block; margin: 4px; }
 
 
 #preferences {
 
     top: 10px;

+ 3 - 3
searx/templates/about.html
View File 

@@ -2,9 +2,9 @@
 
 {% block content %}
 
 {% include 'github_ribbon.html' %}
 
 <div class="row">
 
-    <h1>About <a href="/">searx</a></h1>
 
+    <h1>About <a href="{{ url_for('index') }}">searx</a></h1>
 
 
-    <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="/preferences">search engines</a> while not storing information about its users.
 
+    <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.
 
     </p>
 
     <h2>Why use Searx?</h2>
 
     <ul>
 
@@ -60,7 +60,7 @@ Searx can be added to your browser's search bar; moreover, it can be set as the
 
 <p>See the <a href="https://github.com/asciimoo/searx/wiki/Installation">installation and setup</a> wiki page</p>
 
 
 <h3>How to debug engines?</h3>
 
-<p><a href="/stats">Stats page</a> contains some useful data about the engines used.</p>
 
+<p><a href="{{ url_for('stats') }}">Stats page</a> contains some useful data about the engines used.</p>
 
 
 </div>
 
 {% endblock %}

+ 3 - 3
searx/templates/base.html
View File 

@@ -6,19 +6,19 @@
 
     <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
 
     <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" />
 
     <title>{% block title %}{% endblock %}searx</title>
 
-    <link rel="stylesheet" href="/static/css/style.css" type="text/css" media="screen" />
 
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" />
 
     <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" />
 
     {% block styles %}
 
     {% endblock %}
 
     {% block head %}
 
-    <link title="searx" type="application/opensearchdescription+xml" rel="search" href="/opensearch.xml"/>
 
+    <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
 
     {% endblock %}
 
 </head>
 
 <body>
 
 <div id="container">
 
 {% block content %}
 
 {% endblock %}
 
-<script src="/static/js/searx.js" ></script>
 
+<script src="{{ url_for('static', filename='js/searx.js') }}" ></script>
 
 </div>
 
 </body>
 
 </html>

+ 1 - 1
searx/templates/github_ribbon.html
View File 

@@ -1,3 +1,3 @@
 
 <a href="https://github.com/asciimoo/searx" class="github">
 
-    <img style="position: absolute; top: 0; right: 0; border: 0;" src="/static/img/github_ribbon.png" alt="Fork me on GitHub"  class="github"/>
 
+    <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub"  class="github"/>
 
 </a>

+ 2 - 2
searx/templates/index.html
View File 

@@ -4,8 +4,8 @@
 
     <div class="title"><h1>searx</h1></div>
 
     {% include 'search.html' %}
 
     <p class="top_margin">
 
-        <a href="/about" class="hmarg">{{ _('about') }}</a>
 
-        <a href="/preferences" class="hmarg">{{ _('preferences') }}</a>
 
+        <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a>
 
+        <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a>
 
     </p>
 
 </div>
 
 {% endblock %}

+ 2 - 2
searx/templates/preferences.html
View File 

@@ -4,7 +4,7 @@
 
 <div class="row">
 
     <h2>{{ _('Preferences') }}</h2>
 
 
-    <form method="post" action="/preferences" id="search_form">
 
+    <form method="post" action="{{ url_for('preferences') }}" id="search_form">
 
     <fieldset>
 
         <legend>{{ _('Default categories') }}</legend>
 
         <p>
 
@@ -66,6 +66,6 @@
 
 
     <input type="submit" value="{{ _('save') }}" />
 
     </form>
 
-    <div class="right"><a href="/">{{ _('back') }}</a></div>
 
+    <div class="right"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div>
 
 </div>
 
 {% endblock %}

+ 10 - 6
searx/templates/results.html
View File 

@@ -1,7 +1,7 @@
 
 {% extends "base.html" %}
 
 {% block title %}{{ q }} - {% endblock %}
 
 {% block content %}
 
-<div class="right"><a href="/preferences" id="preferences"><span>preferences</span></a></div>
 
+<div class="right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>
 
 <div class="small search">
 
     {% include 'search.html' %}
 
 </div>
 
@@ -10,18 +10,22 @@
 
         {% if suggestions %}
 
         <div id="suggestions"><span>{{ _('Suggestions') }}</span>
 
             {% for suggestion in suggestions %}
 
-            <form method="post" action="/">
 
-                <input type="hidden" name="q" value="{{suggestion}}">
 
+            <form method="post" action="{{ url_for('index') }}">
 
+                <input type="hidden" name="q" value="{{ suggestion }}">
 
                 <input type="submit" value="{{ suggestion }}" />
 
             </form>
 
             {% endfor %}
 
         </div>
 
         {% endif %}
 
 
+        <div id="search_url">
 
+            {{ _('Search URL') }}:
 
+            <input type="text" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}" readonly="" />
 
+        </div>
 
         <div id="apis">
 
         {{ _('Download results') }}
 
         {% for output_type in ('csv', 'json', 'rss') %}
 
-        <form method="post" action="/">
 
+        <form method="post" action="{{ url_for('index') }}">
 
             <div class="left">
 
             <input type="hidden" name="q" value="{{ q }}" />
 
             <input type="hidden" name="format" value="{{ output_type }}" />
 
@@ -48,7 +52,7 @@
 
     {% if paging %}
 
     <div id="pagination">
 
         {% if pageno > 1 %}
 
-            <form method="post" action="/">
 
+            <form method="post" action="{{ url_for('index') }}">
 
                 <div class="left">
 
                 <input type="hidden" name="q" value="{{ q }}" />
 
                 {% for category in selected_categories %}
 
@@ -59,7 +63,7 @@
 
                 </div>
 
             </form>
 
         {% endif %}
 
-        <form method="post" action="/">
 
+        <form method="post" action="{{ url_for('index') }}">
 
             <div class="left">
 
             {% for category in selected_categories %}
 
             <input type="hidden" name="category_{{ category }}" value="1"/>

+ 1 - 1
searx/templates/search.html
View File 

@@ -1,4 +1,4 @@
 
-<form method="post" action="/" id="search_form">
 
+<form method="post" action="{{ url_for('index') }}" id="search_form">
 
   <div id="search_wrapper">
 
     <input type="text" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
 
     <input type="submit" value="search" id="search_submit" />

BIN
searx/translations/de/LC_MESSAGES/messages.mo
View File


+ 67 - 57
searx/translations/de/LC_MESSAGES/messages.po
View File 

@@ -1,60 +1,45 @@
 
-# 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
 
 # stf <stefan.marsiske@gmail.com>, 2014
 
 msgid ""
 
 msgstr ""
 
-"Project-Id-Version:  searx\n"
 
+"Project-Id-Version: searx\n"
 
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 
-"POT-Creation-Date: 2014-01-31 13:40+0100\n"
 
-"PO-Revision-Date: 2014-01-30 17:40+0000\n"
 
-"Last-Translator: stf <stefan.marsiske@gmail.com>\n"
 
-"Language-Team: German "
 
-"(http://www.transifex.com/projects/p/searx/language/de/)\n"
 
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+"POT-Creation-Date: 2014-03-04 20:54+0100\n"
 
+"PO-Revision-Date: 2014-03-04 22:00+0000\n"
 
+"Last-Translator: pointhi\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/engines/__init__.py:290
 
+#: searx/engines/__init__.py:308
 
 msgid "Page loads (sec)"
 
 msgstr "Ladezeit (sek)"
 
 
-#: searx/engines/__init__.py:294
 
+#: searx/engines/__init__.py:312
 
 msgid "Number of results"
 
 msgstr "Trefferanzahl"
 
 
-#: searx/engines/__init__.py:298
 
+#: searx/engines/__init__.py:316
 
 msgid "Scores"
 
 msgstr "Punkte"
 
 
-#: searx/engines/__init__.py:302
 
+#: searx/engines/__init__.py:320
 
 msgid "Scores per result"
 
 msgstr "Punkte pro Treffer"
 
 
-#: searx/engines/__init__.py:306
 
+#: searx/engines/__init__.py:324
 
 msgid "Errors"
 
 msgstr "Fehler"
 
 
-#: searx/templates/engines.html:4
 
-msgid "Currently used search engines"
 
-msgstr "Aktuell benutzte Suchmachinen"
 
-
 
-#: searx/templates/engines.html:8
 
-msgid "Engine name"
 
-msgstr "Suchmaschinenname"
 
-
 
-#: searx/templates/engines.html:9
 
-msgid "Category"
 
-msgstr "Kategorie"
 
-
 
-#: searx/templates/engines.html:23 searx/templates/preferences.html:42
 
-msgid "back"
 
-msgstr "Zurück"
 
-
 
 #: searx/templates/index.html:7
 
 msgid "about"
 
 msgstr "Über uns"
 
@@ -69,56 +54,79 @@ msgstr "Einstellungen"
 
 
 #: searx/templates/preferences.html:9
 
 msgid "Default categories"
 
-msgstr "Default Kategorien"
 
+msgstr "Standard Kategorien"
 
 
 #: searx/templates/preferences.html:15
 
-#, fuzzy
 
 msgid "Search language"
 
-msgstr "Oberflaechensprache"
 
+msgstr "Suchsprache"
 
 
 #: searx/templates/preferences.html:18
 
 msgid "Automatic"
 
-msgstr ""
 
+msgstr "Automatisch"
 
 
 #: searx/templates/preferences.html:26
 
 msgid "Interface language"
 
-msgstr "Oberflaechensprache"
 
+msgstr "Oberflächensprache"
 
+
 
+#: searx/templates/preferences.html:36
 
+msgid "Currently used search engines"
 
+msgstr "Aktuell benutzte Suchmaschinen"
 
+
 
+#: searx/templates/preferences.html:40
 
+msgid "Engine name"
 
+msgstr "Suchmaschinenname"
 
+
 
+#: searx/templates/preferences.html:41
 
+msgid "Category"
 
+msgstr "Kategorie"
 
+
 
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53
 
+msgid "Allow"
 
+msgstr "Erlauben"
 
+
 
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54
 
+msgid "Block"
 
+msgstr "Blockieren"
 
 
-#: searx/templates/preferences.html:35
 
+#: searx/templates/preferences.html:62
 
 msgid ""
 
-"These settings are stored in your cookies, this allows us not to store "
 
-"this data about you."
 
-msgstr ""
 
-"Diese Informationen werden in Cookies 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 gespeichert, damit wir keine ihrer persönlichen Daten speichern müssen."
 
 
-#: searx/templates/preferences.html:37
 
+#: searx/templates/preferences.html:64
 
 msgid ""
 
 "These cookies serve your sole convenience, we don't use these cookies to "
 
 "track you."
 
-msgstr ""
 
-"Diese Cookies dienen ihrer Gemütlichkeit, wir verwenden sie nicht zum "
 
-"überwachen."
 
+msgstr "Diese Cookies dienen ihrer Gemütlichkeit, wir verwenden sie nicht zum überwachen."
 
 
-#: searx/templates/preferences.html:40
 
+#: searx/templates/preferences.html:67
 
 msgid "save"
 
 msgstr "Speichern"
 
 
+#: searx/templates/preferences.html:69
 
+msgid "back"
 
+msgstr "Zurück"
 
+
 
 #: searx/templates/results.html:11
 
 msgid "Suggestions"
 
-msgstr "Vorschlaege"
 
+msgstr "Vorschläge"
 
 
 #: searx/templates/results.html:22
 
+msgid "Search URL"
 
+msgstr "Such-URL"
 
+
 
+#: searx/templates/results.html:26
 
 msgid "Download results"
 
-msgstr "Download Ergebnisse"
 
+msgstr "Ergebnisse herunterladen"
 
 
-#: searx/templates/results.html:66
 
+#: searx/templates/results.html:62
 
 msgid "previous page"
 
-msgstr "vorige Seite"
 
+msgstr "vorherige Seite"
 
 
-#: searx/templates/results.html:74
 
+#: searx/templates/results.html:73
 
 msgid "next page"
 
-msgstr "naechste Seite"
 
+msgstr "nächste Seite"
 
 
 #: searx/templates/stats.html:4
 
 msgid "Engine stats"
 
@@ -130,13 +138,13 @@ msgid "files"
 
 msgstr "Dateien"
 
 
 msgid "general"
 
-msgstr "General"
 
+msgstr "allgemein"
 
 
 msgid "music"
 
-msgstr "Music"
 
+msgstr "Musik"
 
 
 msgid "social media"
 
-msgstr "Social Media"
 
+msgstr "Soziale Medien"
 
 
 msgid "images"
 
 msgstr "Bilder"
 
@@ -147,3 +155,5 @@ msgstr "Videos"
 
 msgid "it"
 
 msgstr "IT"
 
 
+msgid "news"
 
+msgstr "Neuigkeiten"

BIN
searx/translations/en/LC_MESSAGES/messages.mo
View File


+ 42 - 27
searx/translations/en/LC_MESSAGES/messages.po
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-01-31 13:40+0100\n"
 
+"POT-Creation-Date: 2014-03-04 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,42 +17,26 @@ msgstr ""
 
 "Content-Transfer-Encoding: 8bit\n"
 
 "Generated-By: Babel 1.3\n"
 
 
-#: searx/engines/__init__.py:290
 
+#: searx/engines/__init__.py:308
 
 msgid "Page loads (sec)"
 
 msgstr ""
 
 
-#: searx/engines/__init__.py:294
 
+#: searx/engines/__init__.py:312
 
 msgid "Number of results"
 
 msgstr ""
 
 
-#: searx/engines/__init__.py:298
 
+#: searx/engines/__init__.py:316
 
 msgid "Scores"
 
 msgstr ""
 
 
-#: searx/engines/__init__.py:302
 
+#: searx/engines/__init__.py:320
 
 msgid "Scores per result"
 
 msgstr ""
 
 
-#: searx/engines/__init__.py:306
 
+#: searx/engines/__init__.py:324
 
 msgid "Errors"
 
 msgstr ""
 
 
-#: searx/templates/engines.html:4
 
-msgid "Currently used search engines"
 
-msgstr ""
 
-
 
-#: searx/templates/engines.html:8
 
-msgid "Engine name"
 
-msgstr ""
 
-
 
-#: searx/templates/engines.html:9
 
-msgid "Category"
 
-msgstr ""
 
-
 
-#: searx/templates/engines.html:23 searx/templates/preferences.html:42
 
-msgid "back"
 
-msgstr ""
 
-
 
 #: searx/templates/index.html:7
 
 msgid "about"
 
 msgstr ""
 
@@ -81,35 +65,63 @@ msgstr ""
 
 msgid "Interface language"
 
 msgstr ""
 
 
-#: searx/templates/preferences.html:35
 
+#: searx/templates/preferences.html:36
 
+msgid "Currently used search engines"
 
+msgstr ""
 
+
 
+#: searx/templates/preferences.html:40
 
+msgid "Engine name"
 
+msgstr ""
 
+
 
+#: searx/templates/preferences.html:41
 
+msgid "Category"
 
+msgstr ""
 
+
 
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53
 
+msgid "Allow"
 
+msgstr ""
 
+
 
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54
 
+msgid "Block"
 
+msgstr ""
 
+
 
+#: searx/templates/preferences.html:62
 
 msgid ""
 
 "These settings are stored in your cookies, this allows us not to store "
 
 "this data about you."
 
 msgstr ""
 
 
-#: searx/templates/preferences.html:37
 
+#: searx/templates/preferences.html:64
 
 msgid ""
 
 "These cookies serve your sole convenience, we don't use these cookies to "
 
 "track you."
 
 msgstr ""
 
 
-#: searx/templates/preferences.html:40
 
+#: searx/templates/preferences.html:67
 
 msgid "save"
 
 msgstr ""
 
 
+#: searx/templates/preferences.html:69
 
+msgid "back"
 
+msgstr ""
 
+
 
 #: searx/templates/results.html:11
 
 msgid "Suggestions"
 
 msgstr ""
 
 
 #: searx/templates/results.html:22
 
+msgid "Search URL"
 
+msgstr ""
 
+
 
+#: searx/templates/results.html:26
 
 msgid "Download results"
 
 msgstr ""
 
 
-#: searx/templates/results.html:66
 
+#: searx/templates/results.html:62
 
 msgid "previous page"
 
 msgstr ""
 
 
-#: searx/templates/results.html:74
 
+#: searx/templates/results.html:73
 
 msgid "next page"
 
 msgstr ""
 
 
@@ -140,3 +152,6 @@ msgstr ""
 
 msgid "it"
 
 msgstr ""
 
 
+msgid "news"
 
+msgstr ""
 
+

BIN
searx/translations/es/LC_MESSAGES/messages.mo
View File


+ 158 - 0
searx/translations/es/LC_MESSAGES/messages.po
View File 

@@ -0,0 +1,158 @@
 
+# English translations for PROJECT.
 
+# Copyright (C) 2014 ORGANIZATION
 
+# This file is distributed under the same license as the PROJECT project.
 
+# 
+# Translators:
 
+# niazle, 2014
 
+msgid ""
 
+msgstr ""
 
+"Project-Id-Version: searx\n"
 
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 
+"POT-Creation-Date: 2014-03-04 20:54+0100\n"
 
+"PO-Revision-Date: 2014-03-04 20:40+0000\n"
 
+"Last-Translator: niazle\n"
 
+"Language-Team: Spanish (http://www.transifex.com/projects/p/searx/language/es/)\n"
 
+"MIME-Version: 1.0\n"
 
+"Content-Type: text/plain; charset=UTF-8\n"
 
+"Content-Transfer-Encoding: 8bit\n"
 
+"Generated-By: Babel 1.3\n"
 
+"Language: es\n"
 
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+
 
+#: searx/engines/__init__.py:308
 
+msgid "Page loads (sec)"
 
+msgstr "Tiempo de carga (segundos)"
 
+
 
+#: searx/engines/__init__.py:312
 
+msgid "Number of results"
 
+msgstr "Número de resultados"
 
+
 
+#: searx/engines/__init__.py:316
 
+msgid "Scores"
 
+msgstr "Puntuaciones"
 
+
 
+#: searx/engines/__init__.py:320
 
+msgid "Scores per result"
 
+msgstr "Puntuaciones por resultado"
 
+
 
+#: searx/engines/__init__.py:324
 
+msgid "Errors"
 
+msgstr "Errores"
 
+
 
+#: searx/templates/index.html:7
 
+msgid "about"
 
+msgstr "acerca de"
 
+
 
+#: searx/templates/index.html:8
 
+msgid "preferences"
 
+msgstr "preferencias"
 
+
 
+#: searx/templates/preferences.html:5
 
+msgid "Preferences"
 
+msgstr "Preferencias"
 
+
 
+#: searx/templates/preferences.html:9
 
+msgid "Default categories"
 
+msgstr "Categorías predeterminadas"
 
+
 
+#: searx/templates/preferences.html:15
 
+msgid "Search language"
 
+msgstr "Buscar idioma"
 
+
 
+#: searx/templates/preferences.html:18
 
+msgid "Automatic"
 
+msgstr "Automático"
 
+
 
+#: searx/templates/preferences.html:26
 
+msgid "Interface language"
 
+msgstr "Idioma de la interfaz"
 
+
 
+#: searx/templates/preferences.html:36
 
+msgid "Currently used search engines"
 
+msgstr "Motores de búsqueda actualmente en uso"
 
+
 
+#: searx/templates/preferences.html:40
 
+msgid "Engine name"
 
+msgstr "Nombre del motor de búsqueda"
 
+
 
+#: searx/templates/preferences.html:41
 
+msgid "Category"
 
+msgstr "Categoría"
 
+
 
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53
 
+msgid "Allow"
 
+msgstr "Permitir"
 
+
 
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54
 
+msgid "Block"
 
+msgstr "Bloquear"
 
+
 
+#: searx/templates/preferences.html:62
 
+msgid ""
 
+"These settings are stored in your cookies, this allows us not to store this "
 
+"data about you."
 
+msgstr "Esta configuración se guarda en sus cookies, lo que nos permite no almacenar dicha información sobre usted."
 
+
 
+#: searx/templates/preferences.html:64
 
+msgid ""
 
+"These cookies serve your sole convenience, we don't use these cookies to "
 
+"track you."
 
+msgstr "Estas cookies son para su propia comodidad, no las utilizamos para rastrearle."
 
+
 
+#: searx/templates/preferences.html:67
 
+msgid "save"
 
+msgstr "Guardar"
 
+
 
+#: searx/templates/preferences.html:69
 
+msgid "back"
 
+msgstr "Atrás"
 
+
 
+#: searx/templates/results.html:11
 
+msgid "Suggestions"
 
+msgstr "Sugerencias"
 
+
 
+#: searx/templates/results.html:22
 
+msgid "Search URL"
 
+msgstr "Buscar URL"
 
+
 
+#: searx/templates/results.html:26
 
+msgid "Download results"
 
+msgstr "Descargar resultados"
 
+
 
+#: searx/templates/results.html:62
 
+msgid "previous page"
 
+msgstr "Página anterior"
 
+
 
+#: searx/templates/results.html:73
 
+msgid "next page"
 
+msgstr "Página siguiente"
 
+
 
+#: searx/templates/stats.html:4
 
+msgid "Engine stats"
 
+msgstr "Estadísticas del motor de búsqueda"
 
+
 
+# categories - manually added
 
+# TODO - automatically add
 
+msgid "files"
 
+msgstr "Archivos"
 
+
 
+msgid "general"
 
+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"
 
+
 
+msgid "news"
 
+msgstr "noticias"

BIN
searx/translations/fr/LC_MESSAGES/messages.mo
View File


+ 42 - 28
searx/translations/fr/LC_MESSAGES/messages.po
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-01-31 13:40+0100\n"
 
+"POT-Creation-Date: 2014-03-04 20:54+0100\n"
 
 "PO-Revision-Date: 2014-01-21 23:33+0100\n"
 
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 
 "Language-Team: fr <LL@li.org>\n"
 
@@ -17,42 +17,26 @@ msgstr ""
 
 "Content-Transfer-Encoding: 8bit\n"
 
 "Generated-By: Babel 1.3\n"
 
 
-#: searx/engines/__init__.py:290
 
+#: searx/engines/__init__.py:308
 
 msgid "Page loads (sec)"
 
 msgstr "Chargement de la page (sec)"
 
 
-#: searx/engines/__init__.py:294
 
+#: searx/engines/__init__.py:312
 
 msgid "Number of results"
 
 msgstr "Nombre de résultats"
 
 
-#: searx/engines/__init__.py:298
 
+#: searx/engines/__init__.py:316
 
 msgid "Scores"
 
 msgstr "Score"
 
 
-#: searx/engines/__init__.py:302
 
+#: searx/engines/__init__.py:320
 
 msgid "Scores per result"
 
 msgstr "Score par résultat"
 
 
-#: searx/engines/__init__.py:306
 
+#: searx/engines/__init__.py:324
 
 msgid "Errors"
 
 msgstr "Erreurs"
 
 
-#: searx/templates/engines.html:4
 
-msgid "Currently used search engines"
 
-msgstr "Moteur actuellement utilisé"
 
-
 
-#: searx/templates/engines.html:8
 
-msgid "Engine name"
 
-msgstr "Nom du moteur"
 
-
 
-#: searx/templates/engines.html:9
 
-msgid "Category"
 
-msgstr "Catégorie"
 
-
 
-#: searx/templates/engines.html:23 searx/templates/preferences.html:42
 
-msgid "back"
 
-msgstr "retour"
 
-
 
 #: searx/templates/index.html:7
 
 msgid "about"
 
 msgstr "À propos"
 
@@ -70,7 +54,6 @@ msgid "Default categories"
 
 msgstr "Catégorie par défaut"
 
 
 #: searx/templates/preferences.html:15
 
-#, fuzzy
 
 msgid "Search language"
 
 msgstr "Langue de l'interface"
 
 
@@ -82,7 +65,27 @@ msgstr ""
 
 msgid "Interface language"
 
 msgstr "Langue de l'interface"
 
 
-#: searx/templates/preferences.html:35
 
+#: searx/templates/preferences.html:36
 
+msgid "Currently used search engines"
 
+msgstr "Moteur actuellement utilisé"
 
+
 
+#: searx/templates/preferences.html:40
 
+msgid "Engine name"
 
+msgstr "Nom du moteur"
 
+
 
+#: searx/templates/preferences.html:41
 
+msgid "Category"
 
+msgstr "Catégorie"
 
+
 
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53
 
+msgid "Allow"
 
+msgstr ""
 
+
 
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54
 
+msgid "Block"
 
+msgstr ""
 
+
 
+#: searx/templates/preferences.html:62
 
 msgid ""
 
 "These settings are stored in your cookies, this allows us not to store "
 
 "this data about you."
 
@@ -90,7 +93,7 @@ msgstr ""
 
 "Ces paramètres sont stcokés dans vos cookies; ceci nous permet de ne pas "
 
 "collecter vos données."
 
 
-#: searx/templates/preferences.html:37
 
+#: searx/templates/preferences.html:64
 
 msgid ""
 
 "These cookies serve your sole convenience, we don't use these cookies to "
 
 "track you."
 
@@ -98,23 +101,31 @@ msgstr ""
 
 "Les cookies sont la pour votre confort d'utilisation, nous ne les "
 
 "utilisons pas pour vous traquer."
 
 
-#: searx/templates/preferences.html:40
 
+#: searx/templates/preferences.html:67
 
 msgid "save"
 
 msgstr "enregistrer"
 
 
+#: searx/templates/preferences.html:69
 
+msgid "back"
 
+msgstr "retour"
 
+
 
 #: searx/templates/results.html:11
 
 msgid "Suggestions"
 
 msgstr "Suggestions"
 
 
 #: searx/templates/results.html:22
 
+msgid "Search URL"
 
+msgstr ""
 
+
 
+#: searx/templates/results.html:26
 
 msgid "Download results"
 
 msgstr "Télécharger les résultats"
 
 
-#: searx/templates/results.html:66
 
+#: searx/templates/results.html:62
 
 msgid "previous page"
 
 msgstr ""
 
 
-#: searx/templates/results.html:74
 
+#: searx/templates/results.html:73
 
 msgid "next page"
 
 msgstr ""
 
 
@@ -145,3 +156,6 @@ msgstr "vidéos"
 
 msgid "it"
 
 msgstr "it"
 
 
+msgid "news"
 
+msgstr ""
 
+

BIN
searx/translations/hu/LC_MESSAGES/messages.mo
View File


+ 42 - 27
searx/translations/hu/LC_MESSAGES/messages.po
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-01-31 13:40+0100\n"
 
+"POT-Creation-Date: 2014-03-04 20:54+0100\n"
 
 "PO-Revision-Date: 2014-01-21 23:33+0100\n"
 
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 
 "Language-Team: hu <LL@li.org>\n"
 
@@ -17,42 +17,26 @@ msgstr ""
 
 "Content-Transfer-Encoding: 8bit\n"
 
 "Generated-By: Babel 1.3\n"
 
 
-#: searx/engines/__init__.py:290
 
+#: searx/engines/__init__.py:308
 
 msgid "Page loads (sec)"
 
 msgstr "Válaszidők (sec)"
 
 
-#: searx/engines/__init__.py:294
 
+#: searx/engines/__init__.py:312
 
 msgid "Number of results"
 
 msgstr "Találatok száma"
 
 
-#: searx/engines/__init__.py:298
 
+#: searx/engines/__init__.py:316
 
 msgid "Scores"
 
 msgstr "Pontszámok"
 
 
-#: searx/engines/__init__.py:302
 
+#: searx/engines/__init__.py:320
 
 msgid "Scores per result"
 
 msgstr "Pontszámok találatonként"
 
 
-#: searx/engines/__init__.py:306
 
+#: searx/engines/__init__.py:324
 
 msgid "Errors"
 
 msgstr "Hibák"
 
 
-#: searx/templates/engines.html:4
 
-msgid "Currently used search engines"
 
-msgstr "Jelenleg használt keresők"
 
-
 
-#: searx/templates/engines.html:8
 
-msgid "Engine name"
 
-msgstr "Kereső neve"
 
-
 
-#: searx/templates/engines.html:9
 
-msgid "Category"
 
-msgstr "Kategória"
 
-
 
-#: searx/templates/engines.html:23 searx/templates/preferences.html:42
 
-msgid "back"
 
-msgstr "vissza"
 
-
 
 #: searx/templates/index.html:7
 
 msgid "about"
 
 msgstr "rólunk"
 
@@ -81,13 +65,33 @@ msgstr "Automatikus"
 
 msgid "Interface language"
 
 msgstr "Felület nyelve"
 
 
-#: searx/templates/preferences.html:35
 
+#: searx/templates/preferences.html:36
 
+msgid "Currently used search engines"
 
+msgstr "Jelenleg használt keresők"
 
+
 
+#: searx/templates/preferences.html:40
 
+msgid "Engine name"
 
+msgstr "Kereső neve"
 
+
 
+#: searx/templates/preferences.html:41
 
+msgid "Category"
 
+msgstr "Kategória"
 
+
 
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53
 
+msgid "Allow"
 
+msgstr "Engedélyezés"
 
+
 
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54
 
+msgid "Block"
 
+msgstr "Tiltás"
 
+
 
+#: searx/templates/preferences.html:62
 
 msgid ""
 
 "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/preferences.html:37
 
+#: searx/templates/preferences.html:64
 
 msgid ""
 
 "These cookies serve your sole convenience, we don't use these cookies to "
 
 "track you."
 
@@ -95,23 +99,31 @@ 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/preferences.html:40
 
+#: searx/templates/preferences.html:67
 
 msgid "save"
 
 msgstr "mentés"
 
 
+#: searx/templates/preferences.html:69
 
+msgid "back"
 
+msgstr "vissza"
 
+
 
 #: searx/templates/results.html:11
 
 msgid "Suggestions"
 
 msgstr "Javaslatok"
 
 
 #: searx/templates/results.html:22
 
+msgid "Search URL"
 
+msgstr "Keresési URL"
 
+
 
+#: searx/templates/results.html:26
 
 msgid "Download results"
 
 msgstr "Találatok letöltése"
 
 
-#: searx/templates/results.html:66
 
+#: searx/templates/results.html:62
 
 msgid "previous page"
 
 msgstr "előző oldal"
 
 
-#: searx/templates/results.html:74
 
+#: searx/templates/results.html:73
 
 msgid "next page"
 
 msgstr "következő oldal"
 
 
@@ -142,3 +154,6 @@ msgstr "videók"
 
 msgid "it"
 
 msgstr "it"
 
 
+msgid "news"
 
+msgstr "hírek"
 
+

+ 1 - 0
searx/utils.py
View File 

@@ -10,6 +10,7 @@ ua_versions = ('26.0', '27.0', '28.0')
 
 ua_os = ('Windows NT 6.3; WOW64', 'X11; Linux x86_64; rv:26.0')
 
 ua = "Mozilla/5.0 ({os}) Gecko/20100101 Firefox/{version}"
 
 
+
 
 def gen_useragent():
 
     # TODO
 
     return ua.format(os=choice(ua_os), version=choice(ua_versions))

+ 1 - 0
searx/webapp.py
View File 

@@ -182,6 +182,7 @@ def index():
 
         selected_categories=search.categories,
 
         paging=search.paging,
 
         pageno=search.pageno,
 
+        base_url=get_base_url(),
 
         suggestions=search.suggestions
 
     )

© 2025 NTab仓库
Page: 153ms Template: 117ms 微信 微信二维码 哔哩哔哩 Sina Weibo Javascript Licenses Website