Skip to content

Commit 0014234

Browse files
aitormaganaitormagan
committed
Merge pull request #23 from conwetlab/develop
Version 0.3.2
2 parents 8a2b51e + e7474a3 commit 0014234

File tree

9 files changed

+171
-83
lines changed

9 files changed

+171
-83
lines changed

‎ckanext/datarequests/i18n/ckanext-datarequests.pot

+20-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: ckanext-datarequests 0.3.1\n"
1111
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
12-
"POT-Creation-Date: 2016-04-28 11:43+0200\n"
12+
"POT-Creation-Date: 2016-04-28 14:45+0200\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -167,6 +167,7 @@ msgid "You are not authorized to update the Data Request %s"
167167
msgstr ""
168168

169169
#: ckanext/datarequests/controllers/ui_controller.py:261
170+
#: ckanext/datarequests/tests/test_ui_controller.py:672
170171
#, python-format
171172
msgid "Data Request %s has been deleted"
172173
msgstr ""
@@ -467,8 +468,23 @@ msgstr ""
467468
msgid "Activity Stream"
468469
msgstr ""
469470

470-
#: ckanext/datarequests/tests/test_ui_controller.py:672
471-
#, python-format
472-
msgid "Your Data Request %s has been deleted"
471+
#: ckanext/datarequests/templates/snippets/custom_search_form.html:6
472+
msgid "{number} data request found for \"{query}\""
473+
msgid_plural "{number} data requests found for \"{query}\""
474+
msgstr[0] ""
475+
msgstr[1] ""
476+
477+
#: ckanext/datarequests/templates/snippets/custom_search_form.html:7
478+
msgid "No data requests found for \"{query}\""
479+
msgstr ""
480+
481+
#: ckanext/datarequests/templates/snippets/custom_search_form.html:8
482+
msgid "{number} data request found"
483+
msgid_plural "{number} data requests found"
484+
msgstr[0] ""
485+
msgstr[1] ""
486+
487+
#: ckanext/datarequests/templates/snippets/custom_search_form.html:9
488+
msgid "No data requests found"
473489
msgstr ""
474490

‎ckanext/datarequests/i18n/es/LC_MESSAGES/ckanext-datarequests.mo

557 Bytes
Binary file not shown.

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

+22-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: ckanext-datarequests 0.3.0\n"
1111
"Report-Msgid-Bugs-To: [email protected]\n"
12-
"POT-Creation-Date: 2016-04-28 11:43+0200\n"
12+
"POT-Creation-Date: 2016-04-28 14:45+0200\n"
1313
"PO-Revision-Date: 2016-04-19 11:43+0200\n"
1414
"Last-Translator: Aitor Magán <[email protected]>\n"
1515
"Language-Team: es <[email protected]>\n"
@@ -141,6 +141,7 @@ msgid "You are not authorized to update the Data Request %s"
141141
msgstr "No estás autorizado a actualizar la Solicitud de Datos %s"
142142

143143
#: ckanext/datarequests/controllers/ui_controller.py:261
144+
#: ckanext/datarequests/tests/test_ui_controller.py:672
144145
#, python-format
145146
msgid "Data Request %s has been deleted"
146147
msgstr "La Solicitud de Datos %s ha sido borrada"
@@ -374,3 +375,23 @@ msgstr "¿Quieres crear una?"
374375
#: ckanext/datarequests/templates/datarequests/snippets/edit_datarequest_form.html:4
375376
msgid "Update Data Request"
376377
msgstr "Actualizar Solicitud de Datos"
378+
379+
#: ckanext/datarequests/templates/snippets/custom_search_form.html:6
380+
msgid "{number} data request found for \"{query}\""
381+
msgid_plural "{number} data requests found for \"{query}\""
382+
msgstr[0] "{number} solicitud de datos encontrada para \"{query}\""
383+
msgstr[1] "{number} solicitudes de datos encontradas para \"{query}\""
384+
385+
#: ckanext/datarequests/templates/snippets/custom_search_form.html:7
386+
msgid "No data requests found for \"{query}\""
387+
msgstr "No se han encontrado solicitudes de datos para \"{query}\""
388+
389+
#: ckanext/datarequests/templates/snippets/custom_search_form.html:8
390+
msgid "{number} data request found"
391+
msgid_plural "{number} data requests found"
392+
msgstr[0] "{number} solicitud de datos encontrada"
393+
msgstr[1] "{number} solicitudes de datos encontradas"
394+
395+
#: ckanext/datarequests/templates/snippets/custom_search_form.html:9
396+
msgid "No data requests found"
397+
msgstr "No se han encontrado solicitudes de datos"

‎ckanext/datarequests/templates/datarequests/index.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
{% link_for _('Add Data Request'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
1010
</div>
1111
{% endif %}
12-
{% 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 %}
13-
<br />
12+
{% 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 %}
1413
{{ h.snippet('datarequests/snippets/datarequest_list.html', datarequest_count=c.datarequest_count, datarequests=c.datarequests, page=c.page, q=c.q)}}
1514
{% endblock %}
1615
</div>

‎ckanext/datarequests/templates/organization/datarequests.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{% 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' %}
1111
</div>
1212
{% endif %}
13-
{% 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 %}
13+
{% 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 %}
1414
{{ h.snippet('datarequests/snippets/datarequest_list.html', datarequest_count=c.datarequest_count, datarequests=c.datarequests, page=c.page, q=c.q)}}
1515
{% endblock %}
1616

‎ckanext/datarequests/templates/snippets/custom_search_form.html

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{% extends "snippets/search_form.html" %}
2+
3+
{% block search_title %}
4+
5+
<h2>
6+
{% set text_query = ungettext('{number} data request found for "{query}"', '{number} data requests found for "{query}"', count) %}
7+
{% set text_query_none = _('No data requests found for "{query}"') %}
8+
{% set text_no_query = ungettext('{number} data request found', '{number} data requests found', count) %}
9+
{% set text_no_query_none = _('No data requests found') %}
10+
11+
{% if query %}
12+
{%- if count -%}
13+
{{ text_query.format(number=h.localised_number(count), query=query) }}
14+
{%- else -%}
15+
{{ text_query_none.format(query=query) }}
16+
{%- endif -%}
17+
{%- else -%}
18+
{%- if count -%}
19+
{{ text_no_query.format(number=h.localised_number(count)) }}
20+
{%- else -%}
21+
{{ text_no_query_none }}
22+
{%- endif -%}
23+
{%- endif -%}
24+
</h2>
25+
26+
{% endblock %}

‎ckanext/datarequests/templates/user/datarequests.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{% endblock %}
77

88
{% block page_primary_action %}
9-
{% 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 %}
9+
{% 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 %}
1010
{{ h.snippet('datarequests/snippets/datarequest_list.html', datarequest_count=c.datarequest_count, datarequests=c.datarequests, page=c.page, q=c.q)}}
1111
{% endblock %}
1212

0 commit comments

Comments
 (0)