@user.home_lat = home_lat.to_f
@user.home_lon = home_lon.to_f
if @user.save
- flash[:notice] = "User edited OK."
+ flash[:notice] = "User information updated successfully."
redirect_to :controller => 'user', :action => 'account'
end
end
@user.home_lat = params[:user][:home_lat].to_f
@user.home_lon = params[:user][:home_lon].to_f
if @user.save
- flash[:notice] = "User home saved."
+ flash[:notice] = "Home location saved successfully."
redirect_to :controller => 'user', :action => 'account'
end
end
def go_public
@user.data_public = true
@user.save
- flash[:notice] = 'All your edits are now public'
+ flash[:notice] = 'All your edits are now public.'
redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
end
user.token = User.make_token
user.save
Notifier::deliver_lost_password(user)
- flash[:notice] = "Sorry you lost it :-( but an email is on it's way so you can reset it soon."
+ flash[:notice] = "Sorry you lost it :-( but an email is on its way so you can reset it soon."
else
flash[:notice] = "Couldn't find that email address, sorry."
end
if user
pass = User.make_token(8)
user.pass_crypt = pass
+ user.pass_crypt_confirmation = pass
+ user.active = true
user.save
Notifier::deliver_reset_password(user, pass)
- flash[:notice] = "You're password has been changed and is on the way to your mailbox :-)"
+ flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"
else
flash[:notice] = "Didn't find that token, check the URL maybe?"
end
u.timeout = 1.day.from_now
u.save
session[:token] = u.token
- redirect_to :controller => 'site', :action => 'index'
+ if params[:next_controller] and params[:next_action]
+ redirect_to :controller => params[:next_controller], :action => params[:next_action]
+ else
+ redirect_to :controller => 'site', :action => 'index'
+ end
return
else
- flash[:notice] = "Couldn't log in with those details"
+ flash[:notice] = "Sorry, couldn't log in with those details."
end
end
end
end
end
session[:token] = nil
- redirect_to :controller => 'site', :action => 'index'
+ if params[:next_controller] and params[:next_action]
+ redirect_to :controller => params[:next_controller], :action => params[:next_action]
+ else
+ redirect_to :controller => 'site', :action => 'index'
+ end
end
def confirm
redirect_to :action => 'login'
else
- flash[:notice] = 'Something went wrong confirming that user'
+ flash[:notice] = 'Something went wrong confirming that user.'
end
end
friend.friend_user_id = User.find_by_display_name(name).id
unless @user.is_friends_with?(friend)
if friend.save
- flash[:notice] = "#{name} is now your friend"
+ flash[:notice] = "#{name} is now your friend."
else
- friend.add_error("adding a friend failed")
+ friend.add_error("Sorry, failed to add #{name} as a friend.")
end
else
- flash[:notice] = "Your are already friends"
+ flash[:notice] = "You are already friends with #{name}."
end
redirect_to :controller => 'user', :action => 'view'
end