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

Some suggested translation updates

Browse Source
This commit is contained in:
Anna Sidwell
2019-03-18 16:41:58 +00:00
parent 67d447a02c
commit ed399e8379
5 changed files with 59 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/contact/views.py
View File

@ -8,5 +8,5 @@ from .forms import ContactForm
class ContactView(FormMessagesMixin, ContactView):
form_invalid_message = _(u"There was an error in the contact form.")
form_valid_message = _(u"Thank you for your message.")
form_valid_message = _(u"Thanks for your message.")
form_class = ContactForm

34
apps/map/forms.py
View File

@ -16,10 +16,10 @@ from .widgets import JSONFileListWidget
SECTOR_HELP = {
'RN': _("including electricity, heat or combined heat and power generation"),
'RN': _("Including electricity, heat or combined heat and power generation"),
'PG': '',
'ST': _('Biological, chemical, electrical, electromagnetic, electrochemical, mechanical including gravitational potential, thermal etc.'),
'SM': _("including supply of minerals"),
'SM': _("Including supply of minerals"),
'MA': '',
}
@ -251,24 +251,24 @@ class LongCaseStudyForm(BaseCaseStudyForm):
self.fields['socioeconomic_benefits'].help_text = \
'<span class="organising organising-none organising-idk">' + \
_('Please expand on your response given in the full description on page one. \
We would expect benefits to go beyond emissions savings, paying rent for land, \
or complying with environmental or social legislation. Please include other \
reasons, noting that we aim to focus on projects with substantive impacts on \
vulnerable groups.') + \
_('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,'
' paying rent for land, or complying with environmental or social legislation.'
' For negative impacts you need to focus on substantive impacts on vulnerable groups, '
' violations of land rights or abusive labour practices.') + \
'</span>' + \
'<span class="organising organising-vs">' + \
_('Please expand on your response given in the description. Note that we aim to \
focus on violation of land rights / human rights / collective rights, substantive \
negative impacts on vulnerable groups, aggression / threats / violence, \
severe environmental and/or cultural impacts, abusive labor practices, and \
corruption / governance issues, but feel free to cover any additional aspect \
that you consider relevant. Please also describe and analyze socio-environmental \
impacts that could be presented or considered as positive.') + \
_('Please expand on your response given in the description. Note that we aim to' \
' focus on violation of land rights / human rights / collective rights, substantive' \
' negative impacts on vulnerable groups, aggression / threats / violence,' \
' severe environmental and/or cultural impacts, abusive labor practices, and' \
' corruption / governance issues, but feel free to cover any additional aspect' \
' that you consider relevant. Please also describe and analyze socio-environmental' \
' impacts that could be presented or considered as positive.') + \
'</span>' + \
'<span class="organising organising-pro">' + \
_('Please expand on your response given in the description. Please also describe \
and analyze socio-environmental impacts that could be considered as negative.') + \
_('Please expand on your response given in the description. Please also describe' \
' and analyze socio-environmental impacts that could be considered as negative.') + \
'</span>'
self.helper.form_action = reverse('long-form')
@ -301,7 +301,7 @@ class LongCaseStudyForm(BaseCaseStudyForm):
'video_caption',
'video_credit',
Fieldset(
_("Ownership and finance"),
_("Owners and financiers"),
'project_owners',
'consultants_contractors',
'shareholders',

89
apps/map/models.py
View File

@ -75,18 +75,18 @@ class CaseStudy(models.Model):
)
TYPE_OF_ECOSYSTEM_CHOICES = (
('MARINE', _('Marine (e.g. Ocean, Sea)')),
('FRESH', _('Freshwater (e.g. Freshwater, Lake)')),
('FOREST', _('Forest/Jungle')),
('AGRI', _('Agricultural Land')),
('MARINE', _('Marine (e.g. ocean, sea)')),
('FRESH', _('Freshwater (e.g. freshwater, lake)')),
('FOREST', _('Forest/jungle')),
('AGRI', _('Agricultural land')),
('GRASS', _('Grassland')),
('DESERT', _('Desert (Tundra, Ice or Sand)')),
('WETLND', _('Wetland (Marsh, Mangrove, Peat Soil)')),
('DESERT', _('Desert (tundra, ice or sand)')),
('WETLND', _('Wetland (marsh, mangrove, peat Soil)')),
('URBAN', _('Urban'))
)
AFFECTED_COMMUNITIES_CHOICES = (
('INDIG', _('Indigenous')),
('INDIG', _('Indigenous people(s)')),
('AFRO', _('Afro-descendants')),
('MIG', _('Migrants')),
('REF', _('Refugees')),
@ -123,7 +123,7 @@ class CaseStudy(models.Model):
('IFAD', _('International Fund for Agricultural Development (IFAD)')),
('IIB', _('International Investment Bank (IIB)')),
('IsDB', _('Islamic Development Bank (IsDB)')),
('FMO', _('Nederlandse Financieringsmaatschappij voor Ontwikkelingslanden NV (FMO)')),
('FMO', _('Nederlandse Financieringsmaatschappij voor Ontwikkelingslanden NV (Netherlands Development Finance Company, FMO)')),
('NDB', _('New Development Bank (NDB) (formerly BRICS Development Bank)')),
('NDF', _('The Nordic Development Fund')),
('NIB', _('Nordic Investment Bank (NIB)')),
@ -201,9 +201,9 @@ class CaseStudy(models.Model):
('GAL', _('Gallium')),
('GER', _('Germanium')),
('GLD', _('Gold')),
('HRE', _('Heavy Rare Earth Elements (Gadolinium, Terbium, Dysprosium, Holmium, Erbium, Thulium, Ytterbium, Lutetium, Yttrium, Scandium)')),
('HRE', _('Heavy rare earth elements (gadolinium, terbium, dysprosium, holmium, erbium, thulium, ytterbium, lutetium, yttrium, scandium)')),
('IRN', _('Iron')),
('LRE', _('Light Rare Earth Elements (Lanthanum, Cerium, Praseodymium, Neodymium, Promethium, Samarium, Europium)')),
('LRE', _('Light rare earth elements (lanthanum, cerium, praseodymium, neodymium, promethium, samarium, europium)')),
('LED', _('Lead')),
('LIT', _('Lithium')),
('MAN', _('Manganese')),
@ -250,7 +250,7 @@ class CaseStudy(models.Model):
MANUFACTURING_RELATED_CHOICES = (
('PV', _('Solar PV')),
('CSP', _('CSP')),
('CSP', _('Concentrated solar power (CSP)')),
('WIND', _('Wind power')),
('HYDRO', _('Hydropower')),
('GEO', _('Geothermal')),
@ -274,20 +274,21 @@ class CaseStudy(models.Model):
('CREP', _('Community project (co-)owned by individuals')),
('EACP', _('Community project owned by not-for-profit organizations and/or serving the public interest')),
('PSEP', _('Public/state (federal, state, municipal) project')),
('CORS', _('Reuse / Recycling / Circular economy project')),
('CORS', _('Reuse / recycling / circular economy project')),
)
NEGATIVE_CASE_REASONS_CHOICES = (
('VOLR', _('Violation of land rights')),
('VOHR', _('Violation of fundamental human rights, indigenous rights and/or other collective rights')),
('EIMP', _('Environmental impacts (severe impacts on ecosystems / violation of laws, plans or programs of \
environmental conservation or territorial governance systems etc.')),
('NCUL', _('Negative cultural impacts (erosion/destruction of bio-cultural heritage, impacts on sacred land \
etc.)')),
('AGGR', _('Aggression/threats to community members opposed to the project, collaboration with organized crime \
etc.')),
('EIMP', _('Environmental impacts (severe impacts on ecosystems / violation of laws,'
' plans or programs of environmental conservation or territorial governance systems,'
' etc.')),
('NCUL', _('Negative cultural impacts (erosion/destruction of bio-cultural heritage,'
' impacts on sacred land, etc.)')),
('AGGR', _('Aggression/threats to community members opposed to the project, collaboration'
' with organized crime, etc.')),
('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.
@ -332,18 +333,12 @@ class CaseStudy(models.Model):
'files.File',
related_name='shapefile_for',
verbose_name=_("Geographic data"),
help_text=_("If you have territory that you would like to show in relation to this project \
- e.g. Bienes Comunales de Ixtepec etc. This is a set of 3 or more (often 5-6) \
files with file extensions like .cpg, .dbf, .prj, .qpj, .shp, .shx. \
\
Hold down Control, or Command on a Mac, to select more than one. \
Let us know (database@ojuso.org) if you have other file types or need help and we \
can work out how to import it. You may have data as GeoPackage (gpkg), GeoJSON, \
KML, GML, etc. or have data in PostGIS or another spatial database management \
system already."),
help_text=_("If you have territory that you would like to show in relation to this project i.e. area(s) of land or water affected by the project, or maybe the limits of the land within which a project is taking place or the sites of particular objects of importance. ESRI Shapefiles are a popular file type: they comprise a set of 3 or more (often 5-6) files with file extensions like .cpg, .dbf, .prj, .qpj, .shp, .shx. Hold down Control, or Command on a Mac, to select more than one. You may have data as GeoPackage (gpkg), GeoJSON, KML, GML, etc. or have data in PostGIS or another spatial database management system already. Let us know (database@ojuso.org) if you have other file types or need help and we can work out how to import it."),
blank=True
)
coordinate_reference_system = models.ForeignKey(
SpatialRefSys,
null=True,
@ -384,21 +379,21 @@ class CaseStudy(models.Model):
# 1.5.2
land_ownership = models.CharField(
verbose_name=_("Land ownership / tenure"),
help_text=_("What type of ownership does the land fall under?"),
verbose_name=_("Land ownership/tenure"),
help_text=_("What type of ownership/tenure does the land fall under?"),
max_length=3,
choices=LAND_OWNERSHIP_CHOICES
)
# 1.5.3
land_ownership_details = models.TextField(
verbose_name=_("Land ownership details"),
help_text=_("<p class='text-muted'>Please specify details about land ownership, including \
conflicting claims, unrecognized customary rights, conflicts \
around land lease or purchase contracts, etc.\
\
<p class='text-muted'>We understand this is a difficult question, so \
please try to provide <b>just the information you know</b>.</p>"),
verbose_name=_("Land ownership/tenure details"),
help_text=_("<p class='text-muted'>Please specify details about land ownership, including"
" conflicting claims, unrecognized customary rights, conflicts"
" around land lease or purchase contracts, etc."
""
"<p class='text-muted'>We understand this is a difficult question, so"
" please try to provide <b>just the information you know</b>.</p>"),
max_length=256,
blank=True,
)
@ -472,14 +467,12 @@ class CaseStudy(models.Model):
# 1.9
synopsis = models.TextField(
verbose_name=_("Project synopsis"),
help_text=_("Briefly summarise the project. This will be displayed at\
the top of the case study page. Maximum 500 chars (about \
3½ tweets)")
help_text=_("Briefly summarise the project. This will be displayed at the top of the case study page. (Maximum 500 chars)")
)
# 1.10
full_description = models.TextField(
verbose_name=_("Full Description"),
verbose_name=_("Full description"),
help_text=_("Describe the project in full. Separate paragraphs with two\
new lines. Please add as much detail as you feel is necessary\
here.")
@ -787,9 +780,7 @@ class CaseStudy(models.Model):
associated_infrastructure = models.CharField(
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,
blank=True
)
@ -805,8 +796,7 @@ class CaseStudy(models.Model):
manufacturing_description = models.TextField(
verbose_name=_("Description"),
help_text=_("Briefly describe manufacturing process and components/outputs.\
(less than 500 characters, about 2 tweets)."),
help_text=_("Briefly describe manufacturing process and components/outputs. (less than 500 characters)."),
max_length=500,
blank=True
)
@ -914,8 +904,7 @@ class CaseStudy(models.Model):
# 3.2.1.9
negative_case_reasons_other = models.CharField(
verbose_name=_("Other reason for negative case"),
help_text=_("Please include other reasons, noting that we aim to focus on projects with substantive negative \
impacts on vulnerable groups."),
help_text=_("For negative impacts you need to focus on substantive impacts on vulnerable groups."),
max_length=512,
blank=True
)
@ -938,13 +927,13 @@ class CaseStudy(models.Model):
# 3.2.4.3
participation_mechanisms = models.TextField(
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
)
# 3.2.7
wants_conversation_with_ojuso = models.BooleanField(
verbose_name=_("Would you like to have a conversation with the ojuso 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 \
investors."),
default=True

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

@ -117,7 +117,7 @@ dd ul { padding-left: 0; margin-left: 0; }
{% endif %}
{% if case_study.land_ownership %}
<dt>{% trans "Land ownership and tenure" %}:
<dt>{% trans "Land ownership/tenure details" %}:
<dd>
{% if case_study.land_ownership != 'OTH' %}
{{ case_study.get_land_ownership_display }}