diff --git a/apps/map/forms.py b/apps/map/forms.py index 5e91626..bfcf629 100644 --- a/apps/map/forms.py +++ b/apps/map/forms.py @@ -115,14 +115,11 @@ class ShortCaseStudyForm(BaseCaseStudyForm): super(ShortCaseStudyForm, self).__init__(*args, **kwargs) self.helper.add_input(Submit('submit', _('Submit'), css_class='btn-success center-block')) - # Duplicate code from long form, below... - self.fields['sector_of_economy'] = forms.ChoiceField( - widget=forms.RadioSelect(), - choices=add_explanatory_text( - CaseStudy.SECTOR_CHOICES, - SECTOR_HELP - ), - required=False + self.fields['sector_of_economy'].widget = forms.RadioSelect() + self.fields['sector_of_economy'].required = False + self.fields['sector_of_economy'].choices = add_explanatory_text( + CaseStudy.SECTOR_CHOICES, + SECTOR_HELP ) class Meta(BaseCaseStudyForm.Meta): @@ -175,10 +172,12 @@ class LongCaseStudyForm(BaseCaseStudyForm): """Long version of the CaseStudy form.""" images = forms.FileField( + label=_("Images"), widget=BootstrapClearableFileInput(attrs={ 'url': reverse_lazy('files:upload'), 'field': 'images_files', - }), required=False + }), + required=False ) images_files = forms.ModelMultipleChoiceField( @@ -188,6 +187,7 @@ class LongCaseStudyForm(BaseCaseStudyForm): ) official_project_documents = forms.FileField( + label=_("Official project documents"), widget=BootstrapClearableFileInput(attrs={ 'url': reverse_lazy('files:upload'), 'field': 'official_project_documents_files', @@ -201,6 +201,7 @@ class LongCaseStudyForm(BaseCaseStudyForm): ) other_documents = forms.FileField( + label=_("Other documents"), widget=BootstrapClearableFileInput(attrs={ 'url': reverse_lazy('files:upload'), 'field': 'other_documents_files', @@ -229,6 +230,7 @@ class LongCaseStudyForm(BaseCaseStudyForm): ) coordinate_reference_system = forms.ModelChoiceField( + label=_("Coordinate reference system"), queryset=SpatialRefSys.objects.all(), widget=autocomplete.ModelSelect2(url='srs-autocomplete'), initial=4326, @@ -240,22 +242,18 @@ class LongCaseStudyForm(BaseCaseStudyForm): self.fields['positive_case_type'].label = "" self.fields['negative_case_reasons'].label = "" - self.fields['sector_of_economy'] = forms.ChoiceField( - widget=forms.RadioSelect(), - choices=add_explanatory_text( - CaseStudy.SECTOR_CHOICES, - SECTOR_HELP - ), - required=False + self.fields['sector_of_economy'].widget = forms.RadioSelect() + self.fields['sector_of_economy'].required = False + self.fields['sector_of_economy'].choices = add_explanatory_text( + CaseStudy.SECTOR_CHOICES, + SECTOR_HELP ) - self.fields['power_technology'] = forms.ChoiceField( - widget=forms.RadioSelect(), - choices=add_explanatory_text( - CaseStudy.POWER_TECHNOLOGY_CHOICES, - POWER_TECHNOLOGY_HELP - ), - required=False + self.fields['power_technology'].widget = forms.RadioSelect() + self.fields['power_technology'].required = False + self.fields['power_technology'].choices = add_explanatory_text( + CaseStudy.POWER_TECHNOLOGY_CHOICES, + POWER_TECHNOLOGY_HELP ) self.fields['project_owners'].required = True diff --git a/support/locale/en_GB/LC_MESSAGES/django.po b/support/locale/en_GB/LC_MESSAGES/django.po index bb41789..f620852 100644 --- a/support/locale/en_GB/LC_MESSAGES/django.po +++ b/support/locale/en_GB/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-21 12:30+0000\n" +"POT-Creation-Date: 2019-04-27 22:19+0000\n" "PO-Revision-Date: 2019-03-18 19:01+0000\n" "Last-Translator: Weblate Admin \n" "Language-Team: English (United Kingdom) \n" -"Language-Team: Spanish " -"\n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,34 +61,50 @@ msgstr "Líneas, transformadores, maquinaria, etc." msgid "District heating/cooling, etc." msgstr "Redes de calefacción/refrigeración urbana, etc." -#: apps/map/forms.py:64 apps/map/forms.py:116 apps/map/forms.py:497 +#: apps/map/forms.py:64 apps/map/forms.py:116 apps/map/forms.py:495 #: ojusomap/templates/registration/password_change_form.html:9 #: ojusomap/templates/registration/password_reset_confirm.html:12 #: ojusomap/templates/registration/password_reset_form.html:17 msgid "Submit" msgstr "Enviar" -#: apps/map/forms.py:160 +#: apps/map/forms.py:157 msgid "Previous" msgstr "Previo" -#: apps/map/forms.py:169 +#: apps/map/forms.py:166 msgid "Next" msgstr "Siguiente" -#: apps/map/forms.py:265 +#: apps/map/forms.py:175 apps/map/models.py:552 +msgid "Images" +msgstr "Imágenes" + +#: apps/map/forms.py:190 apps/map/models.py:1043 +msgid "Official project documents" +msgstr "Documentos oficiales del proyecto" + +#: apps/map/forms.py:204 apps/map/models.py:1052 +msgid "Other documents" +msgstr "Otros documentos" + +#: apps/map/forms.py:233 +msgid "Coordinate reference system" +msgstr "Sistema de coordenadas de referencia" + +#: apps/map/forms.py:263 msgid "Socio-environmental impacts (negative and potentially positive)" msgstr "Impactos socioambientales (negativos y potencialmente positivos)" -#: apps/map/forms.py:267 +#: apps/map/forms.py:265 msgid "Socio-environmental impacts (positive and potentially negative)" msgstr "Impactos socioambientales (positivos y potencialmente negativos)" -#: apps/map/forms.py:269 +#: apps/map/forms.py:267 msgid "Socio-environmental impacts (positive and negative)" msgstr "Impactos socioambientales (positivos y negativos)" -#: apps/map/forms.py:283 +#: apps/map/forms.py:281 msgid "" "Please expand on your response given in the full description on page one. " "For example, for positive impacts you need to go beyond emissions savings, " @@ -104,7 +120,7 @@ msgstr "" "con impactos en grupos vulnerables, violaciones a los derechos sobre la " "tierra o practicas laborales abusivas." -#: apps/map/forms.py:291 +#: apps/map/forms.py:289 msgid "" "Please expand on your response given in the description. Note that we aim to " "focus on violation of land rights / human rights / collective rights, " @@ -125,7 +141,7 @@ msgstr "" "impactos socioambientales que puedan ser presentados o considerados como " "positivos." -#: apps/map/forms.py:301 +#: apps/map/forms.py:299 msgid "" "Please expand on your response given in the description. Please also " "describe and analyze socio-environmental impacts that could be considered as " @@ -135,27 +151,27 @@ msgstr "" "describa y analice los impactos socioambientales que pueden ser considerados " "como negativos." -#: apps/map/forms.py:320 +#: apps/map/forms.py:318 msgid "Basic information" msgstr "Información básica" -#: apps/map/forms.py:347 +#: apps/map/forms.py:345 msgid "Owners and financiers" msgstr "Propiedad y finanzas" -#: apps/map/forms.py:355 +#: apps/map/forms.py:353 msgid "Media reports and other communications" msgstr "Informes de prensa y otras comunicaciones" -#: apps/map/forms.py:367 +#: apps/map/forms.py:365 msgid "Technical and economic analysis" msgstr "Análisis técnico y económico" -#: apps/map/forms.py:430 +#: apps/map/forms.py:428 msgid "Socio-environmental analysis" msgstr "Análisis socioambiental" -#: apps/map/forms.py:435 +#: apps/map/forms.py:433 msgid "" "In the following, we expect the analysis to reflect the perspective of the " "organization(s) or person(s) describing the case." @@ -163,15 +179,15 @@ msgstr "" "En la siguiente parte, esperamos que el análisis refleje la perspectiva de " "la organización (es) o de la persona (s) que está presentando el caso." -#: apps/map/forms.py:445 apps/map/models.py:891 +#: apps/map/forms.py:443 apps/map/models.py:891 msgid "What kind of case is this entry about?" msgstr "¿De qué tipo de caso se trata esta entrada?" -#: apps/map/forms.py:475 +#: apps/map/forms.py:473 msgid "Contact details" msgstr "Detalles de contacto" -#: apps/map/forms.py:490 +#: apps/map/forms.py:488 msgid "Uploads" msgstr "Documentos / archivos" @@ -931,8 +947,8 @@ msgstr "" "hay derechos consuetudinarios o tradicionales que no son legalmente " "reconocidos, conflictos en torno a contratos de arrendamiento o compra de " "tierras, etc.

