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

[rails.git] / app / controllers / site_controller.rb

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 help; end
 

-  def about; end
+  def about
+    @locale = params[:about_locale] || I18n.locale
+  end

 
   def export; end
 
 
   def export; end