From bb304aa7bf265036a00bfb0d909719676f709532 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Thu, 13 Feb 2025 18:26:37 +0300
Subject: [PATCH] Move "read more" paragraph to licensing section

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

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 644594b75..2cfa54c82 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -58,6 +58,9 @@
     <p>
       <%= legal_babble_paragraph "licensing_3", :links => %w[creative_commons_license] %>
     </p>
+    <p>
+      <%= legal_babble_paragraph "licensing_4", :links => %w[osmf_license_page] %>
+    </p>
 
     <h3><%= t ".legal_babble.credit_title_html" %></h3>
     <p><%= t ".legal_babble.credit_1_html" %></p>
@@ -81,11 +84,6 @@
                      :title => t(".legal_babble.attribution_example.title")) %></p>
 
     <h3><%= t ".legal_babble.more_title_html" %></h3>
-    <p>
-      <%= t ".legal_babble.more_1_1_html",
-            :osmf_licence_page_link => link_to(t(".legal_babble.more_1_1_osmf_licence_page"),
-                                               t(".legal_babble.more_1_1_osmf_licence_page_url")) %>
-    </p>
     <p>
       <%= t ".legal_babble.more_2_1_html",
             :api_usage_policy_link => link_to(t(".legal_babble.more_2_1_api_usage_policy"),
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fbf993bb7..197a12472 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2162,6 +2162,10 @@ en:
           Our documentation is licensed under the %{creative_commons_license_link} (CC BY-SA 2.0).
         licensing_3_creative_commons_license: Creative Commons Attribution-ShareAlike 2.0 license
         licensing_3_creative_commons_license_url: https://creativecommons.org/licenses/by-sa/2.0/
+        licensing_4_html: |
+          Read more about using our data at the %{osmf_license_page_link}.
+        licensing_4_osmf_license_page: OSMF Licence page
+        licensing_4_osmf_license_page_url: https://osmfoundation.org/Licence
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |
           Where you use OpenStreetMap data, you are required to do the following two things:
@@ -2189,9 +2193,6 @@ en:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
         more_title_html: Finding out more
-        more_1_1_html: Read more about using our data, and how to credit us, at the %{osmf_licence_page_link}.
-        more_1_1_osmf_licence_page: OSMF Licence page
-        more_1_1_osmf_licence_page_url: https://osmfoundation.org/Licence
         more_2_1_html: |
           Although OpenStreetMap is open data, we cannot provide a
           free-of-charge map API for third-parties.
-- 
2.39.5