Entendemos que esta es una pregunta " -"difícil, por favor trate de proporcionar solo la información que " -"conoce.

" +"difícil, por favor trate de proporcionar solo la información que conoce.

" #: apps/map/models.py:426 msgid "Location" @@ -1086,10 +1102,6 @@ msgstr "" "Por favor enliste otras instituciones financieras que no estén mencionadas " "arriba. Escriba cada nombre en una nueva línea." -#: apps/map/models.py:552 -msgid "Images" -msgstr "Imágenes" - #: apps/map/models.py:558 msgid "Video URL" msgstr "Video URL" @@ -1594,20 +1606,12 @@ msgstr "Página de facebook" msgid "Other contact details" msgstr "Otros datos de contacto" -#: apps/map/models.py:1043 -msgid "Official project documents" -msgstr "Documentos oficiales del proyecto" - #: apps/map/models.py:1044 msgid "" "Please attach any legal or official documents that relate to the project." msgstr "" "Por favor adjunte documentos legales u oficiales relacionados al proyecto." -#: apps/map/models.py:1052 -msgid "Other documents" -msgstr "Otros documentos" - #: apps/map/models.py:1053 msgid "Please attach any other documents that relate to the project." msgstr "" @@ -1849,8 +1853,8 @@ msgid "" "\">info@ojuso.org." msgstr "" "Si tiene interés en escribir una evaluación de tecnología o una análisis " -"política para este sitio, por favor envié un correo electrónico info@ojuso.org." +"política para este sitio, por favor envié un correo electrónico info@ojuso.org." #: apps/map/templates/map/form-success.html:32 msgid "Thanks!" diff --git a/support/locale/fr/LC_MESSAGES/django.po b/support/locale/fr/LC_MESSAGES/django.po index 45fbcbd..6261d2b 100644 --- a/support/locale/fr/LC_MESSAGES/django.po +++ b/support/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-21 12:30+0000\n" +"POT-Creation-Date: 2019-04-27 22:19+0000\n" "PO-Revision-Date: 2017-11-08 12:40+0000\n" "Last-Translator: Emilie Heidtmann \n" "Language-Team: French