Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/5221'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Sep 18, 2024
2 parents 557401e + 091bf88 commit 7141d5d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions app/views/user_mailer/friendship_notification.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<p><%= t ".hi", :to_user => @friendship.befriendee.display_name %></p>

<p><%= t ".had_added_you", :user => @friendship.befriender.display_name %></p>

<%= message_body do %>
Expand Down
2 changes: 2 additions & 0 deletions app/views/user_mailer/friendship_notification.text.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<%= t ".hi", :to_user => @friendship.befriendee.display_name %>
<%= t '.had_added_you', :user => @friendship.befriender.display_name %>
<%= t '.see_their_profile', :userurl => @viewurl %>
Expand Down

0 comments on commit 7141d5d

Please sign in to comment.