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

[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 ebc1877f3b5427b3b14f7dc29ea5df9ffa3da1be..717059fa24d9255a75b1da63e1790aac225475d4 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -1,42 +1,44 @@
-<div class='attr'>
-  <div class='byosm'>
-    <%= t "about_page.copyright_html" %>
-  </div>
-
-  <div class='user-image'></div>
+<%= tag.div :lang => @locale, :dir => t("html.dir", :locale => @locale) do %>
+  <div class='attr'>
+    <div class='byosm'>
+      <%= t ".copyright_html", :locale => @locale %>
+    </div>
 
-  <h1><%= raw t "about_page.used_by", :name => "<span class='user-name'>OpenStreetMap</span>" %></h1>
-</div>
+    <div class='user-image'></div>
 
-<div class='text'>
-  <div class='section'>
-    <p><strong><%= t "about_page.lede_text" %></strong></p>
-    <h2><div class='icon local'></div><%= t "about_page.local_knowledge_title" %></h2>
-    <p><%= t "about_page.local_knowledge_html" %></p>
+    <h1><%= t ".used_by_html", :name => content_tag(:span, "OpenStreetMap", :class => "user-name"), :locale => @locale %></h1>
   </div>
 
-  <div class='section'>
-    <h2><div class='icon community'></div><%= t "about_page.community_driven_title" %></h2>
-    <p><%= t "about_page.community_driven_html", :diary_path => diary_path %></p>
-  </div>
+  <div class='text'>
+    <div class='section'>
+      <p><strong><%= t ".lede_text", :locale => @locale %></strong></p>
+      <h2><div class='icon local'></div><%= t ".local_knowledge_title", :locale => @locale %></h2>
+      <p><%= t ".local_knowledge_html", :locale => @locale %></p>
+    </div>
 
-  <div class='section' id='open-data'>
-    <h2><div class='icon open'></div><%= t "about_page.open_data_title" %></h2>
-    <p><%= t "about_page.open_data_html", :copyright_path => copyright_path %></p>
-  </div>
+    <div class='section'>
+      <h2><div class='icon community'></div><%= t ".community_driven_title", :locale => @locale %></h2>
+      <p><%= t ".community_driven_html", :locale => @locale, :diary_path => diary_entries_path %></p>
+    </div>
 
-  <div class='section' id='legal'>
-    <h2><div class='icon legal'></div><%= t "about_page.legal_title" %></h2>
-    <p><%= t "about_page.legal_html" %></p>
-  </div>
+    <div class='section' id='open-data'>
+      <h2><div class='icon open'></div><%= t ".open_data_title", :locale => @locale %></h2>
+      <p><%= t ".open_data_html", :locale => @locale, :copyright_path => copyright_path %></p>
+    </div>
+
+    <div class='section' id='legal'>
+      <h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>
+      <p><%= t ".legal_1_html", :locale => @locale %></p>
+      <p><%= t ".legal_2_html", :locale => @locale %></p>
+    </div>
 
-  <div class='section' id='partners'>
-    <h2><div class='icon partners'></div><%= t "about_page.partners_title" %></h2>
-    <p><%= t 'layouts.partners_html',
-             :ucl => link_to(t('layouts.partners_ucl'), "http://www.ucl.ac.uk"),
-             :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
-             :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
-             :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
-    </p>
+    <div class='section' id='partners'>
+      <h2><div class='icon partners'></div><%= t ".partners_title", :locale => @locale %></h2>
+      <p><%= t "layouts.hosting_partners_html", :locale => @locale,
+                                                :ucl => link_to(t("layouts.partners_ucl", :locale => @locale), "https://www.ucl.ac.uk"),
+                                                :bytemark => link_to(t("layouts.partners_bytemark", :locale => @locale), "https://www.bytemark.co.uk"),
+                                                :partners => link_to(t("layouts.partners_partners", :locale => @locale), "https://hardware.openstreetmap.org/thanks/") %>
+      </p>
+    </div>
   </div>
-</div>
+<% end %>