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

Remove excessive spaces from long strings

Browse Source
This commit is contained in:
Anna Sidwell 2019-03-18 17:25:21 +00:00
parent ed399e8379
commit 0042034919
1 changed files with 64 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
apps/map/models.py
View File

@ -429,8 +429,7 @@ class CaseStudy(models.Model):
people_affected_other = models.TextField( people_affected_other = models.TextField(
verbose_name=_("Communities or identities – further detail"), verbose_name=_("Communities or identities – further detail"),
help_text=_("Please describe further the communities or identities present \ help_text=_("Please describe further the communities or identities present in the project area."),
in the project area."),
blank=True blank=True
) )
@ -444,9 +443,9 @@ class CaseStudy(models.Model):
# 1.7 # 1.7
start_year = models.IntegerField( start_year = models.IntegerField(
verbose_name=_("Construction start year"), verbose_name=_("Construction start year"),
help_text=_("Select the year project construction began. If the project is not yet \ help_text=_("Select the year project construction began. If the project is not yet"
in construction, select the assumed start year as detailed in company \ " in construction, select the assumed start year as detailed in company"
information or media."), " information or media."),
choices=YEAR_CHOICES, choices=YEAR_CHOICES,
blank=True, blank=True,
null=True null=True
@ -455,9 +454,9 @@ class CaseStudy(models.Model):
# 1.8 # 1.8
completion_year = models.IntegerField( completion_year = models.IntegerField(
verbose_name=_("Operation start year"), verbose_name=_("Operation start year"),
help_text=_("Select the year the project's operation and maintenance (O&M) phase began. \ help_text=_("Select the year the project's operation and maintenance (O&M) phase began."
If the project is not yet in operation, select the year operation is expected \ " If the project is not yet in operation, select the year operation is expected"
to begin as detailed in company information or media."), " to begin as detailed in company information or media."),
choices=YEAR_CHOICES, choices=YEAR_CHOICES,
default=None, default=None,
null=True, null=True,
@ -473,24 +472,24 @@ class CaseStudy(models.Model):
# 1.10 # 1.10
full_description = models.TextField( full_description = models.TextField(
verbose_name=_("Full description"), verbose_name=_("Full description"),
help_text=_("Describe the project in full. Separate paragraphs with two\ help_text=_("Describe the project in full. Separate paragraphs with two"
new lines. Please add as much detail as you feel is necessary\ " new lines. Please add as much detail as you feel is necessary"
here.") " here.")
) )
# 1.11 # 1.11
project_owners = models.TextField( project_owners = models.TextField(
verbose_name=_("Project and facility owners"), verbose_name=_("Project and facility owners"),
help_text=_("List companies or organisations that own the project and/or facilities. \ help_text=_("List companies or organisations that own the project and/or facilities."
Provide company numbers etc. if available. Separate with a new line."), " Provide company numbers etc. if available. Separate with a new line."),
blank=True blank=True
) )
consultants_contractors = models.TextField( consultants_contractors = models.TextField(
verbose_name=_("Consultants and contractors"), verbose_name=_("Consultants and contractors"),
help_text=_("List consultants, planners or organisations that are doing the planning, \ help_text=_("List consultants, planners or organisations that are doing the planning,"
construction, operation or maintenance work relating to the project \ " construction, operation or maintenance work relating to the project"
and/or facilities. Separate each with a new line."), " and/or facilities. Separate each with a new line."),
blank=True blank=True
) )
@ -504,8 +503,8 @@ class CaseStudy(models.Model):
# 1.13.1 # 1.13.1
financial_institutions = MultiSelectField( financial_institutions = MultiSelectField(
verbose_name=_("Financial institutions"), verbose_name=_("Financial institutions"),
help_text=_("Select any financial institutions (public or private) that have, \ help_text=_("Select any financial institutions (public or private) that have,"
or are considering, extending loans or guarantees to the project."), " or are considering, extending loans or guarantees to the project."),
choices=FINANCIAL_INSTITUTIONS, choices=FINANCIAL_INSTITUTIONS,
blank=True blank=True
) )
@ -513,8 +512,7 @@ class CaseStudy(models.Model):
# 1.13.2 # 1.13.2
financial_institutions_other = models.TextField( financial_institutions_other = models.TextField(
verbose_name=_("Financial institutions – other"), verbose_name=_("Financial institutions – other"),
help_text=_("List any other financial institutions not listed above. \ help_text=_("List any other financial institutions not listed above. Put each on a new line."),
Put each on a new line."),
blank=True blank=True
) )
@ -566,17 +564,16 @@ class CaseStudy(models.Model):
# 1.18.1 # 1.18.1
community_voices = models.TextField( community_voices = models.TextField(
verbose_name=_("Community Voices"), verbose_name=_("Community Voices"),
help_text=_("Add any direct quotes from members of the community that \ help_text=_("Add any direct quotes from members of the community that relate to this project"),
relate to this project"),
blank=True, blank=True,
) )
# 1.18.2 # 1.18.2
direct_comms = models.TextField( direct_comms = models.TextField(
verbose_name=_("Reports of direct communications"), verbose_name=_("Reports of direct communications"),
help_text=_("Add any reports of direct communication between community members and \ help_text=_("Add any reports of direct communication between community members and"
representatives of developers/companies/investors. If you have files \ " representatives of developers/companies/investors. If you have files"
to upload, you can do this in 'other documents' on the 'uploads' tab."), " to upload, you can do this in 'other documents' on the 'uploads' tab."),
blank=True, blank=True,
) )
@ -625,20 +622,18 @@ class CaseStudy(models.Model):
# Should be filled in if generation_technology was answered as bio-energy # Should be filled in if generation_technology was answered as bio-energy
biomass_detail = models.CharField( biomass_detail = models.CharField(
verbose_name=_("Bio-energy feedstock"), verbose_name=_("Bio-energy feedstock"),
help_text=_("<div class='text-muted'>\ help_text="<div class='text-muted'>" + _(
<p>Please describe the source of the fuel and how it is processed/used. \ "<p>Please describe the source of the fuel and how it is processed/used. Please consider:"
Please consider:\ "<ul>"
<ul>\ "<li>where the fuel came from e.g. corn, forestry, algae, commercial food waste,"
<li>where the fuel came from e.g. corn, forestry, algae, commercial food waste, \ " landfill gas, sewage, livestock farm, etc.</li>"
landfill gas, sewage, livestock farm, etc. \ "<li>how it is processed e.g. direct-fired, co-firing with other renewable input,"
<li>how it is processed e.g. direct-fired, co-firing with other renewable input, \ " gasification, bacterial decomposition (anaerobic digestion, AD), pyrolysis,"
gasification, bacterial decomposition (anaerobic digestion, AD), pyrolysis, \ " small/modular, artificial photosynthesis, fuel cell, etc.</li>"
small/modular, artificial photosynthesis, fuel cell, etc. \ "</ul>"
</ul>\ "<p>We do not expect users to know this information, but if you do "
\ " it may be useful to give a fuller picture."
<p>We do not expect users to know this information, but if you do \ ) + "</div>",
it may be useful to give a fuller picture.\
</div>"),
max_length=200, max_length=200,
blank=True blank=True
) )
@ -646,10 +641,10 @@ class CaseStudy(models.Model):
# 1.14 # 1.14
energy_customers = models.TextField( energy_customers = models.TextField(
verbose_name=_("Energy service consumers/off-takers"), verbose_name=_("Energy service consumers/off-takers"),
help_text=_("List any energy customers/off-takers that take energy from the \ help_text=_("List any energy customers/off-takers that take energy from the"
development. E.g. 'national grids' or private energy suppliers. \ " development. E.g. 'national grids' or private energy suppliers."
Also refer to if carbon markets, credits, blockchain etc. are \ " Also refer to if carbon markets, credits, blockchain etc. are"
involved in the process. Please separate with a new line."), " involved in the process. Please separate with a new line."),
blank=True blank=True
) )
@ -711,10 +706,10 @@ class CaseStudy(models.Model):
# 2.2.5 # 2.2.5
additional_technical_details = models.TextField( additional_technical_details = models.TextField(
verbose_name=_("Additional technical or economic details"), verbose_name=_("Additional technical or economic details"),
help_text=_("Add any additional details such as: length, from-to, voltage, \ help_text=_("Add any additional details such as: length, from-to, voltage,"
substations, power output, (dis)charge rates, how this technology or \ " substations, power output, (dis)charge rates, how this technology or"
project interacts with the energy system (e.g. provides reactive power \ " project interacts with the energy system (e.g. provides reactive power"
to ensure power supply in phase etc.)"), " to ensure power supply in phase etc.)"),
blank=True blank=True
) )
@ -765,8 +760,8 @@ class CaseStudy(models.Model):
projected_production_of_commodities = models.CharField( projected_production_of_commodities = models.CharField(
verbose_name=_("Estimated production of key commodities"), verbose_name=_("Estimated production of key commodities"),
help_text=_('Describe the projected production of commodities per annum and overall.<br>\ help_text=_('Describe the projected production of commodities per annum and overall.<br>'
For example, "40 million tonnes of iron ore per year", "200 million tonnes over 5 year life of mine"'), 'For example, "40 million tonnes of iron ore per year", "200 million tonnes over 5 year life of mine"'),
max_length=256, max_length=256,
blank=True blank=True
) )
@ -780,7 +775,7 @@ class CaseStudy(models.Model):
associated_infrastructure = models.CharField( associated_infrastructure = models.CharField(
verbose_name=_("Associated infrastructure in the locality"), verbose_name=_("Associated infrastructure in the locality"),
help_text=_("List any associated infrastructure in the locality (e.g. tailings dams/mine waste storage and treatment facilities; ore processing facilities; smelting facilities; hydroelectric dams/energy infrastructure; transport infrastructure e.g. roads or rail)."), help_text=_("List any associated infrastructure in the locality (e.g. tailings dams/mine waste storage and treatment facilities; ore processing facilities; smelting facilities; hydroelectric dams/energy infrastructure; transport infrastructure e.g. roads or rail)."),
max_length=256, max_length=256,
blank=True blank=True
) )
@ -856,21 +851,21 @@ class CaseStudy(models.Model):
negative_socioenvironmental_impacts = models.TextField( negative_socioenvironmental_impacts = models.TextField(
verbose_name=_("Describe the socio-environmental impacts (positive and negative):"), verbose_name=_("Describe the socio-environmental impacts (positive and negative):"),
help_text=_("Provide a detailed description of the socio-environmental impacts \ help_text=_("Provide a detailed description of the socio-environmental impacts"
(please provide all relevant details, such as type of ecosystem and \ " (please provide all relevant details, such as type of ecosystem and"
presence of any existing reserve in the area, land to have increased \ " presence of any existing reserve in the area, land to have increased"
biodiversity as a result of the project, new protection of lands/waters, \ " biodiversity as a result of the project, new protection of lands/waters,"
specific communities affected by the project, total geographic footprint \ " specific communities affected by the project, total geographic footprint"
of the project, and tenure system affected in the case of land grabs, \ " of the project, and tenure system affected in the case of land grabs,"
kind of permits that were irregularly issued if this is the case."), " kind of permits that were irregularly issued if this is the case."),
blank=True blank=True
) )
isolated_or_widespread = models.TextField( isolated_or_widespread = models.TextField(
verbose_name=_("Is the project part of developments which are causing a cumulative effect?"), verbose_name=_("Is the project part of developments which are causing a cumulative effect?"),
help_text=_("Is this an isolated project or are there similar projects in the same \ help_text=_("Is this an isolated project or are there similar projects in the same"
geographic area? If so, can you describe them? Is there an analysis of \ " geographic area? If so, can you describe them? Is there an analysis of"
cumulative or synergetic effects?"), " cumulative or synergetic effects?"),
blank=True blank=True
) )
@ -894,9 +889,9 @@ class CaseStudy(models.Model):
identified_partnerships = models.CharField( identified_partnerships = models.CharField(
verbose_name=_('Identified partnerships'), verbose_name=_('Identified partnerships'),
help_text=_('Are you, or the organizing process that you represent, looking for partnerships, \ help_text=_('Are you, or the organizing process that you represent, looking for partnerships,'
or have any clearly identified need? If so, please describe and we will try \ ' or have any clearly identified need? If so, please describe and we will try'
to connect you to appropriate partners.'), ' to connect you to appropriate partners.'),
max_length=256, max_length=256,
blank=True blank=True
) )
@ -912,8 +907,7 @@ class CaseStudy(models.Model):
# 3.2.4.1 # 3.2.4.1
when_did_organising_start = models.CharField( when_did_organising_start = models.CharField(
verbose_name=_("When did local organising efforts begin?"), verbose_name=_("When did local organising efforts begin?"),
help_text=_("Before the project started? During project implementation? \ help_text=_("Before the project started? During project implementation? After project implementation? Describe in your own words."),
After project implementation? Describe in your own words."),
max_length=512, max_length=512,
blank=True blank=True
) )
@ -934,8 +928,7 @@ class CaseStudy(models.Model):
# 3.2.7 # 3.2.7
wants_conversation_with_ojuso = models.BooleanField( wants_conversation_with_ojuso = models.BooleanField(
verbose_name=_("Would you like to have a conversation with the <b>ojuso</b> team?"), verbose_name=_("Would you like to have a conversation with the <b>ojuso</b> team?"),
help_text=_("This would be a conversation about challenging or engaging related developers, companies and \ help_text=_("This would be a conversation about challenging or engaging related developers, companies and investors."),
investors."),
default=True default=True
) )
@ -986,8 +979,8 @@ class CaseStudy(models.Model):
'files.File', 'files.File',
related_name='official_project_document_for', related_name='official_project_document_for',
verbose_name=_("Official project documents"), verbose_name=_("Official project documents"),
help_text=_("Attach any legal or official documents that relate to the project. \ help_text=_("Attach any legal or official documents that relate to the project."
Hold down Control, or Command on a Mac, to select more than one."), " Hold down Control, or Command on a Mac, to select more than one."),
blank=True, blank=True,
) )
@ -996,8 +989,8 @@ class CaseStudy(models.Model):
'files.File', 'files.File',
related_name='other_document_for', related_name='other_document_for',
verbose_name=_("Other documents"), verbose_name=_("Other documents"),
help_text=_("Attach any other documents that relate to the project. \ help_text=_("Attach any other documents that relate to the project."
Hold down Control, or Command on a Mac, to select more than one."), " Hold down Control, or Command on a Mac, to select more than one."),
blank=True, blank=True,
) )