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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 3a69eed120e1299ed90287c2f15ae96cb0515823..1fc916e7f8436c3f3a22d6742c5ffc1395ee3932 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -112,7 +112,9 @@ class SiteController < ApplicationController
 
   def help; end
 
-  def about; end
+  def about
+    @locale = params[:about_locale] || I18n.locale
+  end
 
   def export; end
 

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb
index 886aaf006434f9069aee2338a74a5aa9d39a9cd2..27bcbb9da5c26927e8a15a735da251e37aa25a7a 100644 (file)
--- a/app/views/site/about.html.erb
+++ b/app/views/site/about.html.erb
@@ -1,41 +1,41 @@
 <div class='attr'>
   <div class='byosm'>
-    <%= t ".copyright_html" %>
+    <%= t ".copyright_html", :locale => @locale %>
   </div>
 
   <div class='user-image'></div>
 
-  <h1><%= raw t ".used_by", :name => "<span class='user-name'>OpenStreetMap</span>" %></h1>
+  <h1><%= raw t ".used_by", :name => "<span class='user-name'>OpenStreetMap</span>", :locale => @locale %></h1>
 </div>
 
 <div class='text'>
   <div class='section'>
-    <p><strong><%= t ".lede_text" %></strong></p>
-    <h2><div class='icon local'></div><%= t ".local_knowledge_title" %></h2>
-    <p><%= t ".local_knowledge_html" %></p>
+    <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'>
-    <h2><div class='icon community'></div><%= t ".community_driven_title" %></h2>
-    <p><%= t ".community_driven_html", :diary_path => diary_entries_path %></p>
+    <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='open-data'>
-    <h2><div class='icon open'></div><%= t ".open_data_title" %></h2>
-    <p><%= t ".open_data_html", :copyright_path => copyright_path %></p>
+    <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" %></h2>
-    <p><%= t ".legal_html" %></p>
+    <h2><div class='icon legal'></div><%= t ".legal_title", :locale => @locale %></h2>
+    <p><%= t ".legal_html", :locale => @locale %></p>
   </div>
 
   <div class='section' id='partners'>
-    <h2><div class='icon partners'></div><%= t ".partners_title" %></h2>
-    <p><%= t "layouts.hosting_partners_html",
-             :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
-             :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
-             :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>
+    <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>

diff --git a/config/routes.rb b/config/routes.rb
index 992197814ee15b2dad1c7a8bb07e9f14216f4ac7..37ffa2d9a9acde4bb88e64458f1ea4e909d9a7da 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -145,6 +145,7 @@ OpenStreetMap::Application.routes.draw do
   get "/welcome" => "site#welcome"
   get "/fixthemap" => "site#fixthemap"
   get "/help" => "site#help"
+  get "/about/:about_locale" => "site#about"
   get "/about" => "site#about"
   get "/history" => "changesets#index"
   get "/history/feed" => "changesets#feed", :defaults => { :format => :atom }