From ded5f3d009a9ac917057ac7d1d22fb9067e4c898 Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Thu, 13 Feb 2025 18:59:25 +0300
Subject: [PATCH] Update credit section

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

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 2cfa54c82..6b07d2c28 100644
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -63,20 +63,22 @@
     </p>
 
     <h3><%= t ".legal_babble.credit_title_html" %></h3>
-    <p><%= t ".legal_babble.credit_1_html" %></p>
+    <p>
+      <%= legal_babble_paragraph "credit_1" %>
+    </p>
     <ul>
-      <li><%= t ".legal_babble.credit_2_1" %></li>
-      <li><%= t ".legal_babble.credit_2_2" %></li>
+      <li><%= t ".legal_babble.credit_2_attribution" %></li>
+      <li><%= t ".legal_babble.credit_2_license" %></li>
     </ul>
     <p>
-      <%= t ".legal_babble.credit_3_html",
-            :attribution_guidelines_link => link_to(t(".legal_babble.credit_3_attribution_guidelines"),
-                                                    t(".legal_babble.credit_3_attribution_guidelines_url")) %>
+      <%= legal_babble_paragraph "credit_3_v2025", :links => %w[requirements_on_how_displayed attribution_guidelines licensing_requirements] %>
+    </p>
+    <p>
+      <%= legal_babble_paragraph "credit_4_v2025", :local_links => { :this_copyright_page => copyright_path },
+                                                   :copyright_page_url => copyright_url %>
     </p>
     <p>
-      <%= t ".legal_babble.credit_4_1_html",
-            :this_copyright_page_link => link_to(t(".legal_babble.credit_4_1_this_copyright_page"),
-                                                 copyright_path) %>
+      <%= legal_babble_paragraph "credit_5_v2025" %>
     </p>
     <p><%= image_tag("attribution_example.png",
                      :alt => t(".legal_babble.attribution_example.alt"),
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 197a12472..8939dab69 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2169,26 +2169,30 @@ en:
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |
           Where you use OpenStreetMap data, you are required to do the following two things:
-        credit_2_1: Provide credit to OpenStreetMap by displaying our copyright notice.
-        credit_2_2: Make clear that the data is available under the Open Database License.
-        credit_3_html: |
-         For the copyright notice, we have different requirements on how this should be
-         displayed, depending on how you are using our data. For example, different
-         rules apply on how to show the copyright notice depending on whether you have
-         created a browsable map, a printed map or a static image. Full details on the
-         requirements can be found in the %{attribution_guidelines_link}.
-        credit_3_attribution_guidelines: Attribution Guidelines
-        credit_3_attribution_guidelines_url: https://osmfoundation.org/wiki/Licence/Attribution_Guidelines
-        credit_4_1_html: |
-          To make clear that the data is available under the Open
+        credit_2_attribution: Provide credit to OpenStreetMap by displaying our attribution notice.
+        credit_2_license: Make clear that the data is available under the Open Database License.
+        credit_3_v2025_html: |
+          For the attribution notice, we have different %{requirements_on_how_displayed_link}, depending on how you are using our data.
+          For example, different rules apply on how to show the attribution notice depending on whether you have
+          created a browsable map, a printed map or a static image.
+          More details can be found in the %{attribution_guidelines_link} section of %{licensing_requirements_link}.
+        credit_3_v2025_requirements_on_how_displayed: requirements on how this should be displayed
+        credit_3_v2025_requirements_on_how_displayed_url: https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines
+        credit_3_v2025_attribution_guidelines: attribution guidelines
+        credit_3_v2025_attribution_guidelines_url: https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines
+        credit_3_v2025_licensing_requirements: the licensing requirements
+        credit_3_v2025_licensing_requirements_url: https://wiki.osmfoundation.org/wiki/Licence
+        credit_4_v2025_html: |
+          Generally speaking,
+          to make clear that the data is available under the Open
           Database License, you may link to %{this_copyright_page_link}.
-          Alternatively, and as a requirement if you are distributing OSM in a
-          data form, you can name and link directly to the license(s). In media
-          where links are not possible (e.g. printed works), we suggest you
-          direct your readers to openstreetmap.org (perhaps by expanding
-          'OpenStreetMap' to this full address) and to opendatacommons.org.
-          In this example, the credit appears in the corner of the map.
-        credit_4_1_this_copyright_page: this copyright page
+          If you are distributing OSM in
+          data form, please name and link directly to the license(s). In media
+          where links are not possible (e.g. printed works),
+          please include the full URL on the page, e.g. %{copyright_page_url}.
+        credit_4_v2025_this_copyright_page: this copyright page
+        credit_5_v2025_html: |
+          In this example, the credit appears in the corner of the map:
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
-- 
2.39.5