Merge branch 'master' into terms

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 94a3e11426a0fb215960800775d89ab66ea1b734..2e25719524e0c46c5d0da968831981367ee955f3 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -22,6 +22,9 @@ class UserController < ApplicationController
     @title = t 'user.new.title'
     @user = User.new(params[:user])
 
+    country_code = params[:legale] || OSM.IPToCountry(request.remote_ip)
+    @text = OSM.legal_text_for_country(country_code)
+
     if @user.invalid?
       render :action => 'new'
     end