X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c105164d7e652dec72a4bff0a47ef96540a6f5ba..2403630da87df8a3b57913e8949ae0ff8f611d22:/app/controllers/users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 43933041c..1f3eb2f7a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -42,7 +42,7 @@ class UsersController < ApplicationController
       if current_user
         current_user.terms_seen = true
 
-        flash[:notice] = t("users.new.terms declined", :url => t("users.new.terms declined url")).html_safe if current_user.save
+        flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save
 
         if params[:referer]
           redirect_to safe_referer(params[:referer])
@@ -321,9 +321,9 @@ class UsersController < ApplicationController
         when "active", "confirmed"
           successful_login(user, request.env["omniauth.params"]["referer"])
         when "suspended"
-          failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe
+          failed_login t("sessions.new.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe
         else
-          failed_login t("users.login.auth failure")
+          failed_login t("sessions.new.auth failure")
         end
       else
         redirect_to :action => "new", :nickname => name, :email => email,
@@ -368,8 +368,6 @@ class UsersController < ApplicationController
       user.description_format = "markdown"
     end
 
-    user.languages = params[:user][:languages].split(",")
-
     case params[:avatar_action]
     when "new"
       user.avatar.attach(params[:user][:avatar])
@@ -385,12 +383,6 @@ class UsersController < ApplicationController
     user.home_lat = params[:user][:home_lat]
     user.home_lon = params[:user][:home_lon]
 
-    user.preferred_editor = if params[:user][:preferred_editor] == "default"
-                              nil
-                            else
-                              params[:user][:preferred_editor]
-                            end
-
     if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank?
       user.auth_provider = nil
       user.auth_uid = nil
@@ -399,8 +391,6 @@ class UsersController < ApplicationController
     if user.save
       session[:fingerprint] = user.fingerprint
 
-      set_locale(:reset => true)
-
       if user.new_email.blank? || user.new_email == user.email
         flash[:notice] = t "users.account.flash update success"
       else