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

[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 feec81c82172053f7921bbd8d537772c58647d1d..1c4b23b565bfa91d0352117f1119f2357e7b70f1 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -3,32 +3,32 @@
   <!-- Maybe ease foreigners back to their native page -->
 
     <% if t(".legal_babble", :locale => I18n.locale) != t(".legal_babble", :locale => :en) %>
   <!-- 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 %>
+      <%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>

         <h1><%= t ".native.title" %></h1>
         <p>
         <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") %>
+          <%= 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 %>
       <hr />
     <% end %>
   <% else %>
     <!-- Maybe note that this page has been translated -->
         </p>
       <% end %>
       <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) %>
+    <% 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>
         <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") %>
+          <%= t ".foreign.html",
+                :english_original_link => link_to(t(".foreign.english_link"),
+                                                  :controller => "site",
+                                                  :action => "copyright",
+                                                  :copyright_locale => "en") %>

         </p>
       <% end %>
       <hr />
         </p>
       <% end %>
       <hr />


@@ -44,12 +44,13 @@
 <%= 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",
                    :alt => t(".legal_babble.attribution_example.alt"),
                    :border => 0,
   <p><%= image_tag("attribution_example.png",
                    :alt => t(".legal_babble.attribution_example.alt"),
                    :border => 0,