X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e96027a209d59ff5e7f5c2b1405febc59664a16..b508f26af4f46d871d56005e8ecd2cb04eee0c0c:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 2050ffdb4..2659232cd 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -50,10 +50,13 @@ class UserController < ApplicationController end @user.description = params[:user][:description] + @user.languages = params[:user][:languages].split(",") @user.home_lat = params[:user][:home_lat] @user.home_lon = params[:user][:home_lon] if @user.save + set_locale + if params[:user][:email] == @user.new_email flash[:notice] = I18n.t('user.account.flash update success confirm needed') Notifier.deliver_email_confirm(@user, @user.tokens.create) @@ -90,7 +93,7 @@ class UserController < ApplicationController if user token = user.tokens.create Notifier.deliver_lost_password(user, token) - flash[:notice] = I18n.t('user.lost_password.notice.email on way') + flash[:notice] = I18n.t('user.lost_password.notice email on way') else flash[:notice] = I18n.t('user.lost_password.notice email cannot find') end