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

Issue #5884: Added link to diasporafoundation.org to invitation email (en)

Browse source
This commit is contained in:
efstrian 2015-04-29 18:37:36 +03:00 committed by Dennis Schubert
parent 19fd36b1ce
commit 63be9d57b6
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -25,6 +25,7 @@
* Enable aspect sorting again [#5559](https://github.com/diaspora/diaspora/pull/5559)
* Submit messages in conversations with Ctrl+Enter [#5910](https://github.com/diaspora/diaspora/pull/5910)
* Support syntax highlighting for fenced code blocks [#5908](https://github.com/diaspora/diaspora/pull/5908)
* Added link to diasporafoundation.org to invitation email [#5893](https://github.com/diaspora/diaspora/pull/5893)
# 0.5.0.0

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

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

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

@ -851,7 +851,10 @@ en:
The diaspora* email robot!
P.S.: Just in case you don't know (yet) what diaspora* is, [here][2] is the answer!
[1]: %{invite_url}
[2]: %{diasporafoundation_url}
remove_old_user:
subject: "Your diaspora* account has been flagged for removal due to inactivity"
body: |-