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

[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..75f4e878db94bc50a4ecedcc2ac02cb849e95a79 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -6,14 +6,14 @@
       <%= tag.h1 :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
         <h1><%= t ".native.title" %></h1>
         <p>
       <%= 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") %>
+          <%= 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 />
         </p>
       <% end %>
       <hr />


@@ -24,11 +24,11 @@
       <% if t(".legal_babble", :locale => @locale) != t(".legal_babble", :locale => :en) %>
         <h1><%= t ".foreign.title" %></h1>
         <p>
       <% 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") %>
+          <%= 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 />