From c2e0feb38b191615f02b7750de9fb022b4b242f2 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Fri, 7 Jul 2017 22:54:13 +0200 Subject: [PATCH] Include first/last name in invitation emails --- app/views/notifier/invite.markerb | 9 ++++++++- config/locales/diaspora/en.yml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/views/notifier/invite.markerb b/app/views/notifier/invite.markerb index 1e00c6c0a..ee3942a3b 100644 --- a/app/views/notifier/invite.markerb +++ b/app/views/notifier/invite.markerb @@ -1 +1,8 @@ -<%= t('.message', :invite_url => invite_code_url(@invitation_code), :diasporafoundation_url => 'https://diasporafoundation.org/', :diaspora_id => @inviter.try(:diaspora_handle)) %> +<%= t('.message', + invite_url: invite_code_url(@invitation_code), + diasporafoundation_url: 'https://diasporafoundation.org/', + user: @inviter.try(:diaspora_handle) == @inviter.try(:name) ? + @inviter.try(:diaspora_handle) : + @inviter.try(:name) + " (" + @inviter.try(:diaspora_handle) + ")", + diaspora_id: @inviter.try(:diaspora_handle)) +%> diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 931dfceda..10f82eb23 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -807,7 +807,7 @@ en: message: |- Hello! - You have been invited to join diaspora* by %{diaspora_id}! + You have been invited to join diaspora* by %{user}! Click this link to get started