diaspora/app/views/notifier/confirm_email.html.haml
Raphael Sofaer 9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
2011-07-19 10:44:00 -07:00

6 lines
301 B
Text

%p
= t('notifier.hello', :name => @receiver.profile.first_name)
%p
!= t('notifier.confirm_email.click_link', :unconfirmed_email => @receiver.unconfirmed_email)
%br
= link_to confirm_email_url(:token => @receiver.confirm_email_token), confirm_email_url(:token => @receiver.confirm_email_token)