X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/507c395f51c20c3c0d5375313ea1ca0ed4156c75..4370fe45add697f481ab88764aba8379eb3316c2:/app/views/users/show.html.erb?ds=sidebyside
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index f39224502..76bedf60e 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -35,14 +35,14 @@
<% if current_user.blocks.exists? %>
- <%= link_to t(".blocks on me"), user_blocks_on_path(current_user) %>
+ <%= link_to t(".blocks on me"), user_received_blocks_path(current_user) %>
<%= number_with_delimiter(current_user.blocks.active.size) %>
<% end %>
<% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>
- <%= link_to t(".blocks by me"), user_blocks_by_path(current_user) %>
+ <%= link_to t(".blocks by me"), user_issued_blocks_path(current_user) %>
<%= number_with_delimiter(current_user.blocks_created.active.size) %>
<% end %>
@@ -84,30 +84,30 @@
<% if current_user %>
<% if current_user.friends_with?(@user) %>
- <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>
+ <%= link_to t(".unfollow"), follow_path(:display_name => @user.display_name), :method => :delete %>
<% else %>
- <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>
+ <%= link_to t(".follow"), follow_path(:display_name => @user.display_name), :method => :post %>
<% end %>
<% end %>
<% if @user.blocks.exists? %>
- <%= link_to t(".block_history"), user_blocks_on_path(@user) %>
+ <%= link_to t(".block_history"), user_received_blocks_path(@user) %>
<%= number_with_delimiter(@user.blocks.active.size) %>
<% end %>
<% if @user.moderator? and @user.blocks_created.exists? %>
- <%= link_to t(".moderator_history"), user_blocks_by_path(@user) %>
+ <%= link_to t(".moderator_history"), user_issued_blocks_path(@user) %>
<%= number_with_delimiter(@user.blocks_created.active.size) %>
<% end %>
- <% if can?(:revoke_all, UserBlock) and @user.blocks.active.exists? %>
+ <% if can?(:destroy, UserBlock) and @user.blocks.active.exists? %>
- <%= link_to t(".revoke_all_blocks"), revoke_all_user_blocks_path(@user) %>
+ <%= link_to t(".revoke_all_blocks"), edit_user_received_blocks_path(@user) %>
<% end %>
@@ -161,50 +161,48 @@
- <% if can?(:set_status, User) || can?(:destroy, User) %>
+ <% if can?(:update, :user_status) %>