From 63be9d57b601ab5ea37876ac6b7e5e97097b41fd Mon Sep 17 00:00:00 2001 From: efstrian Date: Wed, 29 Apr 2015 18:37:36 +0300 Subject: [PATCH] Issue #5884: Added link to diasporafoundation.org to invitation email (en) --- Changelog.md | 1 + app/views/notifier/invite.markerb | 2 +- config/locales/diaspora/en.yml | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 62268e966..9e8bf2899 100644 --- a/Changelog.md +++ b/Changelog.md @@ -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 diff --git a/app/views/notifier/invite.markerb b/app/views/notifier/invite.markerb index 8d39da1c6..f5222067b 100644 --- a/app/views/notifier/invite.markerb +++ b/app/views/notifier/invite.markerb @@ -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/') %> diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 831cb5054..abc93b6dc 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -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: |-