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

diff --cc app/views/site/copyright.html.erb
index f8ea248b50ab2dba0c4d68adef1ecd90ef79ee2c,581af7d6d710d6b4d73a10bdf1bdba5e5a79af36..e94fad402b0df97309ba96a733a0b7770d6388c6
--- 1/app/views/site/copyright.html.erb
--- 2/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 %>