nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2016-05-06 02:20:38 +02:00
commit 230ec02ad7
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog.md
View file

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

2
app/controllers/invitations_controller.rb
View file

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

2
app/views/notifier/invite.markerb
View file

@ -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)) %>

4
config/locales/diaspora/en.yml
View file

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