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

Merge branch 'patch-1' into 'master'

Browse Source 
Update models.py - added full stops at end of 'etc'. [NOT SURE THIS IS THE RIGHT THING TO DO!]

See merge request autonomic-cooperative/ojuso-map!5
This commit is contained in:
Anna Sidwell 2019-03-18 16:24:48 +00:00
commit aafdd8db71
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/map/models.py
View File

@ -173,7 +173,7 @@ class CaseStudy(models.Model):
('SSWE', _('Small-scale wind (<500kW)')), ('SSWE', _('Small-scale wind (<500kW)')),
('LSWE', _('Large-scale wind (>500kW)')) ('LSWE', _('Large-scale wind (>500kW)'))
)), )),
('OTHR', _('Other (tidal, wave etc)')) ('OTHR', _('Other (tidal, wave, etc.)'))
) )
POWER_TECHNOLOGY_CHOICES = ( POWER_TECHNOLOGY_CHOICES = (
@ -283,11 +283,11 @@ class CaseStudy(models.Model):
('EIMP', _('Environmental impacts (severe impacts on ecosystems / violation of laws, plans or programs of \ ('EIMP', _('Environmental impacts (severe impacts on ecosystems / violation of laws, plans or programs of \
environmental conservation or territorial governance systems etc.')), environmental conservation or territorial governance systems etc.')),
('NCUL', _('Negative cultural impacts (erosion/destruction of bio-cultural heritage, impacts on sacred land \ ('NCUL', _('Negative cultural impacts (erosion/destruction of bio-cultural heritage, impacts on sacred land \
etc)')), etc.)')),
('AGGR', _('Aggression/threats to community members opposed to the project, collaboration with organized crime \ ('AGGR', _('Aggression/threats to community members opposed to the project, collaboration with organized crime \
etc')), etc.')),
('ALAB', _('Abusive labour practices')), ('ALAB', _('Abusive labour practices')),
('CRUP', _('Corruption and/or irregular permitting or contracting, conflicts of interest etc')), ('CRUP', _('Corruption and/or irregular permitting or contracting, conflicts of interest etc.')),
) )
# Dynamically generate a list of choices 40 years prior and after the current year. # Dynamically generate a list of choices 40 years prior and after the current year.
@ -711,7 +711,7 @@ class CaseStudy(models.Model):
# TODO: Auto-completion based on previous entries so we can query case-studies with the same answer. # TODO: Auto-completion based on previous entries so we can query case-studies with the same answer.
contractor_or_supplier_of_technology = models.TextField( contractor_or_supplier_of_technology = models.TextField(
verbose_name=_('Contractor and/or supplier of technology'), verbose_name=_('Contractor and/or supplier of technology'),
help_text=_('List companies that act as contractors or suppliers – e.g. Siemens Gamesa, GE, Alstom, Vestas, Hanwha Q CELLS, Mitsubishi, First Solar, Jinko Solar, Trina Solar, Suzlon Energy, Statkraft, Shanghai Electric, Ballard Power Systems, Panasonic, etc'), help_text=_('List companies that act as contractors or suppliers – e.g. Siemens Gamesa, GE, Alstom, Vestas, Hanwha Q CELLS, Mitsubishi, First Solar, Jinko Solar, Trina Solar, Suzlon Energy, Statkraft, Shanghai Electric, Ballard Power Systems, Panasonic, etc.'),
blank=True, blank=True,
) )
@ -938,7 +938,7 @@ class CaseStudy(models.Model):
# 3.2.4.3 # 3.2.4.3
participation_mechanisms = models.TextField( participation_mechanisms = models.TextField(
verbose_name=_("What mechanisms of participation have been used?"), verbose_name=_("What mechanisms of participation have been used?"),
help_text=_("e.g. direct action, local referendums, legal cases, letters or petitions etc"), help_text=_("e.g. direct action, local referendums, legal cases, letters or petitions etc."),
blank=True blank=True
) )