Merge tag '0.9.33' into develop

0.9.33

Makefile

@@ -26,7 +26,8 @@ release: clean ## package and upload a release
 	python setup.py bdist_wheel upload
 
 assets:
-	yarn
+	cd test_project && yarn
+	cd test_project && python manage.py collectstatic --noinput
 
 tests: assets
 	pip install tox
@@ -45,3 +46,6 @@ install-yarn-packages-via-docker:
 tests-via-docker: clean install-yarn-packages-via-docker
 	docker-compose up -d
 	docker-compose exec test /bin/bash -c "cd /usr/src/app && pip install tox && tox"
+
+update-messages:
+	cd multiseek && django-admin.py makemessages -d django -d djangojs -a

multiseek/locale/es/LC_MESSAGES/django.po

@@ -7,174 +7,174 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-05 15:00+0100\n"
+"POT-Creation-Date: 2018-02-26 16:00+0100\n"
 "PO-Revision-Date: 2016-12-05 13:08+0100\n"
 "Last-Translator: Antonio Gutierrez <agutierrez@dapda.com>\n"
 "Language-Team: Dapda <sistemas@dapda.com>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.9\n"
 
-#: .\logic.py:34
+#: logic.py:43
 msgid "equals"
 msgstr "es igual a"
 
-#: .\logic.py:35
+#: logic.py:44
 msgid "equals (female geder)"
 msgstr "es igual a"
 
-#: .\logic.py:36
+#: logic.py:45
 msgid "equals (no gender)"
 msgstr "es igual a"
 
-#: .\logic.py:37
+#: logic.py:46
 msgid "equals (both genders)"
 msgstr "es igual a"
 
-#: .\logic.py:39
+#: logic.py:48
 msgid "greater, than"
 msgstr "es mayor que"
 
-#: .\logic.py:40
+#: logic.py:49
 msgid "greater, than (female gender)"
 msgstr "es mayor que"
 
-#: .\logic.py:41
+#: logic.py:50
 msgid "greater, than (no gender)"
 msgstr "es mayor que"
 
-#: .\logic.py:44
+#: logic.py:53
 msgid "lesser, than"
 msgstr "es menor que"
 
-#: .\logic.py:45
+#: logic.py:54
 msgid "lesser, than (female gender)"
 msgstr "es menor que"
 
-#: .\logic.py:46
+#: logic.py:55
 msgid "lesser, than (no gender)"
 msgstr "es menor que"
 
-#: .\logic.py:49
+#: logic.py:58
 msgid "greater or equal to"
 msgstr "es mayor o igual que"
 
-#: .\logic.py:50
+#: logic.py:59
 msgid "greater or equal to(female gender)"
 msgstr "es mayor o igual que"
 
-#: .\logic.py:51
+#: logic.py:60
 msgid "greater or equal to (no gender)"
 msgstr "es mayor o igual que"
 
-#: .\logic.py:55
+#: logic.py:64
 msgid "lesser or equal to"
 msgstr "es menor o igual que"
 
-#: .\logic.py:56
+#: logic.py:65
 msgid "lesser or equal to (female gender)"
 msgstr "es menor o igual que"
 
-#: .\logic.py:57
+#: logic.py:66
 msgid "lesser or equal to (no gender)"
 msgstr "es menor o igual que"
 
-#: .\logic.py:61
+#: logic.py:70
 msgid "differs"
 msgstr "es distinto de"
 
-#: .\logic.py:62
+#: logic.py:71
 msgid "differs (female gender)"
 msgstr "es distinto de"
 
-#: .\logic.py:63
+#: logic.py:72
 msgid "differs (no gender)"
 msgstr "es distinto de"
 
-#: .\logic.py:64
+#: logic.py:73
 msgid "differs (both gender)"
 msgstr "es distinto de"
 
-#: .\logic.py:66
+#: logic.py:75
 msgid "contains"
 msgstr "contiene"
 
-#: .\logic.py:67
+#: logic.py:76
 msgid "not contains"
 msgstr "no contiene"
 
-#: .\logic.py:68
+#: logic.py:77
 msgid "starts with"
 msgstr "comienza con"
 
