From 399d815604c1f7201d62268a73c2b762312292f5 Mon Sep 17 00:00:00 2001
From: Anna Sidwell <anna@takkaria.org>
Date: Sun, 21 Apr 2019 13:28:03 +0100
Subject: [PATCH] Text changes as per Tom's email

---
 apps/map/forms.py                  | 6 +++---
 apps/map/models.py                 | 8 ++++----
 apps/map/templates/map/detail.html | 2 +-
 ojusomap/templates/500.html        | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/map/forms.py b/apps/map/forms.py
index e4b9a82..5e91626 100644
--- a/apps/map/forms.py
+++ b/apps/map/forms.py
@@ -291,7 +291,7 @@ class LongCaseStudyForm(BaseCaseStudyForm):
             '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 '
+            ' 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'
@@ -432,8 +432,8 @@ class LongCaseStudyForm(BaseCaseStudyForm):
                         format_lazy(
                             "<p>{text}</p>",
                             text=_(
-                                "In the following, we expect the analysis to reflect "
-                                " the perspective of the organization(s) or person(s) "
+                                "In the following, we expect the analysis to reflect"
+                                " the perspective of the organization(s) or person(s)"
                                 " describing the case.")
                             )
                     ),
diff --git a/apps/map/models.py b/apps/map/models.py
index 46fb80a..3234999 100644
--- a/apps/map/models.py
+++ b/apps/map/models.py
@@ -258,7 +258,7 @@ class CaseStudy(models.Model):
         ('WIND', _('Wind power')),
         ('HYDRO', _('Hydropower')),
         ('GEO', _('Geothermal')),
-        ('TRANSMIT', _('Electrical power transmission infrastructure')),
+        ('TRANSMIT', _('Electrical power transmission/distribution infrastructure')),
         ('STORE', _('Energy storage')),
         ('HEAT', _('Heat networks')),
         ('OTHER', _('Other')),
@@ -289,8 +289,8 @@ class CaseStudy(models.Model):
             '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, etc.')),
+            'Environmental impacts (severe impacts on ecosystems / violation of laws,'
+            ' plans or programs of environmental conservation, etc.)')),
         ('NCUL', _(
             'Negative cultural impacts (erosion/destruction of bio-cultural heritage,'
             ' impacts on sacred land, etc.)')),
@@ -872,7 +872,7 @@ class CaseStudy(models.Model):
     )
 
     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
     )
 
diff --git a/apps/map/templates/map/detail.html b/apps/map/templates/map/detail.html
index ff7fc8a..b3b2193 100644
--- a/apps/map/templates/map/detail.html
+++ b/apps/map/templates/map/detail.html
@@ -250,7 +250,7 @@ dd ul { padding-left: 0; margin-left: 0; }
 
 				<dl>
 				{% if case_study.generation_type %}
-					<dt>{% trans "What is being generated?" %}:
+					<dt>{% trans "What kind of energy is generated?" %}:
 					<dd id="generation_type">
 						{{ case_study.get_generation_type_detail }}
 				{% endif %}
diff --git a/ojusomap/templates/500.html b/ojusomap/templates/500.html
index 6a05839..f32f0b4 100644
--- a/ojusomap/templates/500.html
+++ b/ojusomap/templates/500.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block title %}
-    {% trans 'Oops' %}
+    {% trans 'Oops!' %}
 {% endblock %}
 
 {% block description %}