Merge branch 'stable' into develop

Changelog.md

@@ -161,6 +161,8 @@ before.
 
 ## Features
 
+* The sender's diaspora-ID is now shown in invitation mails [#6817](https://github.com/diaspora/diaspora/pull/6817)
+
 # 0.5.8.0
 
 ## Refactor

app/controllers/invitations_controller.rb

@@ -39,7 +39,7 @@ class InvitationsController < ApplicationController
       else
         params[:invitation_code]
       end
-
+    @inviter = user || InvitationCode.where(id: params[:invitation_code]).first.try(:user)
     if @invitation_code.present?
       render 'notifier/invite', :layout => false
     else

app/views/notifier/invite.markerb

@@ -1 +1 @@
-<%= t('.message', :invite_url => invite_code_url(@invitation_code), :diasporafoundation_url => 'https://diasporafoundation.org/') %>
+<%= t('.message', :invite_url => invite_code_url(@invitation_code), :diasporafoundation_url => 'https://diasporafoundation.org/', :diaspora_id => @inviter.try(:diaspora_handle)) %>

config/locales/diaspora/en.yml

@@ -851,12 +851,14 @@ en:
       message: |-
         Hello!
 
-        You have been invited to join diaspora*!
+        You have been invited to join diaspora* by %{diaspora_id}!
 
         Click this link to get started
 
         [%{invite_url}][1]
 
+        Or you can add %{diaspora_id} to your contacts if you already have an account.
+
 
         Love,