From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Mar 2023 11:00:09 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3982'
X-Git-Tag: live~1447
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a7051e924f518f050a195cd7658d5af558842b87

Merge remote-tracking branch 'upstream/pull/3982'
---

a7051e924f518f050a195cd7658d5af558842b87
diff --cc app/views/site/copyright.html.erb
index f8ea248b5,581af7d6d..e94fad402
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@@ -1,19 -1,20 +1,18 @@@
  <% content_for :heading do %>
- <% if @locale == "en" %>
-   <!-- Maybe ease foreigners back to their native page -->
- 
+   <% if @locale == "en" %>
+     <!-- Maybe ease foreigners back to their native page -->
      <% if t(".legal_babble", :locale => I18n.locale) != t(".legal_babble", :locale => :en) %>
 -      <%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
 -        <h1><%= t ".native.title" %></h1>
 -        <p>
 -          <%= t ".native.html",
 -                :native_link => link_to(t(".native.native_link"),
 -                                        :controller => "site",
 -                                        :action => "copyright",
 -                                        :copyright_locale => nil),
 -                :mapping_link => link_to(t(".native.mapping_link"),
 -                                         :controller => "site",
 -                                         :action => "index") %>
 -        </p>
 -      <% end %>
 +      <h1><%= t ".native.title" %></h1>
 +      <p>
 +        <%= t ".native.html",
 +              :native_link => link_to(t(".native.native_link"),
 +                                      :controller => "site",
 +                                      :action => "copyright",
 +                                      :copyright_locale => nil),
 +              :mapping_link => link_to(t(".native.mapping_link"),
 +                                       :controller => "site",
 +                                       :action => "index") %>
 +      </p>
        <hr />
      <% end %>
    <% else %>