commit: c25aab73b72087a9a56d86c155a166bfcf018822
parent 451586f09f819c5a099eac7389522acd8a554466
Author: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Wed, 1 Oct 2014 19:46:29 +0200
oscar template: add no result message
Diffstat:
9 files changed, 139 insertions(+), 49 deletions(-)
diff --git a/searx/templates/oscar/messages/no_results.html b/searx/templates/oscar/messages/no_results.html
@@ -0,0 +1,9 @@
+{% from 'oscar/macros.html' import icon %}
+<div class="alert alert-info fade in" role="alert">
+ <button class="close" data-dismiss="alert" type="button">
+ <span aria-hidden="true">×</span>
+ <span class="sr-only">{{ _('Close') }}</span>
+ </button>
+ <strong class="lead">{{ icon('info-sign') }} {{ _('Sorry!') }}</strong>
+ {{ _('we didn\'t find any results. Please use another query or search in more categories.') }}
+</div>
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
@@ -12,6 +12,10 @@
{% if result.template %}{% include 'oscar/result_templates/'+result['template'] %}{% else %}{% include 'oscar/result_templates/default.html' %}{% endif %}
</div>
{% endfor %}
+
+ {% if not results %}
+ {% include 'oscar/messages/no_results.html' %}
+ {% endif %}
<div class="clearfix"></div>
diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-29 16:25+0200\n"
+"POT-Creation-Date: 2014-10-01 19:45+0200\n"
"PO-Revision-Date: 2014-03-15 18:40+0000\n"
"Last-Translator: pointhi\n"
"Language-Team: German "
@@ -172,31 +172,31 @@ msgstr "Zurück"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
-#: searx/templates/oscar/results.html:70
+#: searx/templates/oscar/results.html:74
msgid "Search URL"
msgstr "Such-URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
-#: searx/templates/oscar/results.html:75
+#: searx/templates/oscar/results.html:79
msgid "Download results"
msgstr "Ergebnisse herunterladen"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:34
-#: searx/templates/oscar/results.html:47
+#: searx/templates/oscar/results.html:51
msgid "Suggestions"
msgstr "Vorschläge"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:62
-#: searx/templates/oscar/results.html:25
+#: searx/templates/oscar/results.html:29
msgid "previous page"
msgstr "vorherige Seite"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:73
-#: searx/templates/oscar/results.html:33
+#: searx/templates/oscar/results.html:37
msgid "next page"
msgstr "nächste Seite"
@@ -265,7 +265,7 @@ msgstr ""
msgid "Search results"
msgstr "Trefferanzahl"
-#: searx/templates/oscar/results.html:64
+#: searx/templates/oscar/results.html:68
msgid "Links"
msgstr ""
@@ -286,6 +286,7 @@ msgid "stats"
msgstr ""
#: 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"
@@ -312,6 +313,16 @@ msgstr ""
msgid "There is currently no data available. "
msgstr ""
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: 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 ""
+
#: searx/templates/oscar/messages/save_settings_successfull.html:7
msgid "Well done!"
msgstr ""
diff --git a/searx/translations/en/LC_MESSAGES/messages.po b/searx/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-29 16:25+0200\n"
+"POT-Creation-Date: 2014-10-01 19:45+0200\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"
@@ -165,31 +165,31 @@ msgstr ""
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
-#: searx/templates/oscar/results.html:70
+#: searx/templates/oscar/results.html:74
msgid "Search URL"
msgstr ""
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
-#: searx/templates/oscar/results.html:75
+#: searx/templates/oscar/results.html:79
msgid "Download results"
msgstr ""
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:34
-#: searx/templates/oscar/results.html:47
+#: searx/templates/oscar/results.html:51
msgid "Suggestions"
msgstr ""
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:62
-#: searx/templates/oscar/results.html:25
+#: searx/templates/oscar/results.html:29
msgid "previous page"
msgstr ""
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:73
-#: searx/templates/oscar/results.html:33
+#: searx/templates/oscar/results.html:37
msgid "next page"
msgstr ""
@@ -255,7 +255,7 @@ msgstr ""
msgid "Search results"
msgstr ""
-#: searx/templates/oscar/results.html:64
+#: searx/templates/oscar/results.html:68
msgid "Links"
msgstr ""
@@ -276,6 +276,7 @@ msgid "stats"
msgstr ""
#: 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"
@@ -302,6 +303,16 @@ msgstr ""
msgid "There is currently no data available. "
msgstr ""
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: 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 ""
+
#: searx/templates/oscar/messages/save_settings_successfull.html:7
msgid "Well done!"
msgstr ""
diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-29 16:25+0200\n"
+"POT-Creation-Date: 2014-10-01 19:45+0200\n"
"PO-Revision-Date: 2014-03-04 20:40+0000\n"
"Last-Translator: niazle\n"
"Language-Team: Spanish "
@@ -171,31 +171,31 @@ msgstr "Atrás"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
-#: searx/templates/oscar/results.html:70
+#: searx/templates/oscar/results.html:74
msgid "Search URL"
msgstr "Buscar URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
-#: searx/templates/oscar/results.html:75
+#: searx/templates/oscar/results.html:79
msgid "Download results"
msgstr "Descargar resultados"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:34
-#: searx/templates/oscar/results.html:47
+#: searx/templates/oscar/results.html:51
msgid "Suggestions"
msgstr "Sugerencias"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:62
-#: searx/templates/oscar/results.html:25
+#: searx/templates/oscar/results.html:29
msgid "previous page"
msgstr "Página anterior"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:73
-#: searx/templates/oscar/results.html:33
+#: searx/templates/oscar/results.html:37
msgid "next page"
msgstr "Página siguiente"
@@ -264,7 +264,7 @@ msgstr ""
msgid "Search results"
msgstr "Número de resultados"
-#: searx/templates/oscar/results.html:64
+#: searx/templates/oscar/results.html:68
msgid "Links"
msgstr ""
@@ -285,6 +285,7 @@ msgid "stats"
msgstr ""
#: 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"
@@ -311,6 +312,16 @@ msgstr ""
msgid "There is currently no data available. "
msgstr ""
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: 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 ""
+
#: searx/templates/oscar/messages/save_settings_successfull.html:7
msgid "Well done!"
msgstr ""
diff --git a/searx/translations/fr/LC_MESSAGES/messages.po b/searx/translations/fr/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-29 16:25+0200\n"
+"POT-Creation-Date: 2014-10-01 19:45+0200\n"
"PO-Revision-Date: 2014-03-16 07:40+0000\n"
"Last-Translator: Benjamin Sonntag <benjamin@sonntag.fr>\n"
"Language-Team: French "
@@ -173,31 +173,31 @@ msgstr "retour"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
-#: searx/templates/oscar/results.html:70
+#: searx/templates/oscar/results.html:74
msgid "Search URL"
msgstr "URL de recherche"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
-#: searx/templates/oscar/results.html:75
+#: searx/templates/oscar/results.html:79
msgid "Download results"
msgstr "Télécharger les résultats"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:34
-#: searx/templates/oscar/results.html:47
+#: searx/templates/oscar/results.html:51
msgid "Suggestions"
msgstr "Suggestions"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:62
-#: searx/templates/oscar/results.html:25
+#: searx/templates/oscar/results.html:29
msgid "previous page"
msgstr "page précédente"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:73
-#: searx/templates/oscar/results.html:33
+#: searx/templates/oscar/results.html:37
msgid "next page"
msgstr "page suivante"
@@ -266,7 +266,7 @@ msgstr ""
msgid "Search results"
msgstr "Nombre de résultats"
-#: searx/templates/oscar/results.html:64
+#: searx/templates/oscar/results.html:68
msgid "Links"
msgstr ""
@@ -287,6 +287,7 @@ msgid "stats"
msgstr ""
#: 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"
@@ -313,6 +314,16 @@ msgstr ""
msgid "There is currently no data available. "
msgstr ""
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: 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 ""
+
#: searx/templates/oscar/messages/save_settings_successfull.html:7
msgid "Well done!"
msgstr ""
diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-29 16:25+0200\n"
+"POT-Creation-Date: 2014-10-01 19:45+0200\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"
@@ -167,31 +167,31 @@ msgstr "vissza"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
-#: searx/templates/oscar/results.html:70
+#: searx/templates/oscar/results.html:74
msgid "Search URL"
msgstr "Keresési URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
-#: searx/templates/oscar/results.html:75
+#: searx/templates/oscar/results.html:79
msgid "Download results"
msgstr "Találatok letöltése"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:34
-#: searx/templates/oscar/results.html:47
+#: searx/templates/oscar/results.html:51
msgid "Suggestions"
msgstr "Javaslatok"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:62
-#: searx/templates/oscar/results.html:25
+#: searx/templates/oscar/results.html:29
msgid "previous page"
msgstr "előző oldal"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:73
-#: searx/templates/oscar/results.html:33
+#: searx/templates/oscar/results.html:37
msgid "next page"
msgstr "következő oldal"
@@ -260,7 +260,7 @@ msgstr ""
msgid "Search results"
msgstr "Találatok száma"
-#: searx/templates/oscar/results.html:64
+#: searx/templates/oscar/results.html:68
msgid "Links"
msgstr ""
@@ -281,6 +281,7 @@ msgid "stats"
msgstr ""
#: 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"
@@ -307,6 +308,16 @@ msgstr ""
msgid "There is currently no data available. "
msgstr ""
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: 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 ""
+
#: searx/templates/oscar/messages/save_settings_successfull.html:7
msgid "Well done!"
msgstr ""
diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-29 16:25+0200\n"
+"POT-Creation-Date: 2014-10-01 19:45+0200\n"
"PO-Revision-Date: 2014-03-05 13:30+0000\n"
"Last-Translator: dp <d.pitrolo@gmx.com>\n"
"Language-Team: Italian "
@@ -171,31 +171,31 @@ msgstr "indietro"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
-#: searx/templates/oscar/results.html:70
+#: searx/templates/oscar/results.html:74
msgid "Search URL"
msgstr "URL della ricerca"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
-#: searx/templates/oscar/results.html:75
+#: searx/templates/oscar/results.html:79
msgid "Download results"
msgstr "Scarica i risultati"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:34
-#: searx/templates/oscar/results.html:47
+#: searx/templates/oscar/results.html:51
msgid "Suggestions"
msgstr "Suggerimenti"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:62
-#: searx/templates/oscar/results.html:25
+#: searx/templates/oscar/results.html:29
msgid "previous page"
msgstr "pagina precedente"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:73
-#: searx/templates/oscar/results.html:33
+#: searx/templates/oscar/results.html:37
msgid "next page"
msgstr "pagina successiva"
@@ -264,7 +264,7 @@ msgstr ""
msgid "Search results"
msgstr "Risultati ottenuti"
-#: searx/templates/oscar/results.html:64
+#: searx/templates/oscar/results.html:68
msgid "Links"
msgstr ""
@@ -285,6 +285,7 @@ msgid "stats"
msgstr ""
#: 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"
@@ -311,6 +312,16 @@ msgstr ""
msgid "There is currently no data available. "
msgstr ""
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: 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 ""
+
#: searx/templates/oscar/messages/save_settings_successfull.html:7
msgid "Well done!"
msgstr ""
diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-29 16:25+0200\n"
+"POT-Creation-Date: 2014-10-01 19:45+0200\n"
"PO-Revision-Date: 2014-03-15 20:20+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch "
@@ -171,31 +171,31 @@ msgstr "terug"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
-#: searx/templates/oscar/results.html:70
+#: searx/templates/oscar/results.html:74
msgid "Search URL"
msgstr "Zoek URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
-#: searx/templates/oscar/results.html:75
+#: searx/templates/oscar/results.html:79
msgid "Download results"
msgstr "Downloaden zoekresultaten"
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:34
-#: searx/templates/oscar/results.html:47
+#: searx/templates/oscar/results.html:51
msgid "Suggestions"
msgstr "Suggesties"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:62
-#: searx/templates/oscar/results.html:25
+#: searx/templates/oscar/results.html:29
msgid "previous page"
msgstr "vorige pagina"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:73
-#: searx/templates/oscar/results.html:33
+#: searx/templates/oscar/results.html:37
msgid "next page"
msgstr "volgende pagina"
@@ -264,7 +264,7 @@ msgstr ""
msgid "Search results"
msgstr "Aantal zoekresultaten"
-#: searx/templates/oscar/results.html:64
+#: searx/templates/oscar/results.html:68
msgid "Links"
msgstr ""
@@ -285,6 +285,7 @@ msgid "stats"
msgstr ""
#: 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"
@@ -311,6 +312,16 @@ msgstr ""
msgid "There is currently no data available. "
msgstr ""
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: 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 ""
+
#: searx/templates/oscar/messages/save_settings_successfull.html:7
msgid "Well done!"
msgstr ""