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

diff --combined 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,83 -1,89 +1,85 @@@
  <% 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 %>
      <!-- Maybe note that this page has been translated -->
      <% if t(".legal_babble", :locale => @locale) != t(".legal_babble", :locale => :en) %>
 -      <%= tag.div :lang => "en", :dir => t("html.dir", :locale => "en") do %>
 -        <h1><%= t ".foreign.title" %></h1>
 -        <p>
 -          <%= t ".foreign.html",
 -                :english_original_link => link_to(t(".foreign.english_link"),
 -                                                  :controller => "site",
 -                                                  :action => "copyright",
 -                                                  :copyright_locale => "en") %>
 -        </p>
 -      <% end %>
 +      <h1><%= t ".foreign.title" %></h1>
 +      <p>
 +        <%= t ".foreign.html",
 +              :english_original_link => link_to(t(".foreign.english_link"),
 +                                                :controller => "site",
 +                                                :action => "copyright",
 +                                                :copyright_locale => "en") %>
 +      </p>
        <hr />
      <% end %>
    <% end %>
  
-   <%= tag.h1 :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
-     <%= t ".legal_babble.title_html", :locale => @locale %>
+   <% I18n.with_locale @locale do %>
+     <%= tag.h1 :lang => @locale, :dir => t("html.dir") do %>
+       <%= t ".legal_babble.title_html" %>
+     <% end %>
    <% end %>
- 
  <% end %>
  
- <%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
-   <p><%= t ".legal_babble.intro_1_html", :locale => @locale %></p>
-   <p><%= t ".legal_babble.intro_2_html", :locale => @locale %></p>
-   <p><%= t ".legal_babble.intro_3_1_html", :locale => @locale %></p>
+ <% I18n.with_locale @locale do %>
+   <%= tag.div :lang => @locale, :dir => t("html.dir") do %>
+     <p><%= t ".legal_babble.intro_1_html" %></p>
+     <p><%= t ".legal_babble.intro_2_html" %></p>
+     <p><%= t ".legal_babble.intro_3_1_html" %></p>
  
-   <h3><%= t ".legal_babble.credit_title_html", :locale => @locale %></h3>
-   <p><%= t ".legal_babble.credit_1_html", :locale => @locale %></p>
-   <p><%= t ".legal_babble.credit_2_1_html", :locale => @locale %></p>
-   <p><%= t ".legal_babble.credit_3_1_html", :locale => @locale %></p>
-   <p><%= t ".legal_babble.credit_4_html", :locale => @locale %></p>
-   <p><%= image_tag("attribution_example.png",
-                    :alt => t(".legal_babble.attribution_example.alt"),
-                    :border => 0,
-                    :title => t(".legal_babble.attribution_example.title")) %></p>
+     <h3><%= t ".legal_babble.credit_title_html" %></h3>
+     <p><%= t ".legal_babble.credit_1_html" %></p>
+     <p><%= t ".legal_babble.credit_2_1_html" %></p>
+     <p><%= t ".legal_babble.credit_3_1_html" %></p>
+     <p><%= t ".legal_babble.credit_4_html" %></p>
+     <p><%= image_tag("attribution_example.png",
+                      :alt => t(".legal_babble.attribution_example.alt"),
+                      :border => 0,
+                      :title => t(".legal_babble.attribution_example.title")) %></p>
  
-   <h3><%= t ".legal_babble.more_title_html", :locale => @locale %></h3>
-   <p><%= t ".legal_babble.more_1_html", :locale => @locale %></p>
-   <p><%= t ".legal_babble.more_2_html", :locale => @locale %></p>
+     <h3><%= t ".legal_babble.more_title_html" %></h3>
+     <p><%= t ".legal_babble.more_1_html" %></p>
+     <p><%= t ".legal_babble.more_2_html" %></p>
  
-   <h3><%= t ".legal_babble.contributors_title_html", :locale => @locale %></h3>
-   <p><%= t ".legal_babble.contributors_intro_html", :locale => @locale %></p>
-   <ul id="contributors">
-     <li><%= t ".legal_babble.contributors_at_html", :locale => @locale %></li>
-     <li><%= t ".legal_babble.contributors_au_html", :locale => @locale %></li>
-     <li><%= t ".legal_babble.contributors_ca_html", :locale => @locale %></li>
-     <li><%= t ".legal_babble.contributors_fi_html", :locale => @locale %></li>
-     <li><%= t ".legal_babble.contributors_fr_html", :locale => @locale %></li>
-     <li><%= t ".legal_babble.contributors_nl_html", :locale => @locale %></li>
-     <li><%= t ".legal_babble.contributors_nz_html", :locale => @locale %></li>
-     <li><%= t ".legal_babble.contributors_si_html", :locale => @locale %></li>
-     <li><%= t ".legal_babble.contributors_es_html", :locale => @locale %></li>
-     <li><%= t ".legal_babble.contributors_za_html", :locale => @locale %></li>
-     <li><%= t ".legal_babble.contributors_gb_html", :locale => @locale %></li>
-   </ul>
-   <p><%= t ".legal_babble.contributors_footer_1_html", :locale => @locale %></p>
-   <p><%= t ".legal_babble.contributors_footer_2_html", :locale => @locale %></p>
+     <h3><%= t ".legal_babble.contributors_title_html" %></h3>
+     <p><%= t ".legal_babble.contributors_intro_html" %></p>
+     <ul id="contributors">
+       <li><%= t ".legal_babble.contributors_at_html" %></li>
+       <li><%= t ".legal_babble.contributors_au_html" %></li>
+       <li><%= t ".legal_babble.contributors_ca_html" %></li>
+       <li><%= t ".legal_babble.contributors_fi_html" %></li>
+       <li><%= t ".legal_babble.contributors_fr_html" %></li>
+       <li><%= t ".legal_babble.contributors_nl_html" %></li>
+       <li><%= t ".legal_babble.contributors_nz_html" %></li>
+       <li><%= t ".legal_babble.contributors_si_html" %></li>
+       <li><%= t ".legal_babble.contributors_es_html" %></li>
+       <li><%= t ".legal_babble.contributors_za_html" %></li>
+       <li><%= t ".legal_babble.contributors_gb_html" %></li>
+     </ul>
+     <p><%= t ".legal_babble.contributors_footer_1_html" %></p>
+     <p><%= t ".legal_babble.contributors_footer_2_html" %></p>
  
-   <h3><%= t ".legal_babble.infringement_title_html", :locale => @locale %></h3>
-   <p><%= t ".legal_babble.infringement_1_html", :locale => @locale %></p>
-   <p><%= t ".legal_babble.infringement_2_html", :locale => @locale %></p>
+     <h3><%= t ".legal_babble.infringement_title_html" %></h3>
+     <p><%= t ".legal_babble.infringement_1_html" %></p>
+     <p><%= t ".legal_babble.infringement_2_html" %></p>
  
-   <h3><%= t ".legal_babble.trademarks_title_html", :locale => @locale %></h3>
-   <p><%= t ".legal_babble.trademarks_1_html", :locale => @locale %></p>
+     <h3><%= t ".legal_babble.trademarks_title_html" %></h3>
+     <p><%= t ".legal_babble.trademarks_1_html" %></p>
+   <% end %>
  <% end %>