From 717b04bf7f19eedf4b11e131ab34221a97e5e951 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Thu, 13 Feb 2025 18:01:00 +0300
Subject: [PATCH] Update licensing section

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

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index c0e6acb4f..644594b75 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -49,24 +49,14 @@
     </p>
     <h3><%= t ".legal_babble.licensing_title" %></h3>
     <p>
-      <%= t ".legal_babble.introduction_1_html",
-            :registered_trademark_link => tag.sup(link_to(t(".legal_babble.introduction_1_registered_trademark_html"),
-                                                          :anchor => "trademarks")),
-            :open_data => tag.i(t(".legal_babble.introduction_1_open_data")),
-            :odc_odbl_link => link_to(t(".legal_babble.introduction_1_odc_odbl"),
-                                      t(".legal_babble.introduction_1_odc_odbl_url")),
-            :osm_foundation_link => link_to(t(".legal_babble.introduction_1_osm_foundation"),
-                                            t(".legal_babble.introduction_1_osm_foundation_url")) %>
+      <%= legal_babble_paragraph "licensing_1", :links => %w[odc_odbl osm_foundation],
+                                                :open => tag.em(t(".legal_babble.licensing_1_open")) %>
     </p>
     <p>
-      <%= t ".legal_babble.introduction_2_html",
-            :legal_code_link => link_to(t(".legal_babble.introduction_2_legal_code"),
-                                        t(".legal_babble.introduction_2_legal_code_url")) %>
+      <%= legal_babble_paragraph "licensing_2", :links => %w[legal_code] %>
     </p>
     <p>
-      <%= t ".legal_babble.introduction_3_html",
-            :creative_commons_link => link_to(t(".legal_babble.introduction_3_creative_commons"),
-                                              t(".legal_babble.introduction_3_creative_commons_url")) %>
+      <%= legal_babble_paragraph "licensing_3", :links => %w[creative_commons_license] %>
     </p>
 
     <h3><%= t ".legal_babble.credit_title_html" %></h3>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7b06055f4..fbf993bb7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2142,27 +2142,26 @@ en:
         lead_2_making_donation: making a donation
         lead_2_making_donation_url: https://supporting.openstreetmap.org/
         licensing_title: OpenStreetMap licensing
-        introduction_1_html: |
-          OpenStreetMap%{registered_trademark_link} is %{open_data}, licensed under the
-          %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF).
-        introduction_1_registered_trademark_html: "&reg;"
-        introduction_1_open_data: open data
-        introduction_1_odc_odbl: Open Data Commons Open Database License
-        introduction_1_odc_odbl_url: https://opendatacommons.org/licenses/odbl/
-        introduction_1_osm_foundation: OpenStreetMap Foundation
-        introduction_1_osm_foundation_url: https://osmfoundation.org/
-        introduction_2_html: |
+        licensing_1_html: |
+          OpenStreetMap is %{open} data, licensed under the
+          %{odc_odbl_link} (ODbL) by the %{osm_foundation_link} (OSMF). In summary:
+        licensing_1_open: open
+        licensing_1_odc_odbl: Open Data Commons Open Database License
+        licensing_1_odc_odbl_url: https://opendatacommons.org/licenses/odbl/
+        licensing_1_osm_foundation: OpenStreetMap Foundation
+        licensing_1_osm_foundation_url: https://osmfoundation.org/
+        licensing_2_html: |
           You are free to copy, distribute, transmit and adapt our data,
           as long as you credit OpenStreetMap and its
           contributors. If you alter or build upon our data, you
-          may distribute the result only under the same licence. The
-          full %{legal_code_link} explains your rights and responsibilities.
-        introduction_2_legal_code: legal code
-        introduction_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1.0/
-        introduction_3_html: |
-          Our documentation is licensed under the %{creative_commons_link} license (CC BY-SA 2.0).
-        introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0
-        introduction_3_creative_commons_url: https://creativecommons.org/licenses/by-sa/2.0/
+          may distribute the result only under the same license. The
+          %{legal_code_link} explains your rights and responsibilities.
+        licensing_2_legal_code: full legal code at Open Data Commons
+        licensing_2_legal_code_url: https://opendatacommons.org/licenses/odbl/1-0/
+        licensing_3_html: |
+          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/
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |
           Where you use OpenStreetMap data, you are required to do the following two things:
-- 
2.39.5