cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/2642'

Browse source
This commit is contained in:
Tom Hughes 2020-06-04 17:40:13 +01:00
commit 293fe68eff
13 changed files with 298 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

0
app/views/users/make_friend.html.erb → app/views/friendships/make_friend.html.erb
View file

0
app/views/users/remove_friend.html.erb → app/views/friendships/remove_friend.html.erb
View file

7
app/views/notifier/friend_notification.text.erb
View file

@ -1,7 +0,0 @@
<%= t '.had_added_you', :user => @friend.befriender.display_name %>
<%= t '.see_their_profile', :userurl => @viewurl %>
<% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
<%= t '.befriend_them', :befriendurl => @friendurl %>
<% end -%>

4
app/views/notifier/friend_notification.html.erb → app/views/notifier/friendship_notification.html.erb
View file

@ -1,9 +1,9 @@
<p><%= t ".had_added_you", :user => @friend.befriender.display_name %></p>
<p><%= t ".had_added_you", :user => @friendship.befriender.display_name %></p>
<%= message_body do %>
<p><%= raw t ".see_their_profile", :userurl => link_to(@viewurl, @viewurl) %></p>
<% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
<% unless @friendship.befriendee.is_friends_with?(@friendship.befriender) -%>
<p><%= raw t ".befriend_them", :befriendurl => link_to(@friendurl, @friendurl) %></p>
<% end -%>
<% end %>

7
app/views/notifier/friendship_notification.text.erb Normal file
View file

@ -0,0 +1,7 @@
<%= t '.had_added_you', :user => @friendship.befriender.display_name %>
<%= t '.see_their_profile', :userurl => @viewurl %>
<% unless @friendship.befriendee.is_friends_with?(@friendship.befriender) -%>
<%= t '.befriend_them', :befriendurl => @friendurl %>
<% end -%>