X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c6fe828286f176573a0e8dfbca098978097cc4aa..f3f1687fa300971c793d59e0ae52c81d1076a02a:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 9413ec6ed..d250cf21c 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -349,9 +349,13 @@ class UserController < ApplicationController @user.email = @user.new_email @user.new_email = nil @user.email_valid = true - changed = gravatar_enable(@user) + gravatar_enabled = gravatar_enable(@user) if @user.save - flash[:notice] = (t "user.confirm_email.success") + (changed ? " " + gravatar_status_message(@user) : "") + flash[:notice] = if gravatar_enabled + t("user.confirm_email.success") + " " + gravatar_status_message(@user) + else + t("user.confirm_email.success") + end else flash[:errors] = @user.errors end