Merge pull request #23 from conwetlab/develop

Version 0.3.2

ckanext/datarequests/i18n/ckanext-datarequests.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ckanext-datarequests 0.3.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-04-28 11:43+0200\n"
+"POT-Creation-Date: 2016-04-28 14:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -167,6 +167,7 @@ msgid "You are not authorized to update the Data Request %s"
 msgstr ""
 
 #: ckanext/datarequests/controllers/ui_controller.py:261
+#: ckanext/datarequests/tests/test_ui_controller.py:672
 #, python-format
 msgid "Data Request %s has been deleted"
 msgstr ""
@@ -467,8 +468,23 @@ msgstr ""
 msgid "Activity Stream"
 msgstr ""
 
-#: ckanext/datarequests/tests/test_ui_controller.py:672
-#, python-format
-msgid "Your Data Request %s has been deleted"
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:6
+msgid "{number} data request found for \"{query}\""
+msgid_plural "{number} data requests found for \"{query}\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:7
+msgid "No data requests found for \"{query}\""
+msgstr ""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:8
+msgid "{number} data request found"
+msgid_plural "{number} data requests found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:9
+msgid "No data requests found"
 msgstr ""
 

ckanext/datarequests/i18n/es/LC_MESSAGES/ckanext-datarequests.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ckanext-datarequests 0.3.0\n"
 "Report-Msgid-Bugs-To: amagan@conwet.com\n"
-"POT-Creation-Date: 2016-04-28 11:43+0200\n"
+"POT-Creation-Date: 2016-04-28 14:45+0200\n"
 "PO-Revision-Date: 2016-04-19 11:43+0200\n"
 "Last-Translator: Aitor Magán <amagan@conwet.com>\n"
 "Language-Team: es <LL@li.org>\n"
@@ -141,6 +141,7 @@ msgid "You are not authorized to update the Data Request %s"
 msgstr "No estás autorizado a actualizar la Solicitud de Datos %s"
 
 #: ckanext/datarequests/controllers/ui_controller.py:261
+#: ckanext/datarequests/tests/test_ui_controller.py:672
 #, python-format
 msgid "Data Request %s has been deleted"
 msgstr "La Solicitud de Datos %s ha sido borrada"
@@ -374,3 +375,23 @@ msgstr "¿Quieres crear una?"
 #: ckanext/datarequests/templates/datarequests/snippets/edit_datarequest_form.html:4
 msgid "Update Data Request"
 msgstr "Actualizar Solicitud de Datos"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:6
+msgid "{number} data request found for \"{query}\""
+msgid_plural "{number} data requests found for \"{query}\""
+msgstr[0] "{number} solicitud de datos encontrada para \"{query}\""
+msgstr[1] "{number} solicitudes de datos encontradas para \"{query}\""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:7
+msgid "No data requests found for \"{query}\""
+msgstr "No se han encontrado solicitudes de datos para \"{query}\""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:8
+msgid "{number} data request found"
+msgid_plural "{number} data requests found"
+msgstr[0] "{number} solicitud de datos encontrada"
+msgstr[1] "{number} solicitudes de datos encontradas"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:9
+msgid "No data requests found"
+msgstr "No se han encontrado solicitudes de datos"

ckanext/datarequests/templates/datarequests/index.html

@@ -9,8 +9,7 @@
             {% link_for _('Add Data Request'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
           </div>
         {% endif %}
-        {% snippet 'snippets/search_form.html', query=c.q, fields=(('organization', c.organization), ('state', c.state)), sorting=c.filters, sorting_selected=c.sort, placeholder=_('Search Data Requests...'), no_bottom_border=true, count=c.datarequest_count, no_title=True %}
-        <br />
+        {% snippet 'snippets/custom_search_form.html', query=c.q, fields=(('organization', c.organization), ('state', c.state)), sorting=c.filters, sorting_selected=c.sort, placeholder=_('Search Data Requests...'), no_bottom_border=true, count=c.datarequest_count, no_title=True %}
         {{ h.snippet('datarequests/snippets/datarequest_list.html', datarequest_count=c.datarequest_count, datarequests=c.datarequests, page=c.page, q=c.q)}}
       {% endblock %}
     </div>

ckanext/datarequests/templates/organization/datarequests.html

@@ -10,7 +10,7 @@
       {% link_for _('Add Data Request'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='new', organization=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
     </div>
   {% endif %}
-  {% snippet 'snippets/search_form.html', query=c.q, fields=(('state', c.state),), sorting=c.filters, sorting_selected=c.sort, placeholder=_('Search Data Requests...'), no_bottom_border=true, count=c.datarequest_count, no_title=True %}
+  {% snippet 'snippets/custom_search_form.html', query=c.q, fields=(('state', c.state),), sorting=c.filters, sorting_selected=c.sort, placeholder=_('Search Data Requests...'), no_bottom_border=true, count=c.datarequest_count, no_title=True %}
   {{ h.snippet('datarequests/snippets/datarequest_list.html', datarequest_count=c.datarequest_count, datarequests=c.datarequests, page=c.page, q=c.q)}}
 {% endblock %}
 

ckanext/datarequests/templates/snippets/custom_search_form.html

@@ -0,0 +1,26 @@
+{% extends "snippets/search_form.html" %}
+
+{% block search_title %}
+
+  <h2>
+    {% set text_query = ungettext('{number} data request found for "{query}"', '{number} data requests found for "{query}"', count) %}
+    {% set text_query_none = _('No data requests found for "{query}"') %}
+    {% set text_no_query = ungettext('{number} data request found', '{number} data requests found', count) %}
+    {% set text_no_query_none = _('No data requests found') %}
+
+    {% if query %}
+      {%- if count -%}
+        {{ text_query.format(number=h.localised_number(count), query=query) }}
+      {%- else -%}
+        {{ text_query_none.format(query=query) }}
+      {%- endif -%}
+    {%- else -%}
+      {%- if count -%}
+        {{ text_no_query.format(number=h.localised_number(count)) }}
+      {%- else -%}
+        {{ text_no_query_none }}
+      {%- endif -%}
+    {%- endif -%}
+  </h2>
+
+{% endblock %}

ckanext/datarequests/templates/user/datarequests.html

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block page_primary_action %}
-  {% snippet 'snippets/search_form.html', query=c.q, fields=(('state', c.state),), sorting=c.filters, sorting_selected=c.sort, placeholder=_('Search Data Requests...'), no_bottom_border=true, count=c.datarequest_count, no_title=True %}
+  {% snippet 'snippets/custom_search_form.html', query=c.q, fields=(('state', c.state),), sorting=c.filters, sorting_selected=c.sort, placeholder=_('Search Data Requests...'), no_bottom_border=true, count=c.datarequest_count, no_title=True %}
   {{ h.snippet('datarequests/snippets/datarequest_list.html', datarequest_count=c.datarequest_count, datarequests=c.datarequests, page=c.page, q=c.q)}}
 {% endblock %}