-#: .\logic.py:69
+#: logic.py:78
 msgid "not starts with"
 msgstr "no comienza con"
 
-#: .\logic.py:71
+#: logic.py:80
 msgid "in range"
 msgstr "comprendido entre"
 
-#: .\logic.py:72
+#: logic.py:81
 msgid "outside range"
 msgstr "no comprendido entre"
 
-#: .\logic.py:205
+#: logic.py:214
 msgid "(empty)"
 msgstr "(vacío)"
 
-#: .\logic.py:449
+#: logic.py:450
 msgid "yes"
 msgstr "si"
 
-#: .\logic.py:450
+#: logic.py:451
 msgid "no"
 msgstr "no"
 
-#: .\logic.py:505
+#: logic.py:506
 msgid "Sort by:"
 msgstr "Ordenar por:"
 
-#: .\logic.py:505
+#: logic.py:506
 msgid "then by"
 msgstr "después por"
 
-#: .\models.py:17
+#: models.py:19
 msgid "Name"
 msgstr "Nombre"
 
-#: .\models.py:20
+#: models.py:23
 msgid "Public"
 msgstr "Público"
 
-#: .\models.py:22
+#: models.py:25
 msgid "Make this search publicly available?"
 msgstr "¿Hacer la búsqueda pública?"
 
-#: .\models.py:23
+#: models.py:26
 msgid "Form data (JSON)"
 msgstr "Datos del formulario (JSON)"
 
-#: .\templates\multiseek\index.html:11
+#: templates/multiseek/index.html:11
 msgid "Multiseek"
 msgstr "Multiseek"
 
-#: .\templates\multiseek\multiseek_buttons.html:5
+#: templates/multiseek/multiseek_buttons.html:5
 msgid "Send query"
 msgstr "Realizar consulta"
 
-#: .\templates\multiseek\multiseek_buttons.html:9
+#: templates/multiseek/multiseek_buttons.html:9
 msgid "Reset form"
 msgstr "Resetear"
 
-#: .\templates\multiseek\multiseek_buttons.html:14
+#: templates/multiseek/multiseek_buttons.html:14
 msgid "Save form"
 msgstr "Guardar"
 
-#: .\templates\multiseek\multiseek_buttons.html:19
+#: templates/multiseek/multiseek_buttons.html:19
 #, python-format
 msgid ""
 "\n"
@@ -188,47 +188,47 @@ msgstr ""
 "e identifíquese para poder guardar su búsqueda.\n"
 "            "
 
-#: .\templates\multiseek\multiseek_buttons.html:27
+#: templates/multiseek/multiseek_buttons.html:28
 msgid "choose form..."
 msgstr "elegir formulario..."
 
-#: .\templates\multiseek\multiseek_ordering.html:34
+#: templates/multiseek/multiseek_ordering.html:20
 msgid "descending"
 msgstr "descendiente"
 
-#: .\templates\multiseek\multiseek_report_types.html:8
+#: templates/multiseek/multiseek_report_types.html:7
 msgid "Report type: "
 msgstr "Tipo de informe:"
 
-#: .\templates\multiseek\results.html:6
+#: templates/multiseek/results.html:6
 msgid "Query: "
 msgstr "Consulta:"
 
-#: .\templates\multiseek\results.html:12
+#: templates/multiseek/results.html:12
 msgid "No elements"
 msgstr "Sin elementos"
 
-#: .\views.py:24
+#: views.py:28
 msgid "Form name must not be empty"
 msgstr "El nombre del formulario no puede estar vacío"
 
-#: .\views.py:25
+#: views.py:29
 msgid "Error while loading form data"
 msgstr "Error mientra se cargaban los datos"
 
-#: .\views.py:26
+#: views.py:30
 msgid "Error while parsing form data"
 msgstr "Error mientras se procesaban los datos"
 
-#: .\views.py:27
+#: views.py:31
 msgid "No form data provided"
 msgstr "No se ha proporcionado un origen de datos"
 
-#: .\views.py:40
+#: views.py:44
 msgid "The ability to remove the last field has been disabled."
 msgstr "La habilidad de eliminar el último campo ha sido deshabilitada."
 
-#: .\views.py:220
+#: views.py:229
 msgid "andnot"
 msgstr "y no"