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

[rails.git] / app / views / site / copyright.html.erb

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 2dcccab18fc78fa1a120e5e47ca3e61a26eb569a..f8ea248b50ab2dba0c4d68adef1ecd90ef79ee2c 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -1,36 +1,32 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-<% if @locale == 'en' %>
+<% if @locale == "en" %>

   <!-- Maybe ease foreigners back to their native page -->
 
   <!-- Maybe ease foreigners back to their native page -->
 

-    <% if t('.legal_babble', :locale => I18n.locale) != t('.legal_babble', :locale => :en) %>
-      <%= tag.h1 :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
-        <h1><%= t '.native.title' %></h1>
-        <p>
-          <%= raw t '.native.text',
-                    :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 %>
+    <% if t(".legal_babble", :locale => I18n.locale) != t(".legal_babble", :locale => :en) %>
+      <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 -->
       <hr />
     <% end %>
   <% else %>
     <!-- Maybe note that this page has been translated -->

-    <%= tag.div :lang => "en", :dir => t("html.dir", :locale => "en") do %>
-      <% if t('.legal_babble', :locale => @locale) != t('.legal_babble', :locale => :en) %>
-        <h1><%= t '.foreign.title' %></h1>
-        <p>
-          <%= raw t '.foreign.text',
-                    :english_original_link => link_to(t('.foreign.english_link'),
-                                                      :controller => 'site',
-                                                      :action => 'copyright',
-                                                      :copyright_locale => 'en') %>
-        </p>
-      <% end %>
+    <% if t(".legal_babble", :locale => @locale) != t(".legal_babble", :locale => :en) %>
+      <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 %>
       <hr />
     <% end %>
   <% end %>


@@ -44,16 +40,17 @@
 <%= 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>
 <%= 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_html", :locale => @locale %></p>
+  <p><%= t ".legal_babble.intro_3_1_html", :locale => @locale %></p>

 
   <h3><%= t ".legal_babble.credit_title_html", :locale => @locale %></h3>
   <p><%= t ".legal_babble.credit_1_html", :locale => @locale %></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_html", :locale => @locale %></p>
-  <p><%= t ".legal_babble.credit_3_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",
   <p><%= image_tag("attribution_example.png",

-                   :alt => t('.legal_babble.attribution_example.alt'),
+                   :alt => t(".legal_babble.attribution_example.alt"),

                    :border => 0,
                    :border => 0,

-                   :title => t('.legal_babble.attribution_example.title')) %>
+                   :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>
 
   <h3><%= t ".legal_babble.more_title_html", :locale => @locale %></h3>
   <p><%= t ".legal_babble.more_1_html", :locale => @locale %></p>