From 23f096c2a7590329b5025c4ba3e7fa16dae56107 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Thu, 13 Feb 2025 19:02:25 +0300
Subject: [PATCH] Move copyright infringement section up

---
 app/views/site/copyright.html.erb | 18 ++++++++----------
 config/locales/en.yml             | 28 ++++++++++++++--------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 6b07d2c28..57a8e53fb 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -85,6 +85,14 @@
                      :class => "img-fluid",
                      :title => t(".legal_babble.attribution_example.title")) %></p>
 
+    <h3><%= t ".legal_babble.infringement_title_html" %></h3>
+    <p>
+      <%= legal_babble_paragraph "infringement_1" %>
+    </p>
+    <p>
+      <%= legal_babble_paragraph "infringement_2_1", :links => %w[takedown_procedure online_filing_page] %>
+    </p>
+
     <h3><%= t ".legal_babble.more_title_html" %></h3>
     <p>
       <%= t ".legal_babble.more_2_1_html",
@@ -205,16 +213,6 @@
     </p>
     <p><%= t ".legal_babble.contributors_footer_2_html" %></p>
 
-    <h3><%= t ".legal_babble.infringement_title_html" %></h3>
-    <p><%= t ".legal_babble.infringement_1_html" %></p>
-    <p>
-      <%= t ".legal_babble.infringement_2_1_html",
-            :takedown_procedure_link => link_to(t(".legal_babble.infringement_2_1_takedown_procedure"),
-                                                t(".legal_babble.infringement_2_1_takedown_procedure_url")),
-            :online_filing_page_link => link_to(t(".legal_babble.infringement_2_1_online_filing_page"),
-                                                t(".legal_babble.infringement_2_1_online_filing_page_url")) %>
-    </p>
-
     <h3 id="trademarks">
       <%= t ".legal_babble.trademarks_title" %>
     </h3>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8939dab69..c2b77b2d8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2196,6 +2196,20 @@ en:
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
+        infringement_title_html: Copyright infringement
+        infringement_1_html: |
+          OSM contributors are reminded never to add data from any
+          copyrighted sources (e.g. Google Maps or printed maps) without
+          explicit permission from the copyright holders.
+        infringement_2_1_html: |
+          If you believe that copyrighted material has been inappropriately
+          added to the OpenStreetMap database or this site, please refer
+          to our %{takedown_procedure_link} or file directly at our
+          %{online_filing_page_link}.
+        infringement_2_1_takedown_procedure: takedown procedure
+        infringement_2_1_takedown_procedure_url: https://osmfoundation.org/wiki/Takedown_procedure
+        infringement_2_1_online_filing_page: on-line filing page
+        infringement_2_1_online_filing_page_url: https://dmca.openstreetmap.org/
         more_title_html: Finding out more
         more_2_1_html: |
           Although OpenStreetMap is open data, we cannot provide a
@@ -2324,20 +2338,6 @@ en:
           Inclusion of data in OpenStreetMap does not imply that the original
           data provider endorses OpenStreetMap, provides any warranty, or
           accepts any liability.
-        infringement_title_html: Copyright infringement
-        infringement_1_html: |
-          OSM contributors are reminded never to add data from any
-          copyrighted sources (e.g. Google Maps or printed maps) without
-          explicit permission from the copyright holders.
-        infringement_2_1_html: |
-          If you believe that copyrighted material has been inappropriately
-          added to the OpenStreetMap database or this site, please refer
-          to our %{takedown_procedure_link} or file directly at our
-          %{online_filing_page_link}.
-        infringement_2_1_takedown_procedure: takedown procedure
-        infringement_2_1_takedown_procedure_url: https://osmfoundation.org/wiki/Takedown_procedure
-        infringement_2_1_online_filing_page: on-line filing page
-        infringement_2_1_online_filing_page_url: https://dmca.openstreetmap.org/
         trademarks_title: Trademarks
         trademarks_1_1_html: |
           OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the
-- 
2.39.5