Add link from settings to pd declaration

diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index 2f336a33072193baa51ee76536b510aea5ec7f49..ce7dd97a83d4dd7597810559c4d2fa8452f2b56b 100644 (file)
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -35,9 +35,12 @@
       <% if current_user.terms_agreed? %>
         <%= t ".contributor terms.agreed" %>
         (<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)
       <% if current_user.terms_agreed? %>
         <%= t ".contributor terms.agreed" %>
         (<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)

+        <br>

         <% if current_user.consider_pd? %>
         <% if current_user.consider_pd? %>

-          <br>

           <%= t ".contributor terms.agreed_with_pd" %>
           <%= t ".contributor terms.agreed_with_pd" %>

+        <% else %>
+          <%= t ".contributor terms.not_agreed_with_pd" %>
+          (<%= link_to t(".contributor terms.pd_link_text"), account_pd_declaration_path %>)

         <% end %>
       <% else %>
         <%= t ".contributor terms.not yet agreed" %>
         <% end %>
       <% else %>
         <%= t ".contributor terms.not yet agreed" %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 874ecaa85bbdb7b2479df99a175b395a6ebc7de1..5ea8abae242af4e16fdd3b5b314be1d83b956c5a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -259,6 +259,8 @@ en:
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         link: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
         link text: "what is this?"
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         link: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
         link text: "what is this?"

+        not_agreed_with_pd: "You haven't declared that you consider your edits to be in the Public Domain."
+        pd_link_text: "declare"

       save changes button: Save Changes
       delete_account: Delete Account...
     go_public:
       save changes button: Save Changes
       delete_account: Delete Account...
     go_public: