diff --git a/apps/map/templates/map/base.html b/apps/map/templates/map/base.html deleted file mode 100644 index f789084..0000000 --- a/apps/map/templates/map/base.html +++ /dev/null @@ -1,67 +0,0 @@ -{% spaceless %} -{% load bootstrap3 %} -{% load compress %} -{% load i18n %} -{% load leaflet_tags %} - - - - - - {# Metadata #} - - - - {% trans "Ojuso Platform Map" %} - - - - {# CDN Stylesheets #} - - - - - {# Additional Stylesheets #} - {% compress css %} - {% block stylesheets %} - - {% endblock %} - {% endcompress %} - - - - - {# Main Markup #} - {% block body %}{% endblock %} - - {# CDN Javascript #} - - - - {# Additional Scripts #} - {% block scripts %}{% endblock %} - - - -{% endspaceless %} diff --git a/apps/map/templates/map/base_with_container.html b/apps/map/templates/map/base_with_container.html deleted file mode 100644 index 979aebc..0000000 --- a/apps/map/templates/map/base_with_container.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "base.html" %} - -{% block stylesheets %} - {{ block.super }} - -{% endblock %} - -{% block body %} - -
- -
-

{% block title %}{% endblock %}

-

{% block description %}{% endblock %}

-
- - {% block content %} - {% endblock %} - -
-{% endblock %} diff --git a/apps/map/templates/map/base_with_jumbo.html b/apps/map/templates/map/base_with_jumbo.html deleted file mode 100644 index cfb4f64..0000000 --- a/apps/map/templates/map/base_with_jumbo.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "base.html" %} - -{% block stylesheets %} - {{ block.super }} - -{% endblock %} - -{% block body %} - -
- - {% block content %} - {% endblock %} - -
-{% endblock %} diff --git a/support/locale/en_GB/LC_MESSAGES/django.po b/support/locale/en_GB/LC_MESSAGES/django.po index 400bb25..d119cf1 100644 --- a/support/locale/en_GB/LC_MESSAGES/django.po +++ b/support/locale/en_GB/LC_MESSAGES/django.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-08 19:45+0000\n" +"POT-Creation-Date: 2017-10-11 21:16+0000\n" "PO-Revision-Date: 2017-10-08 20:18+0000\n" "Last-Translator: Livvy Mackintosh \n" -"Language-Team: English (United Kingdom) " -"\n" +"Language-Team: English (United Kingdom) \n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,170 +27,168 @@ msgstr "There was an error in the contact form." msgid "Thank you for your message." msgstr "Thank you for your message." -#: apps/map/models.py:14 +#: apps/map/models.py:17 msgid "Renewable Energy Generation" msgstr "Renewable Energy Generation" -#: apps/map/models.py:15 +#: apps/map/models.py:18 msgid "Wind" msgstr "Wind" -#: apps/map/models.py:16 +#: apps/map/models.py:19 msgid "Solar" msgstr "Solar" -#: apps/map/models.py:17 +#: apps/map/models.py:20 msgid "Hydro" msgstr "Hydro" -#: apps/map/models.py:19 +#: apps/map/models.py:22 msgid "Power Grids" msgstr "Power Grids" -#: apps/map/models.py:20 +#: apps/map/models.py:23 msgid "Supply of Minerals" msgstr "Supply of Minerals" -#: apps/map/models.py:24 +#: apps/map/models.py:27 msgid "Positive" msgstr "Positive" -#: apps/map/models.py:25 +#: apps/map/models.py:28 msgid "Negative" msgstr "Negative" -#: apps/map/models.py:29 +#: apps/map/models.py:32 msgid "Private Land" msgstr "Private Land" -#: apps/map/models.py:30 +#: apps/map/models.py:33 msgid "Public Land" msgstr "Public Land" -#: apps/map/models.py:31 +#: apps/map/models.py:34 msgid "Community Land" msgstr "Community Land" -#: apps/map/models.py:32 +#: apps/map/models.py:35 msgid "Other" msgstr "Other" -#: apps/map/models.py:36 +#: apps/map/models.py:39 msgid "Rural" msgstr "Rural" -#: apps/map/models.py:37 apps/map/models.py:51 +#: apps/map/models.py:40 apps/map/models.py:54 msgid "Urban" msgstr "Urban" -#: apps/map/models.py:41 +#: apps/map/models.py:44 msgid "Water Based" msgstr "Water Based" -#: apps/map/models.py:42 +#: apps/map/models.py:45 msgid "Marine (e.g. Ocean, Sea)" msgstr "Marine (e.g. Ocean, Sea)" -#: apps/map/models.py:43 +#: apps/map/models.py:46 msgid "Freshwater (e.g. Freshwater, Lake)" msgstr "Freshwater (e.g. Freshwater, Lake)" -#: apps/map/models.py:45 +#: apps/map/models.py:48 msgid "Land Based" msgstr "Land Based" -#: apps/map/models.py:46 +#: apps/map/models.py:49 msgid "Forest/Jungle" msgstr "Forest/Jungle" -#: apps/map/models.py:47 +#: apps/map/models.py:50 msgid "Agricultural Land" msgstr "Agricultural Land" -#: apps/map/models.py:48 +#: apps/map/models.py:51 msgid "Grassland" msgstr "Grassland" -#: apps/map/models.py:49 +#: apps/map/models.py:52 msgid "Desert (Tundra, Ice or Sand)" msgstr "Desert (Tundra, Ice or Sand)" -#: apps/map/models.py:50 +#: apps/map/models.py:53 msgid "Wetland (Marsh, Mangrove, Peat Soil)" msgstr "Wetland (Marsh, Mangrove, Peat Soil)" -#: apps/map/models.py:56 +#: apps/map/models.py:59 msgid "Existing Project" msgstr "Existing Project" -#: apps/map/models.py:57 +#: apps/map/models.py:60 msgid "Under Construction" msgstr "Under Construction" -#: apps/map/models.py:58 +#: apps/map/models.py:61 msgid "Projected Project" msgstr "Projected Project" -#: apps/map/models.py:82 +#: apps/map/models.py:91 msgid "Entry Name" msgstr "Entry Name" -#: apps/map/models.py:83 +#: apps/map/models.py:92 msgid "" "Enter the name of the entry. This should usually be the " "name of project." msgstr "" "Enter the name of the entry. This should usually be the name of the project." -#: apps/map/models.py:93 +#: apps/map/models.py:102 msgid "Sector of economy" msgstr "Sector of economy" -#: apps/map/models.py:94 +#: apps/map/models.py:103 msgid "" "Which sector of the renewable energy economy is most " "relevant?" msgstr "Which sector of the renewable energy economy is most relevant?" -#: apps/map/models.py:102 +#: apps/map/models.py:111 msgid "Positive or negative?" msgstr "Positive or negative?" -#: apps/map/models.py:103 +#: apps/map/models.py:112 msgid "Is the case study a positive case or a negative case?" msgstr "Is the case study a positive case or a negative case?" -#: apps/map/models.py:113 apps/map/templates/map/detail.html:88 +#: apps/map/models.py:122 apps/map/templates/map/detail.html:88 msgid "Approximate land area" msgstr "Approximate land area" -#: apps/map/models.py:114 +#: apps/map/models.py:123 msgid "The area of land covered by the project (in km²)" msgstr "The area of land covered by the project (in km²)" -#: apps/map/models.py:119 +#: apps/map/models.py:128 msgid "Land ownership" msgstr "Land ownership" -#: apps/map/models.py:120 +#: apps/map/models.py:129 msgid "What type of ownership does the land fall under?" msgstr "What type of ownership does the land fall under?" -#: apps/map/models.py:127 +#: apps/map/models.py:136 msgid "Land ownership details" msgstr "Land ownership details" -#: apps/map/models.py:128 -msgid "" -"Add any details and other remarks about the land ownership" +#: apps/map/models.py:137 +msgid "Please specify details about land ownership if you chose 'other'" msgstr "" -"Add any details and other remarks about the land ownership" -#: apps/map/models.py:135 +#: apps/map/models.py:145 msgid "Location" msgstr "Location" -#: apps/map/models.py:136 +#: apps/map/models.py:146 msgid "" "Select the context that is most applicable to this case " "study." @@ -198,35 +196,37 @@ msgstr "" "Select the context that is most applicable to this case " "study." -#: apps/map/models.py:144 +#: apps/map/models.py:154 msgid "Type of ecosystem" msgstr "Type of ecosystem" -#: apps/map/models.py:145 +#: apps/map/models.py:155 msgid "Select the most relevant type of ecosystem." msgstr "Select the most relevant type of ecosystem." -#: apps/map/models.py:152 +#: apps/map/models.py:162 msgid "Describe the ecosystem" msgstr "Describe the ecosystem" -#: apps/map/models.py:153 +#: apps/map/models.py:163 msgid "In your own words, add more detail about the ecosystem." msgstr "In your own words, add more detail about the ecosystem." -#: apps/map/models.py:159 +#: apps/map/models.py:169 msgid "Affects indigenous people?" msgstr "Affects indigenous people?" -#: apps/map/models.py:160 -msgid "Does the project affect indigenous people?" +#: apps/map/models.py:170 +#, fuzzy +#| msgid "Does the project affect indigenous people?" +msgid "Does the project affect indigenous communities?" msgstr "Does the project affect indigenous people?" -#: apps/map/models.py:165 +#: apps/map/models.py:175 msgid "Affects Indigenous - Details" msgstr "Affects Indigenous - Details" -#: apps/map/models.py:166 +#: apps/map/models.py:176 msgid "" "What group of indigenous people does the community belong " "to?" @@ -234,19 +234,39 @@ msgstr "" "What group of indigenous people does the community belong " "to?" -#: apps/map/models.py:173 +#: apps/map/models.py:183 msgid "Status of Project" msgstr "Status of Project" -#: apps/map/models.py:174 +#: apps/map/models.py:184 msgid "What is the status of the current project?" msgstr "What is the status of the current project?" -#: apps/map/models.py:181 +#: apps/map/models.py:191 +msgid "Start year" +msgstr "" + +#: apps/map/models.py:192 +msgid "" +"Select the year the project was started. If the project " +"hasn't begun, select the projected start year." +msgstr "" + +#: apps/map/models.py:202 +msgid "Completion year" +msgstr "" + +#: apps/map/models.py:203 +msgid "" +"Select the year the project was completed. If the " +"project hasn't finished, select the projected completion year." +msgstr "" + +#: apps/map/models.py:213 msgid "Synopsis" msgstr "Synopsis" -#: apps/map/models.py:182 +#: apps/map/models.py:214 msgid "" "Briefly describe the project. This will be displayed at " "the top of the case study page. Maximum 500 chars (about " @@ -256,11 +276,11 @@ msgstr "" "the top of the case study page. Maximum 500 chars (about " "3½ tweets)" -#: apps/map/models.py:190 apps/map/templates/map/detail.html:53 +#: apps/map/models.py:222 apps/map/templates/map/detail.html:53 msgid "Full Description" msgstr "Full Description" -#: apps/map/models.py:191 +#: apps/map/models.py:223 msgid "" "Describe the project in full. Separate paragraphs with a " "new line Please add as much detail as you feel is " @@ -270,29 +290,128 @@ msgstr "" "new line Please add as much detail as you feel is " "necessary here." -#: apps/map/models.py:198 +#: apps/map/models.py:230 +msgid "Project and facility owners" +msgstr "" + +#: apps/map/models.py:231 +msgid "" +"List companies or organisations that own the project and/or facilities. " +"Separate with a comma." +msgstr "" + +#: apps/map/models.py:240 +msgid "Shareholders of the project owners" +msgstr "" + +#: apps/map/models.py:241 +msgid "" +"List shareholders of the project owners you've just listed. Separate with a " +"comma." +msgstr "" + +#: apps/map/models.py:250 +msgid "Financial institutions" +msgstr "" + +#: apps/map/models.py:251 +msgid "" +"List banks and other financial institutions that have or are considering " +"extending loans or guarantees to the project. Separate " +"with a comma." +msgstr "" + +#: apps/map/models.py:261 +msgid "Energy consumers" +msgstr "" + +#: apps/map/models.py:262 +msgid "" +"List any wholesale energy customers that take energy from the development. E." +"g. 'national grids' or private energy suppliers." +msgstr "" + +#: apps/map/models.py:272 msgid "Image" msgstr "Image" -#: apps/map/models.py:203 +#: apps/map/models.py:277 +msgid "Image caption" +msgstr "" + +#: apps/map/models.py:285 +msgid "Image credit(s)" +msgstr "" + +#: apps/map/models.py:293 msgid "Video" msgstr "Video" -#: apps/map/models.py:209 apps/map/templates/map/detail.html:68 +#: apps/map/models.py:294 +msgid "" +"Copy the URL to a related YouTube™ video that relates to the case study." +msgstr "" + +#: apps/map/models.py:301 +#, fuzzy +#| msgid "Location" +msgid "Video caption" +msgstr "Location" + +#: apps/map/models.py:309 +msgid "Video credit(s)" +msgstr "" + +#: apps/map/models.py:316 +msgid "Links to media reports" +msgstr "" + +#: apps/map/models.py:317 +msgid "Provide any links to mainstream media coverage." +msgstr "" + +#: apps/map/models.py:325 +msgid "Independent grassroots reports" +msgstr "" + +#: apps/map/models.py:326 +msgid "Provide any links to grassroots/independent media coverage." +msgstr "" + +#: apps/map/models.py:334 apps/map/templates/map/detail.html:68 msgid "Community Voices" msgstr "Community Voices" -#: apps/map/models.py:210 +#: apps/map/models.py:335 +#, fuzzy +#| msgid "" +#| "Add any direct quotes from members of the community that " +#| "relate to this project" msgid "" -"Add any direct quotes from members of the community that " +"Add any direct quotes from members of the community that " "relate to this project" msgstr "" "Add any direct quotes from members of the community that " "relate to this project" -#: apps/map/templates/map/base.html:15 apps/map/templates/map/index.html:14 -msgid "Ojuso Platform Map" -msgstr "Ojuso Platform Map" +#: apps/map/models.py:341 +msgid "Reports of direct communications" +msgstr "" + +#: apps/map/models.py:342 +msgid "" +"Add any reports of direct communication between community members " +"and representatives of developers/companies/investors." +msgstr "" + +#: apps/map/models.py:351 +msgid "Social media links" +msgstr "" + +#: apps/map/models.py:352 +msgid "" +"Add any links to social media accounts directly relating to the project." +msgstr "" #: apps/map/templates/map/detail.html:20 msgid "Back to Map" @@ -302,6 +421,14 @@ msgstr "Back to Map" msgid "Factbar" msgstr "Factbar" +#: apps/map/templates/map/form-success.html:32 +msgid "Thanks!" +msgstr "" + +#: apps/map/templates/map/form-success.html:34 +msgid "Your submission will be reviewed shortly. We will update you via email." +msgstr "" + #: apps/map/templates/map/form.html:15 apps/map/templates/map/index.html:107 msgid "Submit a Case Study" msgstr "Submit a Case Study" @@ -324,6 +451,10 @@ msgstr "" "A complete picture is always more helpful but sometimes you don't have the " "time" +#: apps/map/templates/map/index.html:14 +msgid "Ojuso Platform Map" +msgstr "Ojuso Platform Map" + #: apps/map/templates/map/index.html:50 msgid "View" msgstr "View" @@ -336,23 +467,54 @@ msgstr "Close" msgid "Save changes" msgstr "Save changes" -#: ojusomap/settings.py:161 +#: ojusomap/settings.py:165 msgid "English (British)" msgstr "English (British)" -#: ojusomap/settings.py:162 +#: ojusomap/settings.py:166 msgid "French" msgstr "French" -#: ojusomap/settings.py:163 +#: ojusomap/settings.py:167 msgid "Spanish" msgstr "Spanish" -#: ojusomap/templates/registration/login.html:7 +#: ojusomap/templates/base.html:35 +msgid "Map" +msgstr "" + +#: ojusomap/templates/base.html:47 ojusomap/templates/registration/login.html:7 +#: ojusomap/templates/registration/login.html:12 #: ojusomap/templates/registration/login.html:21 msgid "Login" msgstr "Login" +#: ojusomap/templates/base.html:48 +#: ojusomap/templates/registration/registration_form.html:20 +msgid "Register" +msgstr "" + +#: ojusomap/templates/registration/activate.html:6 +msgid "Account activation failed" +msgstr "" + +#: ojusomap/templates/registration/activation_complete.html:5 +msgid "Your account is now activated." +msgstr "" + +#: ojusomap/templates/registration/activation_email.txt:2 +msgid "Activate account at" +msgstr "" + +#: ojusomap/templates/registration/activation_email.txt:6 +#, python-format +msgid "Link is valid for %(expiration_days)s days." +msgstr "" + +#: ojusomap/templates/registration/activation_email_subject.txt:1 +msgid "Account activation on" +msgstr "" + #: ojusomap/templates/registration/login.html:13 msgid "Welcome!" msgstr "Welcome!" @@ -361,39 +523,88 @@ msgstr "Welcome!" msgid "Lost password?" msgstr "Lost password?" -#: ojusomap/templates/registration/logout.html:10 -msgid "You've just been logged out." -msgstr "You've just been logged out." +#: ojusomap/templates/registration/logout.html:5 +msgid "Logged out" +msgstr "" -#: ojusomap/templates/registration/logout.html:10 -msgid "Click here to login again." -msgstr "Click here to login again." +#: ojusomap/templates/registration/password_change_done.html:5 +msgid "Password changed" +msgstr "" + +#: ojusomap/templates/registration/password_change_form.html:9 +#: ojusomap/templates/registration/password_reset_confirm.html:12 +#: ojusomap/templates/registration/password_reset_form.html:9 +msgid "Submit" +msgstr "" + +#: ojusomap/templates/registration/password_reset_complete.html:6 +msgid "Password reset successfully" +msgstr "" + +#: ojusomap/templates/registration/password_reset_complete.html:8 +msgid "Log in" +msgstr "" + +#: ojusomap/templates/registration/password_reset_confirm.html:17 +msgid "Password reset failed" +msgstr "" + +#: ojusomap/templates/registration/password_reset_done.html:5 +msgid "Email with password reset instructions has been sent." +msgstr "" #: ojusomap/templates/registration/password_reset_email.html:2 #, python-format -msgid "" -"You're receiving this email because you requested a password reset for your " -"user account at %(site_name)s." +msgid "Reset password at %(site_name)s" msgstr "" -"You're receiving this email because you requested a password reset for your " -"user account at %(site_name)s." -#: ojusomap/templates/registration/password_reset_email.html:4 -msgid "Please go to the following page and choose a new password:" -msgstr "Please go to the following page and choose a new password:" +#: ojusomap/templates/registration/registration_closed.html:5 +msgid "Registration is currently closed." +msgstr "" -#: ojusomap/templates/registration/password_reset_email.html:8 -msgid "Your username, in case you've forgotten:" -msgstr "Your username, in case you've forgotten:" +#: ojusomap/templates/registration/registration_complete.html:5 +msgid "You are now registered. Activation email sent." +msgstr "" -#: ojusomap/templates/registration/password_reset_email.html:10 -msgid "Thanks for using our site!" -msgstr "Thanks for using our site!" +#: ojusomap/templates/registration/registration_form.html:12 +msgid "Registration" +msgstr "" -#: ojusomap/templates/registration/password_reset_email.html:12 -#, python-format -msgid "The %(site_name)s team" -msgstr "The %(site_name)s team" +#: ojusomap/templates/registration/registration_form.html:13 +msgid "Create your account and get active!" +msgstr "" + +#~ msgid "" +#~ "Add any details and other remarks about the land " +#~ "ownership" +#~ msgstr "" +#~ "Add any details and other remarks about the land " +#~ "ownership" + +#~ msgid "You've just been logged out." +#~ msgstr "You've just been logged out." + +#~ msgid "Click here to login again." +#~ msgstr "Click here to login again." + +#~ msgid "" +#~ "You're receiving this email because you requested a password reset for " +#~ "your user account at %(site_name)s." +#~ msgstr "" +#~ "You're receiving this email because you requested a password reset for " +#~ "your user account at %(site_name)s." + +#~ msgid "Please go to the following page and choose a new password:" +#~ msgstr "Please go to the following page and choose a new password:" + +#~ msgid "Your username, in case you've forgotten:" +#~ msgstr "Your username, in case you've forgotten:" + +#~ msgid "Thanks for using our site!" +#~ msgstr "Thanks for using our site!" + +#~ msgid "The %(site_name)s team" +#~ msgstr "The %(site_name)s team" #~ msgid "Quick View" #~ msgstr "Quick View" diff --git a/support/locale/es/LC_MESSAGES/django.po b/support/locale/es/LC_MESSAGES/django.po index b06a48f..6161b21 100644 --- a/support/locale/es/LC_MESSAGES/django.po +++ b/support/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-08 19:45+0000\n" +"POT-Creation-Date: 2017-10-11 21:16+0000\n" "PO-Revision-Date: 2017-09-22 15:06+0000\n" "Last-Translator: Tom Wragg \n" "Language-Team: Spanish \n" "Language-Team: French