Remove remaining html in translations from fixthemap page

diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb
index fe6cf22c59b3eb8aae18d5ec8b01ad7ea092a382..ab8684116b4f580bd431243ada702d4ac189c465 100644 (file)
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -27,6 +27,9 @@
 </div>
 
 <h2><%= t ".other_concerns.title" %></h2>
 </div>
 
 <h2><%= t ".other_concerns.title" %></h2>

-<p><%= t ".other_concerns.explanation_html" %></p>
+<p>
+  <%= t ".other_concerns.concerns_html", :copyright_link => link_to(t(".other_concerns.copyright"), copyright_path),
+                                         :working_group_link => link_to(t(".other_concerns.working_group"), t(".other_concerns.working_group_url")) %>
+</p>

 
 <%= render "any_questions" %>
 
 <%= render "any_questions" %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f5ab514d1e4178fbd4e01a431f3946db2e0b0aa5..79be07cb95c214cade2a2847410d9b76945634e1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2107,10 +2107,12 @@ en:
             by dragging. Add your message, then click save, and other mappers will investigate.
       other_concerns:
         title: Other concerns
             by dragging. Add your message, then click save, and other mappers will investigate.
       other_concerns:
         title: Other concerns

-        explanation_html: |
+        concerns_html: |

           If you have concerns about how our data is being used or about the contents please consult our
           If you have concerns about how our data is being used or about the contents please consult our

-          <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
-          <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
+          %{copyright_link} for more legal information, or contact the appropriate %{working_group_link}.
+        copyright: copyright page
+        working_group: OSMF working group
+        working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups

     help:
       title: Getting Help
       introduction: |
     help:
       title: Getting Help
       introduction: |