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

diff --combined app/views/users/show.html.erb
index be25df1933d45cf28d026ad489479fa5931ddc10,0db30f5b5edd20d8e80061855f743665e30cc8c9..caa7730cb16fe4809b8452c3b461c659c5081430
--- 1/app/views/users/show.html.erb
--- 2/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@@ -22,22 -22,22 +22,22 @@@
              <span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
            </li>
            <li>
-             <%= link_to t(".my comments"), :controller => "diary_entries", :action => "comments", :display_name => current_user.display_name %>
+             <%= link_to t(".my comments"), diary_comments_path(current_user) %>
            </li>
            <li>
-             <%= link_to t(".my settings"), :controller => "users", :action => "account", :display_name => current_user.display_name %>
+             <%= link_to t(".my settings"), user_account_path(current_user) %>
            </li>
  
            <% if current_user.blocks.exists? %>
              <li>
-               <%= link_to t(".blocks on me"), :controller => "user_blocks", :action => "blocks_on", :display_name => current_user.display_name %>
+               <%= link_to t(".blocks on me"), user_blocks_on_path(current_user) %>
                <span class='count-number'><%= number_with_delimiter(current_user.blocks.active.size) %></span>
              </li>
            <% end %>
  
            <% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>
              <li>
-               <%= link_to t(".blocks by me"), :controller => "user_blocks", :action => "blocks_by", :display_name => current_user.display_name %>
+               <%= link_to t(".blocks by me"), user_blocks_by_path(current_user) %>
                <span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
              </li>
            <% end %>
@@@ -70,7 -70,7 +70,7 @@@
              <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
            </li>
            <li>
-             <%= link_to t(".comments"), :controller => "diary_entries", :action => "comments", :display_name => @user.display_name %>
+             <%= link_to t(".comments"), diary_comments_path(@user) %>
            </li>
            <li>
              <% if current_user and current_user.is_friends_with?(@user) %>
@@@ -84,21 -84,21 +84,21 @@@
  
            <% if @user.blocks.exists? %>
              <li>
-               <%= link_to t(".block_history"), :controller => "user_blocks", :action => "blocks_on", :display_name => @user.display_name %>
+               <%= link_to t(".block_history"), user_blocks_on_path(@user) %>
                <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
              </li>
            <% end %>
  
            <% if @user.moderator? and @user.blocks_created.exists? %>
              <li>
-               <%= link_to t(".moderator_history"), :controller => "user_blocks", :action => "blocks_by", :display_name => @user.display_name %>
+               <%= link_to t(".moderator_history"), user_blocks_by_path(@user) %>
                <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
              </li>
            <% end %>
  
            <% if can?(:create, UserBlock) %>
              <li>
-             <%= link_to t(".create_block"), :controller => "user_blocks", :action => "new", :display_name => @user.display_name %>
+             <%= link_to t(".create_block"), new_user_block_path(@user) %>
              </li>
            <% end %>
  
@@@ -191,7 -191,7 +191,7 @@@
      <div class="col-md order-md-last">
        <% if @user.home_lat.nil? or @user.home_lon.nil? %>
          <div id="map" class="content_map">
 -          <p id="no_home_location"><%= t(".set_location_html", :edit_profile_url => edit_profile_path) %></p>
 +          <p id="no_home_location"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>
          </div>
        <% else %>
          <% content_for :head do %>