autonomic-cooperative/ojuso-map
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Text changes as per Tom's email

Browse Source
This commit is contained in:
Anna Sidwell
2019-04-21 13:28:03 +01:00
parent 237ed5f164
commit 399d815604
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/map/forms.py
View File

@ -291,7 +291,7 @@ class LongCaseStudyForm(BaseCaseStudyForm):
'Please expand on your response given in the description. Note that we aim' 'Please expand on your response given in the description. Note that we aim'
' to focus on violation of land rights / human rights / collective rights,' ' to focus on violation of land rights / human rights / collective rights,'
' substantive negative impacts on vulnerable groups, aggression / threats /' ' substantive negative impacts on vulnerable groups, aggression / threats /'
' violence severe environmental and/or cultural impacts, abusive labor ' ' violence, severe environmental and/or cultural impacts, abusive labor'
' practices, and corruption / governance issues, but feel free to cover any' ' practices, and corruption / governance issues, but feel free to cover any'
' additional aspect that you consider relevant. Please also describe and' ' additional aspect that you consider relevant. Please also describe and'
' analyze socio-environmental impacts that could be presented or considered' ' analyze socio-environmental impacts that could be presented or considered'
@ -432,8 +432,8 @@ class LongCaseStudyForm(BaseCaseStudyForm):
format_lazy( format_lazy(
"<p>{text}</p>", "<p>{text}</p>",
text=_( text=_(
"In the following, we expect the analysis to reflect " "In the following, we expect the analysis to reflect"
" the perspective of the organization(s) or person(s) " " the perspective of the organization(s) or person(s)"
" describing the case.") " describing the case.")
) )
), ),

8
apps/map/models.py
View File

@ -258,7 +258,7 @@ class CaseStudy(models.Model):
('WIND', _('Wind power')), ('WIND', _('Wind power')),
('HYDRO', _('Hydropower')), ('HYDRO', _('Hydropower')),
('GEO', _('Geothermal')), ('GEO', _('Geothermal')),
('TRANSMIT', _('Electrical power transmission infrastructure')), ('TRANSMIT', _('Electrical power transmission/distribution infrastructure')),
('STORE', _('Energy storage')), ('STORE', _('Energy storage')),
('HEAT', _('Heat networks')), ('HEAT', _('Heat networks')),
('OTHER', _('Other')), ('OTHER', _('Other')),
@ -289,8 +289,8 @@ class CaseStudy(models.Model):
'Violation of fundamental human rights, indigenous rights and/or other' 'Violation of fundamental human rights, indigenous rights and/or other'
' collective rights')), ' collective rights')),
('EIMP', _( ('EIMP', _(
'Environmental impacts (severe impacts on ecosystems / violation of laws' 'Environmental impacts (severe impacts on ecosystems / violation of laws,'
' plans or programs of environmental conservation, etc.')), ' plans or programs of environmental conservation, etc.)')),
('NCUL', _( ('NCUL', _(
'Negative cultural impacts (erosion/destruction of bio-cultural heritage,' 'Negative cultural impacts (erosion/destruction of bio-cultural heritage,'
' impacts on sacred land, etc.)')), ' impacts on sacred land, etc.)')),
@ -872,7 +872,7 @@ class CaseStudy(models.Model):
) )
manufacturing_ownership = models.TextField( manufacturing_ownership = models.TextField(
verbose_name=_("Describe the ownership structure of the project and its relation with the local community"), verbose_name=_("Describe the ownership structure of the project and its relation with the local community."),
blank=True blank=True
) )

2
apps/map/templates/map/detail.html
View File

@ -250,7 +250,7 @@ dd ul { padding-left: 0; margin-left: 0; }
<dl> <dl>
{% if case_study.generation_type %} {% if case_study.generation_type %}
<dt>{% trans "What is being generated?" %}: <dt>{% trans "What kind of energy is generated?" %}:
<dd id="generation_type"> <dd id="generation_type">
{{ case_study.get_generation_type_detail }} {{ case_study.get_generation_type_detail }}
{% endif %} {% endif %}

2
ojusomap/templates/500.html
View File

@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
{% block title %} {% block title %}
{% trans 'Oops' %} {% trans 'Oops!' %}
{% endblock %} {% endblock %}
{% block description %} {% block description %}