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

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

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index e62af1659cbaa8fce56c2e8aeb5c296bda9f3b72..d1cb9905a74dd00f307ed4cc9d7101432e6f8c98 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -6,7 +6,7 @@
 
     <div class='user-image'></div>
 
 
     <div class='user-image'></div>
 

-    <h1><%= t ".used_by_html", :name => content_tag(:span, "OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>
+    <h1><%= t ".used_by_html", :name => tag.span("OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>

   </div>
 
   <div class='text'>
   </div>
 
   <div class='text'>


@@ -28,7 +28,8 @@
 
     <div class='section' id='legal'>
       <h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>
 
     <div class='section' id='legal'>
       <h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>

-      <p><%= t ".legal_html", :locale => @locale %></p>
+      <p><%= t ".legal_1_html", :locale => @locale %></p>
+      <p><%= t ".legal_2_html", :locale => @locale %></p>

     </div>
 
     <div class='section' id='partners'>
     </div>
 
     <div class='section' id='partners'>