Merge 9ebf9ed into e92eb88

app/views/devise/mailer/confirmation_instructions.markerb

@@ -1,4 +1,4 @@
-<%= t('devise.mailer.welcome', :email => @resource.email) %>
+<%= t('devise.mailer.welcome', :email => @resource.username) %>
 
 <%= t('.you_can_confirm') %>
 

app/views/devise/mailer/reset_password_instructions.markerb

@@ -1,11 +1,13 @@
-<%= t('devise.mailer.hello', :email => @resource.email) %>
+<%= t('devise.mailer.hello', :email => @resource.username) %>
 
 <%= t('.someone_requested') %>
 
 [<%= t('.change') %>][1]
 
 [1]: <%= edit_password_url(@resource, :reset_password_token => @token) %>
 
+<%= t('.then_connect', username: @resource.username) %>
+
 <%= t('.wont_change') %>
 
 <%= t('.ignore') %>

app/views/devise/mailer/unlock_instructions.markerb

@@ -1,4 +1,4 @@
-<%= t('devise.mailer.hello', :email => @resource.email) %>
+<%= t('devise.mailer.hello', :email => @resource.username) %>
 
 <%= t('.account_locked') %>
 

config/locales/devise/devise.en.yml

@@ -30,6 +30,7 @@ en:
         someone_requested: Someone has requested a link to change your password. If
           it was you, you can do this through the link below.
         change: Change my password
+        then_connect: Once changed, you will be able to connect using your username "%{username}" and your chosen password
         wont_change: Your password won't change until you access the link above and
           create a new one.
         ignore: If you didn't request this, please ignore this email.

spec/workers/reset_password_spec.rb

@@ -13,6 +13,7 @@
       mail = Devise.mailer.deliveries.last
       expect(mail.to).to eq([alice.email])
       expect(mail.body).to include("change your password")
+      expect(mail.body).to include(alice.username)
     end
   end
 end