From 847194647c590bf78b0a1977a002be7f405e886b Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Thu, 13 Feb 2025 19:10:51 +0300
Subject: [PATCH] Move trademarks section up

---
 app/views/site/copyright.html.erb | 14 +++++---------
 config/locales/en.yml             | 14 +++++++-------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 57a8e53fb..9a0e6bc7c 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -93,6 +93,11 @@
       <%= legal_babble_paragraph "infringement_2_1", :links => %w[takedown_procedure online_filing_page] %>
     </p>
 
+    <h3 id="trademarks"><%= t ".legal_babble.trademarks_title" %></h3>
+    <p>
+      <%= legal_babble_paragraph "trademarks_1_1", :links => %w[trademark_policy] %>
+    </p>
+
     <h3><%= t ".legal_babble.more_title_html" %></h3>
     <p>
       <%= t ".legal_babble.more_2_1_html",
@@ -212,14 +217,5 @@
                                                t(".legal_babble.contributors_2_contributors_page_url")) %>
     </p>
     <p><%= t ".legal_babble.contributors_footer_2_html" %></p>
-
-    <h3 id="trademarks">
-      <%= t ".legal_babble.trademarks_title" %>
-    </h3>
-    <p>
-      <%= t ".legal_babble.trademarks_1_1_html",
-            :trademark_policy_link => link_to(t(".legal_babble.trademarks_1_1_trademark_policy"),
-                                              t(".legal_babble.trademarks_1_1_trademark_policy_url")) %>
-    </p>
   <% end %>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6cb46c4f5..1bad34d7e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2210,6 +2210,13 @@ en:
         infringement_2_1_takedown_procedure_url: https://wiki.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
+          OpenStreetMap Foundation. If you have questions about your use of the marks, please see our
+          %{trademark_policy_link}.
+        trademarks_1_1_trademark_policy: Trademark Policy
+        trademarks_1_1_trademark_policy_url: https://osmfoundation.org/wiki/Trademark_Policy
         more_title_html: Finding out more
         more_2_1_html: |
           Although OpenStreetMap is open data, we cannot provide a
@@ -2338,13 +2345,6 @@ en:
           Inclusion of data in OpenStreetMap does not imply that the original
           data provider endorses OpenStreetMap, provides any warranty, or
           accepts any liability.
-        trademarks_title: Trademarks
-        trademarks_1_1_html: |
-          OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the
-          OpenStreetMap Foundation. If you have questions about your use of the marks, please see our
-          %{trademark_policy_link}.
-        trademarks_1_1_trademark_policy: Trademark Policy
-        trademarks_1_1_trademark_policy_url: https://osmfoundation.org/wiki/Trademark_Policy
     index:
       js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
-- 
2.39.5