Remind the username in the reset password e-mail

closes #8037

Changelog.md

@@ -17,6 +17,7 @@
 * Add support for footnotes in markdown [#8277](https://github.com/diaspora/diaspora/pull/8277)
 * Send `AccountMigration` if receiving message to a migrated account [#8288](https://github.com/diaspora/diaspora/pull/8288)
 * Add podmin mail address to the footer [#8242](https://github.com/diaspora/diaspora/pull/8242)
+* Add username to password-reset mail [#8037](https://github.com/diaspora/diaspora/pull/8037)
 
 # 0.7.15.0
 

app/views/devise/mailer/confirmation_instructions.markerb

@@ -1,7 +1,7 @@
-<%= t('devise.mailer.welcome', :email => @resource.email) %>
+<%= t('devise.mailer.welcome', username: @resource.username) %>
 
 <%= t('.you_can_confirm') %>
 
 [<%= t('.confirm') %>][1]
 
-[1]: <%= confirmation_url(@resource, :confirmation_token => @token) %>
+[1]: <%= confirmation_url(@resource, confirmation_token: @token) %>

app/views/devise/mailer/reset_password_instructions.markerb

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

app/views/devise/mailer/unlock_instructions.markerb

@@ -1,4 +1,4 @@
-<%= t('devise.mailer.hello', :email => @resource.email) %>
+<%= t('devise.mailer.hello', username: @resource.username) %>
 
 <%= t('.account_locked') %>
 
@@ -6,4 +6,4 @@
 
 [<%= t('.unlock') %>][1]
 
-[1]: <%= unlock_url(@resource, :unlock_token => @token) %>
+[1]: <%= unlock_url(@resource, unlock_token: @token) %>

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: After setting a new password, you will be able to sign into diaspora* again using your username "%{username}" and your new 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.
@@ -41,8 +42,8 @@ en:
         unlock: Unlock my account
       password_change:
         subject: Password Changed
-      welcome: Welcome %{email}!
-      hello: Hello %{email}!
+      welcome: Welcome %{username}!
+      hello: Hello %{username}!
       inviter:
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join diaspora*"

spec/workers/reset_password_spec.rb

@@ -13,6 +13,7 @@ describe Workers::ResetPassword do
       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